diff --git a/build.gradle b/build.gradle index 9c897fce..8696bd47 100644 --- a/build.gradle +++ b/build.gradle @@ -22,14 +22,20 @@ buildscript { targetSdkVersion = 28 compileSdkVersion = 28 - androidGradlePluginVersion = "3.2.0" + androidGradlePluginVersion = "3.2.1" androidMavenGradlePluginVersion = "1.5" - androidxCoreVersion = "1.0.0" - androidxEspressoVersion = "3.1.0-alpha4" + androidxAnnotationVersion = "1.0.0" + androidxAppCompatVersion = "1.0.2" + androidxCoreVersion = "1.0.1" + androidxLegacySupportV4Version = "1.0.0" + androidxPreferenceVersion = "1.0.0" + androidxPreferenceV14Version = "1.0.0" + androidxRecyclerViewVersion = "1.0.0" + androidxEspressoVersion = "3.1.0" androidxTestVersion = "1.1.0-alpha4" junitVersion = "4.12" gradleBintrayPluginVersion = "1.6" - kotlinVersion = "1.2.70" + kotlinVersion = "1.3.11" materialVersion = "1.0.0" } diff --git a/demo-cat-gallery/build.gradle b/demo-cat-gallery/build.gradle index ac44581e..10cd543f 100644 --- a/demo-cat-gallery/build.gradle +++ b/demo-cat-gallery/build.gradle @@ -40,8 +40,8 @@ android { dependencies { implementation project(path: ":flexbox") - implementation "androidx.appcompat:appcompat:${rootProject.androidxCoreVersion}" - implementation "androidx.recyclerview:recyclerview:${rootProject.androidxCoreVersion}" + implementation "androidx.appcompat:appcompat:${rootProject.androidxAppCompatVersion}" + implementation "androidx.recyclerview:recyclerview:${rootProject.androidxRecyclerViewVersion}" implementation "com.google.android.material:material:${rootProject.materialVersion}" implementation "org.jetbrains.kotlin:kotlin-stdlib:${rootProject.kotlinVersion}" } diff --git a/demo-playground/build.gradle b/demo-playground/build.gradle index 7f49ad64..bd6c1bdd 100644 --- a/demo-playground/build.gradle +++ b/demo-playground/build.gradle @@ -40,16 +40,16 @@ android { dependencies { implementation project(":flexbox") - implementation "androidx.legacy:legacy-support-v4:${rootProject.androidxCoreVersion}" - implementation "androidx.appcompat:appcompat:${rootProject.androidxCoreVersion}" - implementation "androidx.preference:preference:${rootProject.androidxCoreVersion}" - implementation "androidx.legacy:legacy-preference-v14:${rootProject.androidxCoreVersion}" + implementation "androidx.legacy:legacy-support-v4:${rootProject.androidxLegacySupportV4Version}" + implementation "androidx.appcompat:appcompat:${rootProject.androidxAppCompatVersion}" + implementation "androidx.preference:preference:${rootProject.androidxPreferenceVersion}" + implementation "androidx.legacy:legacy-preference-v14:${rootProject.androidxPreferenceV14Version}" implementation "com.google.android.material:material:${rootProject.materialVersion}" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" testImplementation "junit:junit:${rootProject.ext.junitVersion}" - androidTestImplementation "androidx.annotation:annotation:${rootProject.androidxCoreVersion}" + androidTestImplementation "androidx.annotation:annotation:${rootProject.androidxAnnotationVersion}" androidTestImplementation "androidx.test:runner:${rootProject.androidxTestVersion}" androidTestImplementation "androidx.test:rules:${rootProject.androidxTestVersion}" androidTestImplementation "androidx.test.espresso:espresso-core:${rootProject.androidxEspressoVersion}" diff --git a/flexbox/build.gradle b/flexbox/build.gradle index 3b62f1a5..f28763f9 100644 --- a/flexbox/build.gradle +++ b/flexbox/build.gradle @@ -41,13 +41,13 @@ android { dependencies { compileOnly "androidx.core:core:${rootProject.androidxCoreVersion}" - compileOnly "androidx.recyclerview:recyclerview:${rootProject.androidxCoreVersion}" + compileOnly "androidx.recyclerview:recyclerview:${rootProject.androidxRecyclerViewVersion}" testImplementation "junit:junit:${rootProject.junitVersion}" androidTestImplementation "androidx.core:core:${rootProject.androidxCoreVersion}" - androidTestImplementation "androidx.recyclerview:recyclerview:${rootProject.androidxCoreVersion}" - androidTestImplementation "androidx.annotation:annotation:${rootProject.androidxCoreVersion}" + androidTestImplementation "androidx.recyclerview:recyclerview:${rootProject.androidxRecyclerViewVersion}" + androidTestImplementation "androidx.annotation:annotation:${rootProject.androidxAnnotationVersion}" androidTestImplementation "androidx.test:runner:${rootProject.androidxTestVersion}" androidTestImplementation "androidx.test:rules:${rootProject.androidxTestVersion}" androidTestImplementation "androidx.test.espresso:espresso-core:${rootProject.androidxEspressoVersion}"