diff --git a/deps_googleplay.txt b/deps_googleplay.txt index a23b5cb58..c434076ed 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -223,17 +223,17 @@ +| +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7 (c) +| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7 (c) +| \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7 (c) -++--- com.google.firebase:firebase-bom:33.9.0 -+| +--- com.google.firebase:firebase-analytics:22.2.0 (c) +++--- com.google.firebase:firebase-bom:33.10.0 ++| +--- com.google.firebase:firebase-analytics:22.3.0 (c) +| +--- com.google.firebase:firebase-config-ktx:22.1.0 (c) -+| +--- com.google.firebase:firebase-crashlytics:19.4.0 (c) ++| +--- com.google.firebase:firebase-crashlytics:19.4.1 (c) +| +--- com.google.firebase:firebase-config:22.1.0 (c) +| +--- com.google.firebase:firebase-common:21.0.0 (c) +| +--- com.google.firebase:firebase-common-ktx:21.0.0 (c) +| +--- com.google.firebase:firebase-installations:18.0.0 (c) +| \--- com.google.firebase:firebase-encoders:17.0.0 (c) -++--- com.google.firebase:firebase-crashlytics -> 19.4.0 -+| +--- com.google.firebase:firebase-sessions:2.0.8 +++--- com.google.firebase:firebase-crashlytics -> 19.4.1 ++| +--- com.google.firebase:firebase-sessions:2.0.9 +| | +--- com.google.firebase:firebase-common:21.0.0 +| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4 -> 1.10.1 +| | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1 (*) @@ -483,8 +483,8 @@ +| +--- com.google.android.datatransport:transport-backend-cct:3.3.0 (*) +| +--- com.google.android.datatransport:transport-runtime:3.3.0 (*) +| \--- androidx.annotation:annotation:1.5.0 -> 1.9.1 (*) -++--- com.google.firebase:firebase-analytics -> 22.2.0 -+| +--- com.google.android.gms:play-services-measurement:22.2.0 +++--- com.google.firebase:firebase-analytics -> 22.3.0 ++| +--- com.google.android.gms:play-services-measurement:22.3.0 +| | +--- androidx.collection:collection:1.0.0 -> 1.4.4 (*) +| | +--- androidx.legacy:legacy-support-core-utils:1.0.0 +| | | +--- androidx.annotation:annotation:1.0.0 -> 1.9.1 (*) @@ -497,29 +497,26 @@ +| | | \--- androidx.print:print:1.0.0 +| | | \--- androidx.annotation:annotation:1.0.0 -> 1.9.1 (*) +| | +--- com.google.android.gms:play-services-basement:18.5.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-base:22.2.0 ++| | +--- com.google.android.gms:play-services-measurement-base:22.3.0 +| | | \--- com.google.android.gms:play-services-basement:18.5.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-impl:22.2.0 ++| | +--- com.google.android.gms:play-services-measurement-impl:22.3.0 +| | | +--- androidx.collection:collection:1.0.0 -> 1.4.4 (*) +| | | +--- androidx.core:core:1.9.0 -> 1.13.1 (*) -+| | | +--- androidx.privacysandbox.ads:ads-adservices:1.0.0-beta05 -+| | | | +--- androidx.annotation:annotation:1.6.0 -> 1.9.1 (*) ++| | | +--- androidx.privacysandbox.ads:ads-adservices:1.1.0-beta11 ++| | | | +--- androidx.annotation:annotation:1.8.1 -> 1.9.1 (*) +| | | | +--- androidx.core:core-ktx:1.8.0 -> 1.13.1 (*) -+| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.21 -> 2.1.10 (*) -+| | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 -> 1.10.1 (*) -+| | | | \--- androidx.privacysandbox.ads:ads-adservices-java:1.0.0-beta05 (c) -+| | | +--- androidx.privacysandbox.ads:ads-adservices-java:1.0.0-beta05 -+| | | | +--- androidx.annotation:annotation:1.2.0 -> 1.9.1 (*) ++| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.10 (*) ++| | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 -> 1.10.1 (*) ++| | | | \--- androidx.privacysandbox.ads:ads-adservices-java:1.1.0-beta11 (c) ++| | | +--- androidx.privacysandbox.ads:ads-adservices-java:1.1.0-beta11 ++| | | | +--- androidx.annotation:annotation:1.8.1 -> 1.9.1 (*) +| | | | +--- androidx.concurrent:concurrent-futures:1.1.0 (*) +| | | | +--- androidx.core:core-ktx:1.8.0 -> 1.13.1 (*) -+| | | | +--- androidx.privacysandbox.ads:ads-adservices:1.0.0-beta05 (*) -+| | | | +--- com.google.guava:guava:31.1-android -> 33.4.0-android -+| | | | | +--- com.google.guava:failureaccess:1.0.2 -+| | | | | \--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava ++| | | | +--- androidx.privacysandbox.ads:ads-adservices:1.1.0-beta11 (*) +| | | | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava -+| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.21 -> 2.1.10 (*) -+| | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 -> 1.10.1 (*) -+| | | | \--- androidx.privacysandbox.ads:ads-adservices:1.0.0-beta05 (c) ++| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.10 (*) ++| | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 -> 1.10.1 (*) ++| | | | \--- androidx.privacysandbox.ads:ads-adservices:1.1.0-beta11 (c) +| | | +--- com.google.android.gms:play-services-base:18.5.0 +| | | | +--- androidx.collection:collection:1.0.0 -> 1.4.4 (*) +| | | | +--- androidx.core:core:1.2.0 -> 1.13.1 (*) @@ -527,20 +524,22 @@ +| | | | +--- com.google.android.gms:play-services-basement:18.4.0 -> 18.5.0 (*) +| | | | \--- com.google.android.gms:play-services-tasks:18.2.0 (*) +| | | +--- com.google.android.gms:play-services-basement:18.5.0 (*) -+| | | +--- com.google.android.gms:play-services-measurement-base:22.2.0 (*) ++| | | +--- com.google.android.gms:play-services-measurement-base:22.3.0 (*) +| | | +--- com.google.android.gms:play-services-stats:17.0.2 +| | | | +--- androidx.legacy:legacy-support-core-utils:1.0.0 (*) +| | | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.5.0 (*) +| | | +--- com.google.android.gms:play-services-tasks:18.2.0 (*) -+| | | \--- com.google.guava:guava:31.1-android -> 33.4.0-android (*) -+| | +--- com.google.android.gms:play-services-measurement-sdk-api:22.2.0 ++| | | \--- com.google.guava:guava:31.1-android -> 33.4.0-android ++| | | +--- com.google.guava:failureaccess:1.0.2 ++| | | \--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava ++| | +--- com.google.android.gms:play-services-measurement-sdk-api:22.3.0 +| | | +--- com.google.android.gms:play-services-basement:18.5.0 (*) -+| | | \--- com.google.android.gms:play-services-measurement-base:22.2.0 (*) ++| | | \--- com.google.android.gms:play-services-measurement-base:22.3.0 (*) +| | \--- com.google.android.gms:play-services-stats:17.0.2 (*) -+| +--- com.google.android.gms:play-services-measurement-api:22.2.0 ++| +--- com.google.android.gms:play-services-measurement-api:22.3.0 +| | +--- com.google.android.gms:play-services-basement:18.5.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-base:22.2.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-sdk-api:22.2.0 (*) ++| | +--- com.google.android.gms:play-services-measurement-base:22.3.0 (*) ++| | +--- com.google.android.gms:play-services-measurement-sdk-api:22.3.0 (*) +| | +--- com.google.android.gms:play-services-tasks:18.2.0 (*) +| | +--- com.google.firebase:firebase-common:21.0.0 (*) +| | +--- com.google.firebase:firebase-common-ktx:21.0.0 (*) @@ -550,11 +549,11 @@ +| | +--- com.google.firebase:firebase-measurement-connector:19.0.0 -> 20.0.1 (*) +| | +--- com.google.guava:guava:31.1-android -> 33.4.0-android (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.0 -> 2.1.10 (*) -+| \--- com.google.android.gms:play-services-measurement-sdk:22.2.0 ++| \--- com.google.android.gms:play-services-measurement-sdk:22.3.0 +| +--- androidx.collection:collection:1.0.0 -> 1.4.4 (*) +| +--- com.google.android.gms:play-services-basement:18.5.0 (*) -+| +--- com.google.android.gms:play-services-measurement-base:22.2.0 (*) -+| \--- com.google.android.gms:play-services-measurement-impl:22.2.0 (*) ++| +--- com.google.android.gms:play-services-measurement-base:22.3.0 (*) ++| \--- com.google.android.gms:play-services-measurement-impl:22.3.0 (*) ++--- com.google.firebase:firebase-config-ktx -> 22.1.0 +| +--- com.google.firebase:firebase-config:22.1.0 +| | +--- com.google.firebase:firebase-config-interop:16.0.1 (*) diff --git a/deps_wear.txt b/deps_wear.txt index 568c2c08b..919ac7eb1 100644 --- a/deps_wear.txt +++ b/deps_wear.txt @@ -1026,15 +1026,15 @@ ++--- androidx.compose.ui:ui-tooling-preview -> 1.7.8 +| \--- androidx.compose.ui:ui-tooling-preview-android:1.7.8 (*) ++--- androidx.compose.material:material-icons-extended -> 1.7.5 (*) -++--- com.google.firebase:firebase-bom:33.9.0 -+| +--- com.google.firebase:firebase-analytics:22.2.0 (c) -+| +--- com.google.firebase:firebase-crashlytics:19.4.0 (c) +++--- com.google.firebase:firebase-bom:33.10.0 ++| +--- com.google.firebase:firebase-analytics:22.3.0 (c) ++| +--- com.google.firebase:firebase-crashlytics:19.4.1 (c) +| +--- com.google.firebase:firebase-common:21.0.0 (c) +| +--- com.google.firebase:firebase-common-ktx:21.0.0 (c) +| +--- com.google.firebase:firebase-encoders:17.0.0 (c) +| \--- com.google.firebase:firebase-installations:18.0.0 (c) -++--- com.google.firebase:firebase-crashlytics -> 19.4.0 -+| +--- com.google.firebase:firebase-sessions:2.0.8 +++--- com.google.firebase:firebase-crashlytics -> 19.4.1 ++| +--- com.google.firebase:firebase-sessions:2.0.9 +| | +--- com.google.firebase:firebase-common:21.0.0 +| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4 -> 1.8.1 (*) +| | | +--- com.google.firebase:firebase-components:18.0.0 @@ -1118,8 +1118,8 @@ +| +--- com.google.android.datatransport:transport-backend-cct:3.3.0 (*) +| +--- com.google.android.datatransport:transport-runtime:3.3.0 (*) +| \--- androidx.annotation:annotation:1.5.0 -> 1.9.1 (*) -++--- com.google.firebase:firebase-analytics -> 22.2.0 -+| +--- com.google.android.gms:play-services-measurement:22.2.0 +++--- com.google.firebase:firebase-analytics -> 22.3.0 ++| +--- com.google.android.gms:play-services-measurement:22.3.0 +| | +--- androidx.collection:collection:1.0.0 -> 1.4.4 (*) +| | +--- androidx.legacy:legacy-support-core-utils:1.0.0 +| | | +--- androidx.annotation:annotation:1.0.0 -> 1.9.1 (*) @@ -1132,43 +1132,42 @@ +| | | \--- androidx.print:print:1.0.0 +| | | \--- androidx.annotation:annotation:1.0.0 -> 1.9.1 (*) +| | +--- com.google.android.gms:play-services-basement:18.5.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-base:22.2.0 ++| | +--- com.google.android.gms:play-services-measurement-base:22.3.0 +| | | \--- com.google.android.gms:play-services-basement:18.5.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-impl:22.2.0 ++| | +--- com.google.android.gms:play-services-measurement-impl:22.3.0 +| | | +--- androidx.collection:collection:1.0.0 -> 1.4.4 (*) +| | | +--- androidx.core:core:1.9.0 -> 1.13.1 (*) -+| | | +--- androidx.privacysandbox.ads:ads-adservices:1.0.0-beta05 -+| | | | +--- androidx.annotation:annotation:1.6.0 -> 1.9.1 (*) ++| | | +--- androidx.privacysandbox.ads:ads-adservices:1.1.0-beta11 ++| | | | +--- androidx.annotation:annotation:1.8.1 -> 1.9.1 (*) +| | | | +--- androidx.core:core-ktx:1.8.0 -> 1.13.1 (*) -+| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.21 -> 2.1.10 (*) -+| | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 -> 1.8.1 (*) -+| | | | \--- androidx.privacysandbox.ads:ads-adservices-java:1.0.0-beta05 (c) -+| | | +--- androidx.privacysandbox.ads:ads-adservices-java:1.0.0-beta05 -+| | | | +--- androidx.annotation:annotation:1.2.0 -> 1.9.1 (*) ++| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.10 (*) ++| | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 -> 1.8.1 (*) ++| | | | \--- androidx.privacysandbox.ads:ads-adservices-java:1.1.0-beta11 (c) ++| | | +--- androidx.privacysandbox.ads:ads-adservices-java:1.1.0-beta11 ++| | | | +--- androidx.annotation:annotation:1.8.1 -> 1.9.1 (*) +| | | | +--- androidx.concurrent:concurrent-futures:1.1.0 -> 1.2.0 (*) +| | | | +--- androidx.core:core-ktx:1.8.0 -> 1.13.1 (*) -+| | | | +--- androidx.privacysandbox.ads:ads-adservices:1.0.0-beta05 (*) -+| | | | +--- com.google.guava:guava:31.1-android -> 33.3.1-android (*) ++| | | | +--- androidx.privacysandbox.ads:ads-adservices:1.1.0-beta11 (*) +| | | | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava -+| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.21 -> 2.1.10 (*) -+| | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 -> 1.8.1 (*) -+| | | | \--- androidx.privacysandbox.ads:ads-adservices:1.0.0-beta05 (c) ++| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.10 (*) ++| | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 -> 1.8.1 (*) ++| | | | \--- androidx.privacysandbox.ads:ads-adservices:1.1.0-beta11 (c) +| | | +--- com.google.android.gms:play-services-base:18.5.0 (*) +| | | +--- com.google.android.gms:play-services-basement:18.5.0 (*) -+| | | +--- com.google.android.gms:play-services-measurement-base:22.2.0 (*) ++| | | +--- com.google.android.gms:play-services-measurement-base:22.3.0 (*) +| | | +--- com.google.android.gms:play-services-stats:17.0.2 +| | | | +--- androidx.legacy:legacy-support-core-utils:1.0.0 (*) +| | | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.5.0 (*) +| | | +--- com.google.android.gms:play-services-tasks:18.2.0 (*) +| | | \--- com.google.guava:guava:31.1-android -> 33.3.1-android (*) -+| | +--- com.google.android.gms:play-services-measurement-sdk-api:22.2.0 ++| | +--- com.google.android.gms:play-services-measurement-sdk-api:22.3.0 +| | | +--- com.google.android.gms:play-services-basement:18.5.0 (*) -+| | | \--- com.google.android.gms:play-services-measurement-base:22.2.0 (*) ++| | | \--- com.google.android.gms:play-services-measurement-base:22.3.0 (*) +| | \--- com.google.android.gms:play-services-stats:17.0.2 (*) -+| +--- com.google.android.gms:play-services-measurement-api:22.2.0 ++| +--- com.google.android.gms:play-services-measurement-api:22.3.0 +| | +--- com.google.android.gms:play-services-basement:18.5.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-base:22.2.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-sdk-api:22.2.0 (*) ++| | +--- com.google.android.gms:play-services-measurement-base:22.3.0 (*) ++| | +--- com.google.android.gms:play-services-measurement-sdk-api:22.3.0 (*) +| | +--- com.google.android.gms:play-services-tasks:18.2.0 (*) +| | +--- com.google.firebase:firebase-common:21.0.0 (*) +| | +--- com.google.firebase:firebase-common-ktx:21.0.0 (*) @@ -1178,11 +1177,11 @@ +| | +--- com.google.firebase:firebase-measurement-connector:19.0.0 -> 20.0.1 (*) +| | +--- com.google.guava:guava:31.1-android -> 33.3.1-android (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.0 -> 2.1.10 (*) -+| \--- com.google.android.gms:play-services-measurement-sdk:22.2.0 ++| \--- com.google.android.gms:play-services-measurement-sdk:22.3.0 +| +--- androidx.collection:collection:1.0.0 -> 1.4.4 (*) +| +--- com.google.android.gms:play-services-basement:18.5.0 (*) -+| +--- com.google.android.gms:play-services-measurement-base:22.2.0 (*) -+| \--- com.google.android.gms:play-services-measurement-impl:22.2.0 (*) ++| +--- com.google.android.gms:play-services-measurement-base:22.3.0 (*) ++| \--- com.google.android.gms:play-services-measurement-impl:22.3.0 (*) ++--- androidx.wear.compose:compose-material:1.4.1 +| +--- androidx.compose.animation:animation:1.7.0 -> 1.7.8 (*) +| +--- androidx.compose.foundation:foundation:1.7.0 -> 1.7.8 (*) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 970836991..da0676e26 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,7 @@ dashclock-api = "2.0.0" dav4jvm = "2.2.1" desugar_jdk_libs = "2.1.3" etebase = "2.3.2" -firebase = "33.9.0" +firebase = "33.10.0" firebase-crashlytics-gradle = "3.0.3" google-oauth2 = "1.33.1" google-api-drive = "v3-rev20250216-2.0.0"