From 52757f794726bbad223c33ccf696f8d703370fc9 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Mon, 16 Dec 2024 01:07:54 -0600 Subject: [PATCH] Dagger 2.53 --- .../ThemedInjectingAppCompatActivity.kt | 2 +- deps_fdroid.txt | 22 ++++++++++--------- deps_googleplay.txt | 22 ++++++++++--------- gradle/libs.versions.toml | 2 +- 4 files changed, 26 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/org/tasks/injection/ThemedInjectingAppCompatActivity.kt b/app/src/main/java/org/tasks/injection/ThemedInjectingAppCompatActivity.kt index 76d036b90..ec4cd1d7c 100644 --- a/app/src/main/java/org/tasks/injection/ThemedInjectingAppCompatActivity.kt +++ b/app/src/main/java/org/tasks/injection/ThemedInjectingAppCompatActivity.kt @@ -8,7 +8,7 @@ import javax.inject.Inject abstract class ThemedInjectingAppCompatActivity protected constructor() : AppCompatActivity() { @Inject lateinit var tasksTheme: Theme - @Inject protected lateinit var themeColor: ThemeColor + @Inject lateinit var themeColor: ThemeColor override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/deps_fdroid.txt b/deps_fdroid.txt index ab3332264..db0e72ddc 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -1068,15 +1068,17 @@ ++--- org.dmfs:lib-recur:0.11.4 +| \--- org.dmfs:rfc5545-datetime:0.2.4 ++--- org.dmfs:jems:1.33 -++--- com.google.dagger:hilt-android:2.50 -+| +--- com.google.dagger:dagger:2.50 -+| | \--- javax.inject:javax.inject:1 -+| +--- com.google.dagger:dagger-lint-aar:2.50 -+| +--- com.google.dagger:hilt-core:2.50 -+| | +--- com.google.dagger:dagger:2.50 (*) +++--- com.google.dagger:hilt-android:2.53 ++| +--- com.google.dagger:dagger:2.53 ++| | +--- jakarta.inject:jakarta.inject-api:2.0.1 ++| | +--- javax.inject:javax.inject:1 ++| | \--- org.jspecify:jspecify:1.0.0 ++| +--- com.google.dagger:dagger-lint-aar:2.53 ++| +--- com.google.dagger:hilt-core:2.53 ++| | +--- com.google.dagger:dagger:2.53 (*) +| | \--- javax.inject:javax.inject:1 +| +--- androidx.activity:activity:1.5.1 -> 1.9.3 (*) -+| +--- androidx.annotation:annotation:1.2.0 -> 1.8.1 (*) ++| +--- androidx.annotation:annotation:1.3.0 -> 1.8.1 (*) +| +--- androidx.annotation:annotation-experimental:1.3.1 -> 1.4.1 (*) +| +--- androidx.fragment:fragment:1.5.1 -> 1.8.5 (*) +| +--- androidx.lifecycle:lifecycle-common:2.5.1 -> 2.8.7 (*) @@ -1084,11 +1086,11 @@ +| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1 -> 2.8.7 (*) +| +--- androidx.savedstate:savedstate:1.2.0 -> 1.2.1 (*) +| +--- javax.inject:javax.inject:1 -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.20 -> 2.0.21 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib:2.0.0-Beta5 -> 2.0.21 (*) ++--- androidx.hilt:hilt-work:1.2.0 +| +--- androidx.annotation:annotation:1.1.0 -> 1.8.1 (*) +| +--- androidx.hilt:hilt-common:1.2.0 -+| | \--- com.google.dagger:hilt-core:2.49 -> 2.50 (*) ++| | \--- com.google.dagger:hilt-core:2.49 -> 2.53 (*) +| +--- 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 (*) @@ -1100,7 +1102,7 @@ +| | +--- androidx.startup:startup-runtime:1.0.0 -> 1.1.1 (*) +| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.21 -> 2.0.21 (*) -+| \--- com.google.dagger:hilt-android:2.49 -> 2.50 (*) ++| \--- com.google.dagger:hilt-android:2.49 -> 2.53 (*) ++--- androidx.datastore:datastore-preferences:1.1.1 (*) ++--- androidx.fragment:fragment-ktx:1.8.5 +| +--- androidx.activity:activity-ktx:1.8.1 -> 1.9.3 (*) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index d503620fe..9a15d1697 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -1420,15 +1420,17 @@ ++--- org.dmfs:lib-recur:0.11.4 +| \--- org.dmfs:rfc5545-datetime:0.2.4 ++--- org.dmfs:jems:1.33 -++--- com.google.dagger:hilt-android:2.50 -+| +--- com.google.dagger:dagger:2.50 -+| | \--- javax.inject:javax.inject:1 -+| +--- com.google.dagger:dagger-lint-aar:2.50 -+| +--- com.google.dagger:hilt-core:2.50 -+| | +--- com.google.dagger:dagger:2.50 (*) +++--- com.google.dagger:hilt-android:2.53 ++| +--- com.google.dagger:dagger:2.53 ++| | +--- jakarta.inject:jakarta.inject-api:2.0.1 ++| | +--- javax.inject:javax.inject:1 ++| | \--- org.jspecify:jspecify:1.0.0 ++| +--- com.google.dagger:dagger-lint-aar:2.53 ++| +--- com.google.dagger:hilt-core:2.53 ++| | +--- com.google.dagger:dagger:2.53 (*) +| | \--- javax.inject:javax.inject:1 +| +--- androidx.activity:activity:1.5.1 -> 1.9.3 (*) -+| +--- androidx.annotation:annotation:1.2.0 -> 1.9.0 (*) ++| +--- androidx.annotation:annotation:1.3.0 -> 1.9.0 (*) +| +--- androidx.annotation:annotation-experimental:1.3.1 -> 1.4.1 (*) +| +--- androidx.fragment:fragment:1.5.1 -> 1.8.5 (*) +| +--- androidx.lifecycle:lifecycle-common:2.5.1 -> 2.8.7 (*) @@ -1436,11 +1438,11 @@ +| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1 -> 2.8.7 (*) +| +--- androidx.savedstate:savedstate:1.2.0 -> 1.2.1 (*) +| +--- javax.inject:javax.inject:1 -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.20 -> 2.0.21 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib:2.0.0-Beta5 -> 2.0.21 (*) ++--- androidx.hilt:hilt-work:1.2.0 +| +--- androidx.annotation:annotation:1.1.0 -> 1.9.0 (*) +| +--- androidx.hilt:hilt-common:1.2.0 -+| | \--- com.google.dagger:hilt-core:2.49 -> 2.50 (*) ++| | \--- com.google.dagger:hilt-core:2.49 -> 2.53 (*) +| +--- 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 (*) @@ -1452,7 +1454,7 @@ +| | +--- androidx.startup:startup-runtime:1.0.0 -> 1.1.1 (*) +| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.21 -> 2.0.21 (*) -+| \--- com.google.dagger:hilt-android:2.49 -> 2.50 (*) ++| \--- com.google.dagger:hilt-android:2.49 -> 2.53 (*) ++--- androidx.datastore:datastore-preferences:1.1.1 (*) ++--- androidx.fragment:fragment-ktx:1.8.5 +| +--- androidx.activity:activity-ktx:1.8.1 -> 1.9.3 (*) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7b8ae3eaf..26d0def16 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,7 @@ coil = "2.7.0" colorpicker = "0.0.15" compose = "2024.11.00" constraintlayout = "2.2.0" -dagger-hilt = "2.50" +dagger-hilt = "2.53" dashclock-api = "2.0.0" dav4jvm = "2.2.1" desugar_jdk_libs = "2.1.3"