From c8b2818e6ce9df38721b3f777aabdbe339c8aa69 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 27 Jan 2021 17:00:56 -0600 Subject: [PATCH] WorkManager 2.5.0 --- buildSrc/src/main/kotlin/Versions.kt | 2 +- deps_fdroid.txt | 29 ++++++++++++++-------------- deps_googleplay.txt | 29 ++++++++++++++-------------- 3 files changed, 31 insertions(+), 29 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 30897b75e..8c4400c4f 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -3,7 +3,7 @@ object Versions { const val targetSdk = 30 const val minSdk = 23 const val butterknife = "10.2.3" - const val work = "2.4.0" + const val work = "2.5.0" const val leakcanary = "2.6" const val room = "2.2.5" const val crashlytics = "17.2.2" diff --git a/deps_fdroid.txt b/deps_fdroid.txt index 800c0deca..218c6468a 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -159,18 +159,19 @@ +| | \--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 (*) +| +--- androidx.lifecycle:lifecycle-livedata-ktx:2.2.0 +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.21 (*) -+| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0 -> 1.3.4 -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.70 -> 1.4.21 (*) -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70 -> 1.4.21 ++| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0 -> 1.4.1 ++| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1 ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.21 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0 -> 1.4.21 +| | +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) +| | \--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0 +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.21 (*) +| | \--- androidx.lifecycle:lifecycle-livedata-core:2.2.0 (*) +| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.21 (*) -+| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.3.4 -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.70 -> 1.4.21 (*) -+| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.4 (*) ++| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.4.1 ++| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.21 (*) +| | \--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 (*) +| +--- com.google.android.material:material:1.2.1 +| | +--- androidx.annotation:annotation:1.0.1 -> 1.1.0 @@ -225,7 +226,7 @@ +| +--- androidx.annotation:annotation:1.1.0 +| +--- androidx.hilt:hilt-common:1.0.0-alpha02 +| | \--- com.google.dagger:hilt-android:2.28-alpha -> 2.29.1-alpha (*) -+| +--- androidx.work:work-runtime:2.3.4 -> 2.4.0 ++| +--- androidx.work:work-runtime:2.3.4 -> 2.5.0 +| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava +| | +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.2.0 (*) +| | +--- androidx.room:room-runtime:2.2.5 @@ -257,7 +258,7 @@ +| | +--- androidx.core:core-ktx:1.1.0 -> 1.3.2 (*) +| | +--- androidx.lifecycle:lifecycle-runtime-ktx:2.2.0 +| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.21 (*) -+| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.3.4 (*) ++| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.4.1 (*) +| | | +--- androidx.lifecycle:lifecycle-runtime:2.2.0 (*) +| | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 +| | \--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 (*) @@ -271,7 +272,7 @@ ++--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 (*) ++--- androidx.room:room-ktx:2.2.5 +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.41 -> 1.4.21 (*) -+| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.3.4 (*) ++| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.4.1 (*) +| +--- androidx.room:room-common:2.2.5 (*) +| \--- androidx.room:room-runtime:2.2.5 (*) ++--- io.reactivex.rxjava2:rxandroid:2.1.1 @@ -356,11 +357,11 @@ +| +--- com.google.http-client:google-http-client:1.37.0 (*) +| +--- com.google.http-client:google-http-client-jackson2:1.37.0 (*) +| \--- com.google.guava:guava:29.0-android (*) -++--- androidx.work:work-runtime:2.4.0 (*) -++--- androidx.work:work-runtime-ktx:2.4.0 -+| +--- androidx.work:work-runtime:2.4.0 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.71 -> 1.4.21 (*) -+| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.4 (*) +++--- androidx.work:work-runtime:2.5.0 (*) +++--- androidx.work:work-runtime-ktx:2.5.0 ++| +--- androidx.work:work-runtime:2.5.0 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.21 (*) ++| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*) ++--- com.mapbox.mapboxsdk:mapbox-android-core:3.1.0 ++--- com.mapbox.mapboxsdk:mapbox-sdk-services:5.3.0 +| +--- com.mapbox.mapboxsdk:mapbox-sdk-core:5.3.0 diff --git a/deps_googleplay.txt b/deps_googleplay.txt index c1dfefda4..6872c4ea2 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -275,18 +275,19 @@ +| +--- androidx.lifecycle:lifecycle-extensions:2.2.0 (*) +| +--- androidx.lifecycle:lifecycle-livedata-ktx:2.2.0 +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.21 (*) -+| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0 -> 1.3.4 -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.70 -> 1.4.21 (*) -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70 -> 1.4.21 ++| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0 -> 1.4.1 ++| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1 ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.21 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0 -> 1.4.21 +| | +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) +| | \--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0 +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.21 (*) +| | \--- androidx.lifecycle:lifecycle-livedata-core:2.2.0 (*) +| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.21 (*) -+| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.3.4 -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.70 -> 1.4.21 (*) -+| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.4 (*) ++| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.4.1 ++| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.21 (*) +| | \--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 (*) +| +--- com.google.android.material:material:1.2.1 +| | +--- androidx.annotation:annotation:1.0.1 -> 1.1.0 @@ -336,7 +337,7 @@ +| +--- androidx.annotation:annotation:1.1.0 +| +--- androidx.hilt:hilt-common:1.0.0-alpha02 +| | \--- com.google.dagger:hilt-android:2.28-alpha -> 2.29.1-alpha (*) -+| +--- androidx.work:work-runtime:2.3.4 -> 2.4.0 ++| +--- androidx.work:work-runtime:2.3.4 -> 2.5.0 +| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava +| | +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.2.0 (*) +| | +--- androidx.room:room-runtime:2.2.5 @@ -368,7 +369,7 @@ +| | +--- androidx.core:core-ktx:1.1.0 -> 1.3.2 (*) +| | +--- androidx.lifecycle:lifecycle-runtime-ktx:2.2.0 +| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.21 (*) -+| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.3.4 (*) ++| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.4.1 (*) +| | | +--- androidx.lifecycle:lifecycle-runtime:2.2.0 (*) +| | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 +| | \--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 (*) @@ -382,7 +383,7 @@ ++--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 (*) ++--- androidx.room:room-ktx:2.2.5 +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.41 -> 1.4.21 (*) -+| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.3.4 (*) ++| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.4.1 (*) +| +--- androidx.room:room-common:2.2.5 (*) +| \--- androidx.room:room-runtime:2.2.5 (*) ++--- io.reactivex.rxjava2:rxandroid:2.1.1 @@ -467,11 +468,11 @@ +| +--- com.google.http-client:google-http-client:1.37.0 (*) +| +--- com.google.http-client:google-http-client-jackson2:1.37.0 (*) +| \--- com.google.guava:guava:29.0-android (*) -++--- androidx.work:work-runtime:2.4.0 (*) -++--- androidx.work:work-runtime-ktx:2.4.0 -+| +--- androidx.work:work-runtime:2.4.0 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.71 -> 1.4.21 (*) -+| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.4 (*) +++--- androidx.work:work-runtime:2.5.0 (*) +++--- androidx.work:work-runtime-ktx:2.5.0 ++| +--- androidx.work:work-runtime:2.5.0 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.21 (*) ++| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*) ++--- com.mapbox.mapboxsdk:mapbox-android-core:3.1.0 ++--- com.mapbox.mapboxsdk:mapbox-sdk-services:5.3.0 +| +--- com.mapbox.mapboxsdk:mapbox-sdk-core:5.3.0