Permalink
Browse files

Combine core-ktx with core versioning

core-ktx is linked to the versioning of core, so we can safely combine the versions
  • Loading branch information...
ianhanniballake committed Dec 5, 2018
1 parent b357faf commit 3039b1ef3bd6ce73ac71630692d54b0b42032712
@@ -22,10 +22,9 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
implementation "androidx.core:core-ktx:$rootProject.ext.ktxVersion"
implementation project(':muzei-api')
implementation project(':extensions')
implementation "androidx.core:core:$coreVersion"
implementation "androidx.core:core-ktx:$coreVersion"
implementation "androidx.exifinterface:exifinterface:$exifInterfaceVersion"
api "androidx.lifecycle:lifecycle-livedata:$lifecycleVersion"
kapt "androidx.lifecycle:lifecycle-compiler:$lifecycleVersion"
@@ -21,10 +21,9 @@ buildscript {

kotlinVersion = "1.3.0"
coroutinesVersion = "1.0.0"
ktxVersion = "1.0.1"
multidexVersion = "2.0.0"
appCompatVersion = "1.0.0"
coreVersion = "1.0.0"
coreVersion = "1.0.1"
browserVersion = "1.0.0"
exifInterfaceVersion = "1.0.0"
fragmentVersion = "1.0.0"
@@ -19,7 +19,7 @@ apply plugin: 'kotlin-android'

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
implementation "androidx.core:core-ktx:$rootProject.ext.ktxVersion"
implementation "androidx.core:core-ktx:$coreVersion"
implementation "android.arch.work:work-runtime-ktx:$workManagerVersion"
implementation "com.squareup.retrofit2:retrofit:2.3.0"
implementation "com.squareup.retrofit2:converter-moshi:2.3.0"
@@ -99,7 +99,6 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
implementation "androidx.core:core-ktx:$rootProject.ext.ktxVersion"
implementation "androidx.multidex:multidex:$multidexVersion"
implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
implementation "com.github.bumptech.glide:glide:$glideVersion"
@@ -22,7 +22,7 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
implementation "androidx.core:core-ktx:$rootProject.ext.ktxVersion"
implementation "androidx.core:core-ktx:$coreVersion"
implementation ("android.arch.work:work-runtime-ktx:$workManagerVersion") {
exclude module: 'support-fragment'
}
@@ -22,7 +22,6 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
implementation "androidx.core:core-ktx:$rootProject.ext.ktxVersion"
implementation project(':muzei-api')
implementation project(':extensions')
implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
@@ -22,7 +22,7 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
implementation "androidx.core:core-ktx:$rootProject.ext.ktxVersion"
implementation "androidx.core:core-ktx:$coreVersion"
api project(':muzei-api')
implementation project(':extensions')
api "androidx.lifecycle:lifecycle-livedata:$lifecycleVersion"
@@ -86,9 +86,8 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
implementation "androidx.core:core-ktx:$rootProject.ext.ktxVersion"
implementation "android.arch.work:work-runtime-ktx:$workManagerVersion"
implementation "androidx.core:core:$coreVersion"
implementation "androidx.core:core-ktx:$coreVersion"
implementation "androidx.exifinterface:exifinterface:$exifInterfaceVersion"
implementation "androidx.wear:wear:$wearVersion"
compileOnly "com.google.android.wearable:wearable:$wearableVersion"

0 comments on commit 3039b1e

Please sign in to comment.