diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ec45212c2..87595a837 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -177,7 +177,6 @@ dependencies { kapt("com.google.dagger:hilt-compiler:${Versions.hilt}") kapt("androidx.hilt:hilt-compiler:${Versions.hilt_androidx}") implementation("androidx.hilt:hilt-work:${Versions.hilt_androidx}") - implementation("androidx.hilt:hilt-lifecycle-viewmodel:${Versions.hilt_androidx}") implementation("androidx.fragment:fragment-ktx:1.3.1") implementation("androidx.lifecycle:lifecycle-runtime-ktx:${Versions.lifecycle}") diff --git a/app/licenses.yml b/app/licenses.yml index 82eca2f69..1934be04a 100644 --- a/app/licenses.yml +++ b/app/licenses.yml @@ -612,12 +612,6 @@ license: The Apache Software License, Version 2.0 licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt url: https://developer.android.com/topic/libraries/architecture/index.html -- artifact: androidx.hilt:hilt-lifecycle-viewmodel:+ - name: hilt-lifecycle-viewmodel - copyrightHolder: Android Open Source Project - license: The Apache Software License, Version 2.0 - licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt - url: https://developer.android.com/topic/libraries/architecture/index.html - artifact: androidx.hilt:hilt-common:+ name: hilt-common copyrightHolder: Android Open Source Project diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json index acb42c7a4..9422619f0 100644 --- a/app/src/main/assets/licenses.json +++ b/app/src/main/assets/licenses.json @@ -1469,20 +1469,6 @@ "url": "https://developer.android.com/topic/libraries/architecture/index.html", "libraryName": "hilt-work" }, - { - "artifactId": { - "name": "hilt-lifecycle-viewmodel", - "group": "androidx.hilt", - "version": "+" - }, - "copyrightHolder": "Android Open Source Project", - "copyrightStatement": "Copyright © Android Open Source Project. All rights reserved.", - "license": "The Apache Software License, Version 2.0", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt", - "normalizedLicense": "apache2", - "url": "https://developer.android.com/topic/libraries/architecture/index.html", - "libraryName": "hilt-lifecycle-viewmodel" - }, { "artifactId": { "name": "hilt-common", diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index dde7cddd8..0e7951957 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -14,8 +14,8 @@ object Versions { const val mockito = "3.8.0" const val androidx_test = "1.3.0" const val make_it_easy = "4.0.1" - const val hilt = "2.32-alpha" - const val hilt_androidx = "1.0.0-alpha03" + const val hilt = "2.33-beta" + const val hilt_androidx = "1.0.0-beta01" const val lifecycle = "2.3.0" const val markwon = "4.6.2" const val compose = "1.0.0-beta02" diff --git a/deps_fdroid.txt b/deps_fdroid.txt index 2da5f2c2a..f2a751f5d 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -216,24 +216,24 @@ +| +--- 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.32-alpha -+| +--- com.google.dagger:dagger:2.32 +++--- com.google.dagger:hilt-android:2.33-beta ++| +--- com.google.dagger:dagger:2.33 +| | \--- javax.inject:javax.inject:1 -+| +--- com.google.dagger:dagger-lint-aar:2.32 -+| +--- com.google.dagger:hilt-core:2.32-alpha -+| | +--- com.google.dagger:dagger:2.32 (*) ++| +--- com.google.dagger:dagger-lint-aar:2.33 ++| +--- com.google.dagger:hilt-core:2.33-beta ++| | +--- com.google.dagger:dagger:2.33 (*) +| | \--- javax.inject:javax.inject:1 -+| +--- androidx.activity:activity:1.1.0 -> 1.2.1 (*) ++| +--- androidx.activity:activity:1.2.0 -> 1.2.1 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 -+| +--- androidx.fragment:fragment:1.2.5 -> 1.3.1 (*) -+| +--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 -> 2.3.0 (*) -+| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0 -> 2.3.0 (*) -+| +--- androidx.savedstate:savedstate:1.0.0 -> 1.1.0 (*) ++| +--- androidx.fragment:fragment:1.3.0 -> 1.3.1 (*) ++| +--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 (*) ++| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.0 (*) ++| +--- androidx.savedstate:savedstate:1.1.0 (*) +| \--- javax.inject:javax.inject:1 -++--- androidx.hilt:hilt-work:1.0.0-alpha03 +++--- androidx.hilt:hilt-work:1.0.0-beta01 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 -+| +--- androidx.hilt:hilt-common:1.0.0-alpha03 -+| | \--- com.google.dagger:hilt-core:2.31-alpha -> 2.32-alpha (*) ++| +--- androidx.hilt:hilt-common:1.0.0-beta01 ++| | \--- com.google.dagger:hilt-core:2.33-beta (*) +| +--- 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 (*) @@ -250,13 +250,7 @@ +| | +--- androidx.sqlite:sqlite-framework:2.1.0 (*) +| | +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) +| | \--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.2.0 (*) -+| \--- com.google.dagger:hilt-android:2.31-alpha -> 2.32-alpha (*) -++--- androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03 -+| +--- androidx.activity:activity:1.1.0 -> 1.2.1 (*) -+| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 -+| +--- androidx.hilt:hilt-common:1.0.0-alpha03 (*) -+| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0 -> 2.3.0 (*) -+| \--- com.google.dagger:hilt-android:2.31-alpha -> 2.32-alpha (*) ++| \--- com.google.dagger:hilt-android:2.33-beta (*) ++--- androidx.fragment:fragment-ktx:1.3.1 +| +--- androidx.fragment:fragment:1.3.1 (*) +| +--- androidx.activity:activity-ktx:1.2.1 diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 16e98a652..3067e26ac 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -330,24 +330,24 @@ +| +--- 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.32-alpha -+| +--- com.google.dagger:dagger:2.32 +++--- com.google.dagger:hilt-android:2.33-beta ++| +--- com.google.dagger:dagger:2.33 +| | \--- javax.inject:javax.inject:1 -+| +--- com.google.dagger:dagger-lint-aar:2.32 -+| +--- com.google.dagger:hilt-core:2.32-alpha -+| | +--- com.google.dagger:dagger:2.32 (*) ++| +--- com.google.dagger:dagger-lint-aar:2.33 ++| +--- com.google.dagger:hilt-core:2.33-beta ++| | +--- com.google.dagger:dagger:2.33 (*) +| | \--- javax.inject:javax.inject:1 -+| +--- androidx.activity:activity:1.1.0 -> 1.2.1 (*) ++| +--- androidx.activity:activity:1.2.0 -> 1.2.1 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 -+| +--- androidx.fragment:fragment:1.2.5 -> 1.3.1 (*) -+| +--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 -> 2.3.0 (*) -+| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0 -> 2.3.0 (*) -+| +--- androidx.savedstate:savedstate:1.0.0 -> 1.1.0 (*) ++| +--- androidx.fragment:fragment:1.3.0 -> 1.3.1 (*) ++| +--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 (*) ++| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.0 (*) ++| +--- androidx.savedstate:savedstate:1.1.0 (*) +| \--- javax.inject:javax.inject:1 -++--- androidx.hilt:hilt-work:1.0.0-alpha03 +++--- androidx.hilt:hilt-work:1.0.0-beta01 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 -+| +--- androidx.hilt:hilt-common:1.0.0-alpha03 -+| | \--- com.google.dagger:hilt-core:2.31-alpha -> 2.32-alpha (*) ++| +--- androidx.hilt:hilt-common:1.0.0-beta01 ++| | \--- com.google.dagger:hilt-core:2.33-beta (*) +| +--- 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 (*) @@ -364,13 +364,7 @@ +| | +--- androidx.sqlite:sqlite-framework:2.1.0 (*) +| | +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) +| | \--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.2.0 (*) -+| \--- com.google.dagger:hilt-android:2.31-alpha -> 2.32-alpha (*) -++--- androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03 -+| +--- androidx.activity:activity:1.1.0 -> 1.2.1 (*) -+| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 -+| +--- androidx.hilt:hilt-common:1.0.0-alpha03 (*) -+| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0 -> 2.3.0 (*) -+| \--- com.google.dagger:hilt-android:2.31-alpha -> 2.32-alpha (*) ++| \--- com.google.dagger:hilt-android:2.33-beta (*) ++--- androidx.fragment:fragment-ktx:1.3.1 +| +--- androidx.fragment:fragment:1.3.1 (*) +| +--- androidx.activity:activity-ktx:1.2.1