From 5d44fa5753e518fc39e9aff4102568a8616cf08d Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 18 Dec 2024 02:12:01 -0600 Subject: [PATCH] WorkManager 2.10.0 --- .../main/java/org/tasks/TasksApplication.kt | 3 +- deps_fdroid.txt | 54 ++++++++++++------- deps_googleplay.txt | 51 +++++++++++------- gradle/libs.versions.toml | 4 +- 4 files changed, 73 insertions(+), 39 deletions(-) diff --git a/app/src/main/java/org/tasks/TasksApplication.kt b/app/src/main/java/org/tasks/TasksApplication.kt index 7ad86699a..2448a1bf6 100644 --- a/app/src/main/java/org/tasks/TasksApplication.kt +++ b/app/src/main/java/org/tasks/TasksApplication.kt @@ -130,7 +130,8 @@ class TasksApplication : Application(), Configuration.Provider { CaldavSynchronizer.registerFactories() } - override fun getWorkManagerConfiguration(): Configuration = Configuration.Builder() + override val workManagerConfiguration: Configuration + get() = Configuration.Builder() .setWorkerFactory(workerFactory) .setMinimumLoggingLevel(if (BuildConfig.DEBUG) Log.DEBUG else Log.INFO) .build() diff --git a/deps_fdroid.txt b/deps_fdroid.txt index 7fcfd93c4..e7efcbae9 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -57,8 +57,9 @@ +| | | \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava +| | +--- androidx.startup:startup-runtime:1.1.1 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.8.1 (*) -+| | | \--- androidx.tracing:tracing:1.0.0 -+| | | \--- androidx.annotation:annotation:1.1.0 -> 1.8.1 (*) ++| | | \--- androidx.tracing:tracing:1.0.0 -> 1.2.0 ++| | | +--- androidx.annotation:annotation:1.2.0 -> 1.8.1 (*) ++| | | \--- androidx.tracing:tracing-ktx:1.2.0 (c) +| | \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.0 (*) +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 -> 1.8.1 @@ -237,6 +238,7 @@ +| | | \--- androidx.room:room-common-jvm:2.7.0-alpha12 +| | | +--- androidx.annotation:annotation:1.8.1 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.0 (*) ++| | | +--- androidx.room:room-ktx:2.7.0-alpha12 (c) +| | | +--- androidx.room:room-runtime:2.7.0-alpha12 (c) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.0 (c) +| | +--- androidx.sqlite:sqlite:2.5.0-alpha12 @@ -259,7 +261,8 @@ +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 -> 1.8.1 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 -> 1.8.1 (*) +| | +--- androidx.room:room-common:2.7.0-alpha12 (c) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.0 (c) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.0 (c) ++| | \--- androidx.room:room-ktx:2.7.0-alpha12 (c) +| +--- org.jetbrains.kotlinx:kotlinx-datetime:0.6.1 +| | \--- org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.1 +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.21 -> 2.1.0 (*) @@ -389,7 +392,7 @@ +| | | | | | | | | | \--- androidx.lifecycle:lifecycle-common-java8:2.8.7 (c) +| | | | | | | | | +--- androidx.profileinstaller:profileinstaller:1.3.1 -> 1.4.0 (*) +| | | | | | | | | +--- androidx.savedstate:savedstate:1.2.1 (*) -+| | | | | | | | | +--- androidx.tracing:tracing:1.0.0 (*) ++| | | | | | | | | +--- androidx.tracing:tracing:1.0.0 -> 1.2.0 (*) +| | | | | | | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.0 (*) +| | | | | | | | | +--- androidx.activity:activity-compose:1.9.3 (c) +| | | | | | | | | \--- androidx.activity:activity-ktx:1.9.3 (c) @@ -1091,17 +1094,33 @@ +| +--- androidx.annotation:annotation:1.1.0 -> 1.8.1 (*) +| +--- androidx.hilt:hilt-common:1.2.0 +| | \--- com.google.dagger:hilt-core:2.49 -> 2.53.1 (*) -+| +--- androidx.work:work-runtime:2.3.4 -> 2.8.1 -+| | +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.4.1 (*) -+| | +--- androidx.core:core:1.1.0 -> 1.13.1 (*) -+| | +--- androidx.core:core:1.6.0 -> 1.13.1 (*) -+| | +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.8.7 (*) -+| | +--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.8.7 (*) -+| | +--- androidx.room:room-runtime:2.5.0 -> 2.7.0-alpha12 (*) -+| | +--- androidx.sqlite:sqlite-framework:2.3.0 -> 2.5.0-alpha12 (*) -+| | +--- androidx.startup:startup-runtime:1.0.0 -> 1.1.1 (*) ++| +--- androidx.work:work-runtime:2.3.4 -> 2.10.0 ++| | +--- androidx.annotation:annotation-experimental:1.4.1 (*) ++| | +--- androidx.concurrent:concurrent-futures-ktx:1.1.0 ++| | | +--- androidx.concurrent:concurrent-futures:1.1.0 (*) ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.71 -> 2.1.0 (*) ++| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.4 -> 1.8.1 (*) ++| | +--- androidx.core:core:1.12.0 -> 1.13.1 (*) ++| | +--- androidx.lifecycle:lifecycle-livedata:2.6.2 -> 2.8.7 (*) ++| | +--- androidx.lifecycle:lifecycle-service:2.6.2 -> 2.8.7 (*) ++| | +--- androidx.room:room-ktx:2.6.1 -> 2.7.0-alpha12 ++| | | +--- androidx.room:room-common:2.7.0-alpha12 (*) ++| | | +--- androidx.room:room-runtime:2.7.0-alpha12 (*) ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.0 (*) ++| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 -> 1.8.1 (*) ++| | | +--- androidx.room:room-common:2.7.0-alpha12 (c) ++| | | +--- androidx.room:room-runtime:2.7.0-alpha12 (c) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.0 (c) ++| | +--- androidx.startup:startup-runtime:1.1.1 (*) ++| | +--- androidx.tracing:tracing-ktx:1.2.0 ++| | | +--- androidx.tracing:tracing:1.2.0 (*) ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.21 -> 2.1.0 (*) ++| | | \--- androidx.tracing:tracing:1.2.0 (c) +| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.21 -> 2.1.0 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.0 (*) ++| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 -> 1.8.1 (*) ++| | +--- androidx.work:work-runtime-ktx:2.10.0 (c) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.0 (c) +| \--- com.google.dagger:hilt-android:2.49 -> 2.53.1 (*) ++--- androidx.datastore:datastore-preferences:1.1.1 (*) ++--- androidx.fragment:fragment-ktx:1.8.5 @@ -1208,10 +1227,9 @@ ++--- com.google.apis:google-api-services-drive:v3-rev20241027-2.0.0 +| \--- com.google.api-client:google-api-client:2.7.0 (*) ++--- com.google.auth:google-auth-library-oauth2-http:1.30.1 (*) -++--- androidx.work:work-runtime-ktx:2.8.1 -+| +--- androidx.work:work-runtime:2.8.1 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.21 -> 2.1.0 (*) -+| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.8.1 (*) +++--- androidx.work:work-runtime-ktx:2.10.0 ++| +--- androidx.work:work-runtime:2.10.0 (*) ++| \--- androidx.work:work-runtime:2.10.0 (c) ++--- com.etebase:client:2.3.2 +| +--- androidx.annotation:annotation:1.1.0 -> 1.8.1 (*) +| \--- com.squareup.okhttp3:logging-interceptor:3.12.1 diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 2b69bce4b..4c0835342 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -58,8 +58,9 @@ +| | | \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava +| | +--- androidx.startup:startup-runtime:1.1.1 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.9.0 (*) -+| | | \--- androidx.tracing:tracing:1.0.0 -+| | | \--- androidx.annotation:annotation:1.1.0 -> 1.9.0 (*) ++| | | \--- androidx.tracing:tracing:1.0.0 -> 1.2.0 ++| | | +--- androidx.annotation:annotation:1.2.0 -> 1.9.0 (*) ++| | | \--- androidx.tracing:tracing-ktx:1.2.0 (c) +| | \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.0 (*) +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 -> 1.8.1 @@ -293,7 +294,7 @@ +| | | | | | | \--- androidx.lifecycle:lifecycle-common-java8:2.8.7 (c) +| | | | | | +--- androidx.profileinstaller:profileinstaller:1.3.1 -> 1.4.0 (*) +| | | | | | +--- androidx.savedstate:savedstate:1.2.1 (*) -+| | | | | | +--- androidx.tracing:tracing:1.0.0 (*) ++| | | | | | +--- androidx.tracing:tracing:1.0.0 -> 1.2.0 (*) +| | | | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.0 (*) +| | | | | | +--- androidx.activity:activity-compose:1.9.3 (c) +| | | | | | \--- androidx.activity:activity-ktx:1.9.3 (c) @@ -771,6 +772,7 @@ +| | | \--- androidx.room:room-common-jvm:2.7.0-alpha12 +| | | +--- androidx.annotation:annotation:1.8.1 -> 1.9.0 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.0 (*) ++| | | +--- androidx.room:room-ktx:2.7.0-alpha12 (c) +| | | +--- androidx.room:room-runtime:2.7.0-alpha12 (c) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.0 (c) +| | +--- androidx.sqlite:sqlite:2.5.0-alpha12 @@ -793,7 +795,8 @@ +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 -> 1.8.1 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 -> 1.8.1 (*) +| | +--- androidx.room:room-common:2.7.0-alpha12 (c) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.0 (c) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.0 (c) ++| | \--- androidx.room:room-ktx:2.7.0-alpha12 (c) +| +--- org.jetbrains.kotlinx:kotlinx-datetime:0.6.1 +| | \--- org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.1 +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.21 -> 2.1.0 (*) @@ -1443,17 +1446,30 @@ +| +--- androidx.annotation:annotation:1.1.0 -> 1.9.0 (*) +| +--- androidx.hilt:hilt-common:1.2.0 +| | \--- com.google.dagger:hilt-core:2.49 -> 2.53.1 (*) -+| +--- androidx.work:work-runtime:2.3.4 -> 2.8.1 -+| | +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.4.1 (*) -+| | +--- androidx.core:core:1.1.0 -> 1.13.1 (*) -+| | +--- androidx.core:core:1.6.0 -> 1.13.1 (*) -+| | +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.8.7 (*) -+| | +--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.8.7 (*) -+| | +--- androidx.room:room-runtime:2.5.0 -> 2.7.0-alpha12 (*) -+| | +--- androidx.sqlite:sqlite-framework:2.3.0 -> 2.5.0-alpha12 (*) -+| | +--- androidx.startup:startup-runtime:1.0.0 -> 1.1.1 (*) ++| +--- androidx.work:work-runtime:2.3.4 -> 2.10.0 ++| | +--- androidx.annotation:annotation-experimental:1.4.1 (*) ++| | +--- androidx.concurrent:concurrent-futures-ktx:1.1.0 (*) ++| | +--- androidx.core:core:1.12.0 -> 1.13.1 (*) ++| | +--- androidx.lifecycle:lifecycle-livedata:2.6.2 -> 2.8.7 (*) ++| | +--- androidx.lifecycle:lifecycle-service:2.6.2 -> 2.8.7 (*) ++| | +--- androidx.room:room-ktx:2.6.1 -> 2.7.0-alpha12 ++| | | +--- androidx.room:room-common:2.7.0-alpha12 (*) ++| | | +--- androidx.room:room-runtime:2.7.0-alpha12 (*) ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.0 (*) ++| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 -> 1.8.1 (*) ++| | | +--- androidx.room:room-common:2.7.0-alpha12 (c) ++| | | +--- androidx.room:room-runtime:2.7.0-alpha12 (c) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.0 (c) ++| | +--- androidx.startup:startup-runtime:1.1.1 (*) ++| | +--- androidx.tracing:tracing-ktx:1.2.0 ++| | | +--- androidx.tracing:tracing:1.2.0 (*) ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.21 -> 2.1.0 (*) ++| | | \--- androidx.tracing:tracing:1.2.0 (c) +| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.21 -> 2.1.0 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.0 (*) ++| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 -> 1.8.1 (*) ++| | +--- androidx.work:work-runtime-ktx:2.10.0 (c) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.0 (c) +| \--- com.google.dagger:hilt-android:2.49 -> 2.53.1 (*) ++--- androidx.datastore:datastore-preferences:1.1.1 (*) ++--- androidx.fragment:fragment-ktx:1.8.5 @@ -1557,10 +1573,9 @@ ++--- com.google.apis:google-api-services-drive:v3-rev20241027-2.0.0 +| \--- com.google.api-client:google-api-client:2.7.0 (*) ++--- com.google.auth:google-auth-library-oauth2-http:1.30.1 (*) -++--- androidx.work:work-runtime-ktx:2.8.1 -+| +--- androidx.work:work-runtime:2.8.1 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.21 -> 2.1.0 (*) -+| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.8.1 (*) +++--- androidx.work:work-runtime-ktx:2.10.0 ++| +--- androidx.work:work-runtime:2.10.0 (*) ++| \--- androidx.work:work-runtime:2.10.0 (c) ++--- com.etebase:client:2.3.2 +| +--- androidx.annotation:annotation:1.1.0 -> 1.9.0 (*) +| \--- com.squareup.okhttp3:logging-interceptor:3.12.1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 40686c997..3bcf8fe25 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ versionCode = "140204" # increment by 2 versionName = "14.2.1" agp = "8.7.3" -android-compileSdk = "34" +android-compileSdk = "35" android-minSdk = "24" android-targetSdk = "34" accompanist = "0.37.0" @@ -63,7 +63,7 @@ shortcut-badger = "1.1.22" soloader = "0.12.1" timber = "5.0.1" swiperefreshlayout = "1.1.0" -work = "2.8.1" +work = "2.10.0" androidx-test = "1.6.1" androidx-test-runner = "1.6.2" xpp3 = "1.1.6"