Skip to content

Commit 889a5f6

Browse files
turanskyturansky
authored
Kotlin DSL - 'android:example-app' (#1940)
* 'android:example-app'. Gradle 5.6.1 - sync with root project * Kotlin DSL - 'android:example-app'
1 parent 3250e47 commit 889a5f6

File tree

9 files changed

+129
-95
lines changed

9 files changed

+129
-95
lines changed

‎ui/kotlinx-coroutines-android/example-app/app/build.gradle

-32
This file was deleted.

‎ui/kotlinx-coroutines-android/example-app/app/build.gradle.kts

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/*
2+
* Copyright 2016-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
3+
*/
4+
5+
plugins {
6+
id("com.android.application")
7+
kotlin("android")
8+
kotlin("android.extensions")
9+
}
10+
11+
android {
12+
compileSdkVersion = "29"
13+
defaultConfig {
14+
applicationId = "com.example.app"
15+
minSdkVersion(14)
16+
targetSdkVersion(29)
17+
versionCode = 1
18+
versionName = "1.0"
19+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
20+
}
21+
}
22+
23+
dependencies {
24+
implementation("androidx.appcompat:appcompat:1.0.2")
25+
implementation("androidx.constraintlayout:constraintlayout:1.1.3")
26+
implementation("com.google.android.material:material:1.0.0")
27+
28+
implementation(kotlin("stdlib-jdk7"))
29+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:${property("coroutines_version")}")
30+
31+
testImplementation("junit:junit:4.12")
32+
androidTestImplementation("androidx.test:runner:1.2.0")
33+
androidTestImplementation("androidx.test.espresso:espresso-core:3.2.0")
34+
}

‎ui/kotlinx-coroutines-android/example-app/build.gradle renamed to ‎ui/kotlinx-coroutines-android/example-app/build.gradle.kts

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ buildscript {
1010
jcenter()
1111
}
1212
dependencies {
13-
classpath 'com.android.tools.build:gradle:3.5.0'
14-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
13+
classpath("com.android.tools.build:gradle:3.5.0")
14+
classpath(kotlin("gradle-plugin", property("kotlin_version") as String))
1515

1616
// NOTE: Do not place your application dependencies here; they belong
1717
// in the individual module build.gradle files
@@ -25,6 +25,6 @@ allprojects {
2525
}
2626
}
2727

28-
task clean(type: Delete) {
29-
delete rootProject.buildDir
28+
task<Delete>("clean") {
29+
delete(rootProject.buildDir)
3030
}

‎ui/kotlinx-coroutines-android/example-app/gradle/wrapper/gradle-wrapper.jar

57.3 KB
Binary file not shown.

‎ui/kotlinx-coroutines-android/example-app/gradle/wrapper/gradle-wrapper.properties

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
#
2-
# Copyright 2016-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
3-
#
4-
51
distributionBase=GRADLE_USER_HOME
62
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip
74
zipStoreBase=GRADLE_USER_HOME
85
zipStorePath=wrapper/dists
9-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

‎ui/kotlinx-coroutines-android/example-app/gradlew

100644100755
+66-43
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,59 @@
1-
#!/usr/bin/env bash
1+
#!/usr/bin/env sh
2+
3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
218

319
##############################################################################
420
##
521
## Gradle start up script for UN*X
622
##
723
##############################################################################
824

9-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10-
DEFAULT_JVM_OPTS=""
25+
# Attempt to set APP_HOME
26+
# Resolve links: $0 may be a link
27+
PRG="$0"
28+
# Need this for relative symlinks.
29+
while [ -h "$PRG" ] ; do
30+
ls=`ls -ld "$PRG"`
31+
link=`expr "$ls" : '.*-> \(.*\)$'`
32+
if expr "$link" : '/.*' > /dev/null; then
33+
PRG="$link"
34+
else
35+
PRG=`dirname "$PRG"`"/$link"
36+
fi
37+
done
38+
SAVED="`pwd`"
39+
cd "`dirname \"$PRG\"`/" >/dev/null
40+
APP_HOME="`pwd -P`"
41+
cd "$SAVED" >/dev/null
1142

1243
APP_NAME="Gradle"
1344
APP_BASE_NAME=`basename "$0"`
1445

46+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
48+
1549
# Use the maximum available, or set MAX_FD != -1 to use that value.
1650
MAX_FD="maximum"
1751

18-
warn ( ) {
52+
warn () {
1953
echo "$*"
2054
}
2155

22-
die ( ) {
56+
die () {
2357
echo
2458
echo "$*"
2559
echo
@@ -30,6 +64,7 @@ die ( ) {
3064
cygwin=false
3165
msys=false
3266
darwin=false
67+
nonstop=false
3368
case "`uname`" in
3469
CYGWIN* )
3570
cygwin=true
@@ -40,26 +75,11 @@ case "`uname`" in
4075
MINGW* )
4176
msys=true
4277
;;
78+
NONSTOP* )
79+
nonstop=true
80+
;;
4381
esac
4482

45-
# Attempt to set APP_HOME
46-
# Resolve links: $0 may be a link
47-
PRG="$0"
48-
# Need this for relative symlinks.
49-
while [ -h "$PRG" ] ; do
50-
ls=`ls -ld "$PRG"`
51-
link=`expr "$ls" : '.*-> \(.*\)$'`
52-
if expr "$link" : '/.*' > /dev/null; then
53-
PRG="$link"
54-
else
55-
PRG=`dirname "$PRG"`"/$link"
56-
fi
57-
done
58-
SAVED="`pwd`"
59-
cd "`dirname \"$PRG\"`/" >/dev/null
60-
APP_HOME="`pwd -P`"
61-
cd "$SAVED" >/dev/null
62-
6383
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6484

6585
# Determine the Java command to use to start the JVM.
@@ -85,7 +105,7 @@ location of your Java installation."
85105
fi
86106

87107
# Increase the maximum file descriptors if we can.
88-
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
108+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
89109
MAX_FD_LIMIT=`ulimit -H -n`
90110
if [ $? -eq 0 ] ; then
91111
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -105,8 +125,8 @@ if $darwin; then
105125
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
106126
fi
107127

108-
# For Cygwin, switch paths to Windows format before running java
109-
if $cygwin ; then
128+
# For Cygwin or MSYS, switch paths to Windows format before running java
129+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
110130
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
111131
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
112132
JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -134,27 +154,30 @@ if $cygwin ; then
134154
else
135155
eval `echo args$i`="\"$arg\""
136156
fi
137-
i=$((i+1))
157+
i=`expr $i + 1`
138158
done
139159
case $i in
140-
(0) set -- ;;
141-
(1) set -- "$args0" ;;
142-
(2) set -- "$args0" "$args1" ;;
143-
(3) set -- "$args0" "$args1" "$args2" ;;
144-
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
145-
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
146-
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
147-
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
148-
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
149-
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
160+
0) set -- ;;
161+
1) set -- "$args0" ;;
162+
2) set -- "$args0" "$args1" ;;
163+
3) set -- "$args0" "$args1" "$args2" ;;
164+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
165+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
166+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
167+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
168+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
169+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
150170
esac
151171
fi
152172

153-
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
154-
function splitJvmOpts() {
155-
JVM_OPTS=("$@")
173+
# Escape application args
174+
save () {
175+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
176+
echo " "
156177
}
157-
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
158-
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
178+
APP_ARGS=`save "$@"`
179+
180+
# Collect all arguments for the java command, following the shell quoting and substitution rules
181+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
159182

160-
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
183+
exec "$JAVACMD" "$@"

‎ui/kotlinx-coroutines-android/example-app/gradlew.bat

+23-10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem https://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
117
@if "%DEBUG%" == "" @echo off
218
@rem ##########################################################################
319
@rem
@@ -8,14 +24,17 @@
824
@rem Set local scope for the variables with windows NT shell
925
if "%OS%"=="Windows_NT" setlocal
1026

11-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
12-
set DEFAULT_JVM_OPTS=
13-
1427
set DIRNAME=%~dp0
1528
if "%DIRNAME%" == "" set DIRNAME=.
1629
set APP_BASE_NAME=%~n0
1730
set APP_HOME=%DIRNAME%
1831

32+
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
33+
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
34+
35+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
36+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
37+
1938
@rem Find java.exe
2039
if defined JAVA_HOME goto findJavaFromJavaHome
2140

@@ -46,10 +65,9 @@ echo location of your Java installation.
4665
goto fail
4766

4867
:init
49-
@rem Get command-line arguments, handling Windowz variants
68+
@rem Get command-line arguments, handling Windows variants
5069

5170
if not "%OS%" == "Windows_NT" goto win9xME_args
52-
if "%@eval[2+2]" == "4" goto 4NT_args
5371

5472
:win9xME_args
5573
@rem Slurp the command line arguments.
@@ -60,11 +78,6 @@ set _SKIP=2
6078
if "x%~1" == "x" goto execute
6179

6280
set CMD_LINE_ARGS=%*
63-
goto execute
64-
65-
:4NT_args
66-
@rem Get arguments from the 4NT Shell from JP Software
67-
set CMD_LINE_ARGS=%$
6881

6982
:execute
7083
@rem Setup the command line

‎ui/kotlinx-coroutines-android/example-app/settings.gradle

-1
This file was deleted.

‎ui/kotlinx-coroutines-android/example-app/settings.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include(":app")

0 commit comments

Comments
 (0)