Skip to content

Commit 7e827fb

Browse files
committed
Android examples: Gradle Version 4.9, Android Gradle Tools version 3.3.0-alpha04
Fixes #512
1 parent 1a12370 commit 7e827fb

File tree

6 files changed

+21
-19
lines changed

6 files changed

+21
-19
lines changed

ui/kotlinx-coroutines-android/animation-app/app/build.gradle

+5-4
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ apply plugin: 'kotlin-android-extensions'
44

55
android {
66
compileSdkVersion 27
7+
buildToolsVersion '27.0.3'
78
defaultConfig {
89
applicationId "org.jetbrains.kotlinx.animation"
9-
minSdkVersion 15
10+
minSdkVersion 14
1011
targetSdkVersion 27
1112
versionCode 1
1213
versionName "1.0"
@@ -21,12 +22,12 @@ android {
2122
}
2223

2324
dependencies {
24-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
2525
implementation 'com.android.support:appcompat-v7:27.1.1'
2626
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
2727
implementation 'com.android.support:design:27.1.1'
28-
implementation "android.arch.lifecycle:extensions:1.1.1"
29-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
28+
implementation 'android.arch.lifecycle:extensions:1.1.1'
29+
30+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
3031
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
3132

3233
testImplementation 'junit:junit:4.12'

ui/kotlinx-coroutines-android/animation-app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.1.0'
9+
classpath 'com.android.tools.build:gradle:3.3.0-alpha04'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111

1212
// NOTE: Do not place your application dependencies here; they belong
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sun Apr 08 11:05:03 CEST 2018
1+
#Sat Aug 25 19:20:16 MSK 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip

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

+10-9
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@ android {
2222
}
2323

2424
dependencies {
25-
compile 'com.android.support:appcompat-v7:27.1.1'
26-
compile 'com.android.support.constraint:constraint-layout:1.0.2'
27-
compile 'com.android.support:design:27.1.1'
28-
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
29-
compile "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
30-
testCompile 'junit:junit:4.12'
31-
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
32-
exclude group: 'com.android.support', module: 'support-annotations'
33-
})
25+
implementation 'com.android.support:appcompat-v7:27.1.1'
26+
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
27+
implementation 'com.android.support:design:27.1.1'
28+
29+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
30+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
31+
32+
testImplementation 'junit:junit:4.12'
33+
androidTestImplementation 'com.android.support.test:runner:1.0.1'
34+
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
3435
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.1.0'
9+
classpath 'com.android.tools.build:gradle:3.3.0-alpha04'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111

1212
// NOTE: Do not place your application dependencies here; they belong
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sun Apr 08 03:14:27 CEST 2018
1+
#Sat Aug 25 19:20:16 MSK 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip

0 commit comments

Comments
 (0)