From d6aa10563b84eb17fc935e982fd0a7aa0f2c16e6 Mon Sep 17 00:00:00 2001 From: moezbhatti Date: Sat, 29 Dec 2018 17:25:52 -0500 Subject: [PATCH] Upgrade androidx dependencies --- android-smsmms/build.gradle | 2 +- build.gradle | 8 ++++++-- common/build.gradle | 2 +- data/build.gradle | 6 +++--- domain/build.gradle | 2 +- presentation/build.gradle | 10 +++++----- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/android-smsmms/build.gradle b/android-smsmms/build.gradle index 19a7c393..0012ed8d 100644 --- a/android-smsmms/build.gradle +++ b/android-smsmms/build.gradle @@ -37,7 +37,7 @@ android { } dependencies { - implementation "androidx.core:core-ktx:$androidx_version" + implementation "androidx.core:core-ktx:$androidx_core_version" implementation "com.jakewharton.timber:timber:$timber_version" implementation 'com.klinkerapps:logger:1.0.3' implementation 'com.squareup.okhttp:okhttp:2.5.0' diff --git a/build.gradle b/build.gradle index 2c2ecbd6..886609e5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.androidx_version = '1.0.0' + ext.androidx_appcompat_version = '1.0.2' + ext.androidx_constraintlayout_version = '1.1.3' + ext.androidx_core_version = '1.0.1' + ext.androidx_emoji_version = '1.0.0' + ext.androidx_exifinterface_version = '1.0.0' ext.androidx_testrunner_version = '1.1.0-alpha3' ext.autodispose_version = '0.7.0' ext.conductor_version = '2.1.5' - ext.constraintlayout_version = '1.1.0' ext.dagger_version = "2.16" ext.espresso_version = '3.1.0-alpha3' ext.exoplayer_version = "2.8.1" @@ -13,6 +16,7 @@ buildscript { ext.junit_version = '4.12' ext.kotlin_version = '1.3.0' ext.lifecycle_version = '2.0.0' + ext.material_version = '1.0.0' ext.mockito_version = '2.18.3' ext.moshi_version = '1.6.0' ext.realm_version = '5.8.0' diff --git a/common/build.gradle b/common/build.gradle index b92bac84..648b5a03 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -31,7 +31,7 @@ android { } dependencies { - implementation "androidx.core:core-ktx:$androidx_version" + implementation "androidx.core:core-ktx:$androidx_core_version" implementation "com.jakewharton.timber:timber:$timber_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" diff --git a/data/build.gradle b/data/build.gradle index b1b684b3..fa088a55 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -43,9 +43,9 @@ android { dependencies { // androidx - implementation "androidx.appcompat:appcompat:$androidx_version" - implementation "androidx.core:core-ktx:$androidx_version" - implementation "androidx.exifinterface:exifinterface:$androidx_version" + implementation "androidx.appcompat:appcompat:$androidx_appcompat_version" + implementation "androidx.core:core-ktx:$androidx_core_version" + implementation "androidx.exifinterface:exifinterface:$androidx_exifinterface_version" // glide implementation "com.github.bumptech.glide:glide:$glide_version" diff --git a/domain/build.gradle b/domain/build.gradle index 7cdaf067..301d4f0f 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -46,7 +46,7 @@ dependencies { implementation "io.reactivex.rxjava2:rxjava:$rxjava_version" implementation "io.reactivex.rxjava2:rxkotlin:$rxkotlin_version" - implementation "androidx.core:core-ktx:$androidx_version" + implementation "androidx.core:core-ktx:$androidx_core_version" implementation "com.jakewharton.timber:timber:$timber_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation project(":common") diff --git a/presentation/build.gradle b/presentation/build.gradle index 7ab61fae..1b16cc3c 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -110,11 +110,11 @@ dependencies { implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version" // androidx - implementation "androidx.appcompat:appcompat:$androidx_version" - implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version" - implementation "androidx.core:core-ktx:$androidx_version" - implementation "com.google.android.material:material:$androidx_version" - implementation "androidx.emoji:emoji-appcompat:$androidx_version" + implementation "androidx.appcompat:appcompat:$androidx_appcompat_version" + implementation "androidx.constraintlayout:constraintlayout:$androidx_constraintlayout_version" + implementation "androidx.core:core-ktx:$androidx_core_version" + implementation "com.google.android.material:material:$material_version" + implementation "androidx.emoji:emoji-appcompat:$androidx_emoji_version" // conductor implementation "com.bluelinelabs:conductor:$conductor_version"