Skip to content

Commit a735f9e

Browse files
Dmitry-Borodinelizarov
authored andcommitted
updated dependencies for android sample apps
1 parent 31550f1 commit a735f9e

File tree

8 files changed

+22
-23
lines changed

8 files changed

+22
-23
lines changed

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

+5-6
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ apply plugin: 'kotlin-android'
33
apply plugin: 'kotlin-android-extensions'
44

55
android {
6-
compileSdkVersion 26
6+
compileSdkVersion 27
77
defaultConfig {
88
applicationId "org.jetbrains.kotlinx.animation"
99
minSdkVersion 15
10-
targetSdkVersion 26
10+
targetSdkVersion 27
1111
versionCode 1
1212
versionName "1.0"
1313
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -21,12 +21,11 @@ android {
2121
}
2222

2323
dependencies {
24-
implementation fileTree(dir: 'libs', include: ['*.jar'])
2524
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
26-
implementation 'com.android.support:appcompat-v7:26.1.0'
25+
implementation 'com.android.support:appcompat-v7:27.1.1'
2726
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
28-
implementation 'com.android.support:design:26.1.0'
29-
implementation "android.arch.lifecycle:extensions:1.0.0"
27+
implementation 'com.android.support:design:27.1.1'
28+
implementation "android.arch.lifecycle:extensions:1.1.1"
3029
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
3130
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
3231

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.0.0'
9+
classpath 'com.android.tools.build:gradle:3.1.0'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111

1212
// NOTE: Do not place your application dependencies here; they belong

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ org.gradle.jvmargs=-Xmx1536m
1818

1919
kotlin.coroutines=enable
2020

21-
kotlin_version = 1.2.21
21+
kotlin_version = 1.2.31
2222
coroutines_version = 0.22.5
2323

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

+10-11
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ apply plugin: 'kotlin-android'
33
apply plugin: 'kotlin-android-extensions'
44

55
android {
6-
compileSdkVersion 25
7-
buildToolsVersion '26.0.2'
6+
compileSdkVersion 27
7+
buildToolsVersion '27.0.3'
88
defaultConfig {
99
applicationId "com.example.app"
10-
minSdkVersion 9
11-
targetSdkVersion 25
10+
minSdkVersion 14
11+
targetSdkVersion 27
1212
versionCode 1
1313
versionName "1.0"
1414
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -22,14 +22,13 @@ android {
2222
}
2323

2424
dependencies {
25-
compile fileTree(dir: 'libs', include: ['*.jar'])
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'
2631
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
2732
exclude group: 'com.android.support', module: 'support-annotations'
2833
})
29-
compile 'com.android.support:appcompat-v7:25.4.0'
30-
compile 'com.android.support.constraint:constraint-layout:1.0.2'
31-
compile 'com.android.support:design:25.4.0'
32-
testCompile 'junit:junit:4.12'
33-
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
34-
compile "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
3534
}

ui/kotlinx-coroutines-android/example-app/app/src/main/java/com/example/app/MainActivity.kt

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import kotlinx.android.synthetic.main.activity_main.*
1010
import kotlinx.android.synthetic.main.content_main.*
1111

1212
class MainActivity : AppCompatActivity() {
13+
1314
override fun onCreate(savedInstanceState: Bundle?) {
1415
super.onCreate(savedInstanceState)
1516
setContentView(R.layout.activity_main)

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.0.0'
9+
classpath 'com.android.tools.build:gradle:3.1.0'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111

1212
// NOTE: Do not place your application dependencies here; they belong

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ org.gradle.jvmargs=-Xmx1536m
1818

1919
kotlin.coroutines=enable
2020

21-
kotlin_version = 1.2.21
21+
kotlin_version = 1.2.31
2222
coroutines_version = 0.22.5
2323

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sun Nov 05 23:56:59 MSK 2017
1+
#Sun Apr 08 03:14:27 CEST 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.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

0 commit comments

Comments
 (0)