Skip to content

Commit ebb800c

Browse files
authored
Update library versions (google#480)
1 parent 27bacef commit ebb800c

File tree

4 files changed

+20
-14
lines changed

4 files changed

+20
-14
lines changed

build.gradle

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,20 @@ buildscript {
2222
targetSdkVersion = 28
2323
compileSdkVersion = 28
2424

25-
androidGradlePluginVersion = "3.2.0"
25+
androidGradlePluginVersion = "3.2.1"
2626
androidMavenGradlePluginVersion = "1.5"
27-
androidxCoreVersion = "1.0.0"
28-
androidxEspressoVersion = "3.1.0-alpha4"
27+
androidxAnnotationVersion = "1.0.0"
28+
androidxAppCompatVersion = "1.0.2"
29+
androidxCoreVersion = "1.0.1"
30+
androidxLegacySupportV4Version = "1.0.0"
31+
androidxPreferenceVersion = "1.0.0"
32+
androidxPreferenceV14Version = "1.0.0"
33+
androidxRecyclerViewVersion = "1.0.0"
34+
androidxEspressoVersion = "3.1.0"
2935
androidxTestVersion = "1.1.0-alpha4"
3036
junitVersion = "4.12"
3137
gradleBintrayPluginVersion = "1.6"
32-
kotlinVersion = "1.2.70"
38+
kotlinVersion = "1.3.11"
3339
materialVersion = "1.0.0"
3440
}
3541

demo-cat-gallery/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ android {
4040

4141
dependencies {
4242
implementation project(path: ":flexbox")
43-
implementation "androidx.appcompat:appcompat:${rootProject.androidxCoreVersion}"
44-
implementation "androidx.recyclerview:recyclerview:${rootProject.androidxCoreVersion}"
43+
implementation "androidx.appcompat:appcompat:${rootProject.androidxAppCompatVersion}"
44+
implementation "androidx.recyclerview:recyclerview:${rootProject.androidxRecyclerViewVersion}"
4545
implementation "com.google.android.material:material:${rootProject.materialVersion}"
4646
implementation "org.jetbrains.kotlin:kotlin-stdlib:${rootProject.kotlinVersion}"
4747
}

demo-playground/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@ android {
4040

4141
dependencies {
4242
implementation project(":flexbox")
43-
implementation "androidx.legacy:legacy-support-v4:${rootProject.androidxCoreVersion}"
44-
implementation "androidx.appcompat:appcompat:${rootProject.androidxCoreVersion}"
45-
implementation "androidx.preference:preference:${rootProject.androidxCoreVersion}"
46-
implementation "androidx.legacy:legacy-preference-v14:${rootProject.androidxCoreVersion}"
43+
implementation "androidx.legacy:legacy-support-v4:${rootProject.androidxLegacySupportV4Version}"
44+
implementation "androidx.appcompat:appcompat:${rootProject.androidxAppCompatVersion}"
45+
implementation "androidx.preference:preference:${rootProject.androidxPreferenceVersion}"
46+
implementation "androidx.legacy:legacy-preference-v14:${rootProject.androidxPreferenceV14Version}"
4747
implementation "com.google.android.material:material:${rootProject.materialVersion}"
4848
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
4949

5050
testImplementation "junit:junit:${rootProject.ext.junitVersion}"
5151

52-
androidTestImplementation "androidx.annotation:annotation:${rootProject.androidxCoreVersion}"
52+
androidTestImplementation "androidx.annotation:annotation:${rootProject.androidxAnnotationVersion}"
5353
androidTestImplementation "androidx.test:runner:${rootProject.androidxTestVersion}"
5454
androidTestImplementation "androidx.test:rules:${rootProject.androidxTestVersion}"
5555
androidTestImplementation "androidx.test.espresso:espresso-core:${rootProject.androidxEspressoVersion}"

flexbox/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ android {
4141

4242
dependencies {
4343
compileOnly "androidx.core:core:${rootProject.androidxCoreVersion}"
44-
compileOnly "androidx.recyclerview:recyclerview:${rootProject.androidxCoreVersion}"
44+
compileOnly "androidx.recyclerview:recyclerview:${rootProject.androidxRecyclerViewVersion}"
4545

4646
testImplementation "junit:junit:${rootProject.junitVersion}"
4747

4848
androidTestImplementation "androidx.core:core:${rootProject.androidxCoreVersion}"
49-
androidTestImplementation "androidx.recyclerview:recyclerview:${rootProject.androidxCoreVersion}"
50-
androidTestImplementation "androidx.annotation:annotation:${rootProject.androidxCoreVersion}"
49+
androidTestImplementation "androidx.recyclerview:recyclerview:${rootProject.androidxRecyclerViewVersion}"
50+
androidTestImplementation "androidx.annotation:annotation:${rootProject.androidxAnnotationVersion}"
5151
androidTestImplementation "androidx.test:runner:${rootProject.androidxTestVersion}"
5252
androidTestImplementation "androidx.test:rules:${rootProject.androidxTestVersion}"
5353
androidTestImplementation "androidx.test.espresso:espresso-core:${rootProject.androidxEspressoVersion}"

0 commit comments

Comments
 (0)