diff --git a/deps_fdroid.txt b/deps_fdroid.txt index db37a6cea..29eccacaa 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -1289,34 +1289,34 @@ +| \--- com.google.api-client:google-api-client:2.7.0 -> 2.7.2 +| +--- commons-codec:commons-codec:1.17.1 +| +--- com.google.oauth-client:google-oauth-client:1.36.0 -+| | +--- com.google.http-client:google-http-client:1.43.3 -> 1.45.2 -+| | | +--- com.google.guava:guava:30.1.1-android -> 33.3.1-android ++| | +--- com.google.http-client:google-http-client:1.43.3 -> 1.46.0 ++| | | +--- com.google.guava:guava:30.1.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 -+| | | +--- io.grpc:grpc-context:1.68.2 -+| | | | \--- io.grpc:grpc-api:1.68.2 ++| | | +--- io.grpc:grpc-context:1.70.0 ++| | | | \--- io.grpc:grpc-api:1.70.0 +| | | +--- io.opencensus:opencensus-api:0.31.1 -+| | | | \--- io.grpc:grpc-context:1.27.2 -> 1.68.2 (*) ++| | | | \--- io.grpc:grpc-context:1.27.2 -> 1.70.0 (*) +| | | \--- io.opencensus:opencensus-contrib-http-util:0.31.1 +| | | +--- io.opencensus:opencensus-api:0.31.1 (*) -+| | | \--- com.google.guava:guava:29.0-android -> 33.3.1-android (*) -+| | +--- com.google.http-client:google-http-client-gson:1.43.3 -> 1.45.2 -+| | | +--- com.google.http-client:google-http-client:1.45.2 (*) ++| | | \--- com.google.guava:guava:29.0-android -> 33.4.0-android (*) ++| | +--- com.google.http-client:google-http-client-gson:1.43.3 -> 1.46.0 ++| | | +--- com.google.http-client:google-http-client:1.46.0 (*) +| | | \--- com.google.code.gson:gson:2.11.0 -+| | \--- com.google.guava:guava:31.1-android -> 33.3.1-android (*) -+| +--- com.google.auth:google-auth-library-credentials:1.30.0 -> 1.30.1 -+| +--- com.google.auth:google-auth-library-oauth2-http:1.30.0 -> 1.30.1 ++| | \--- com.google.guava:guava:31.1-android -> 33.4.0-android (*) ++| +--- com.google.auth:google-auth-library-credentials:1.30.0 -> 1.32.1 ++| +--- com.google.auth:google-auth-library-oauth2-http:1.30.0 -> 1.32.1 +| | +--- com.google.auto.value:auto-value-annotations:1.11.0 -+| | +--- com.google.auth:google-auth-library-credentials:1.30.1 -+| | +--- com.google.http-client:google-http-client:1.45.2 (*) -+| | +--- com.google.http-client:google-http-client-gson:1.45.2 (*) -+| | \--- com.google.guava:guava:33.3.1-android (*) -+| +--- com.google.http-client:google-http-client-gson:1.45.2 (*) -+| +--- com.google.guava:guava:33.1.0-jre -> 33.3.1-android (*) -+| \--- com.google.http-client:google-http-client:1.45.2 (*) ++| | +--- com.google.auth:google-auth-library-credentials:1.32.1 ++| | +--- com.google.http-client:google-http-client:1.46.0 (*) ++| | +--- com.google.http-client:google-http-client-gson:1.46.0 (*) ++| | \--- com.google.guava:guava:33.4.0-android (*) ++| +--- com.google.http-client:google-http-client-gson:1.45.2 -> 1.46.0 (*) ++| +--- com.google.guava:guava:33.1.0-jre -> 33.4.0-android (*) ++| \--- com.google.http-client:google-http-client:1.45.2 -> 1.46.0 (*) ++--- com.google.apis:google-api-services-drive:v3-rev20250122-2.0.0 +| \--- com.google.api-client:google-api-client:2.7.2 (*) -++--- com.google.auth:google-auth-library-oauth2-http:1.30.1 (*) +++--- com.google.auth:google-auth-library-oauth2-http:1.32.1 (*) ++--- androidx.work:work-runtime-ktx:2.10.0 +| +--- androidx.work:work-runtime:2.10.0 (*) +| \--- androidx.work:work-runtime:2.10.0 (c) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index a8b2fc095..00a110586 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -510,7 +510,7 @@ +| | | | +--- 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.3.1-android ++| | | | +--- 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.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava @@ -529,7 +529,7 @@ +| | | | +--- 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.guava:guava:31.1-android -> 33.4.0-android (*) +| | +--- com.google.android.gms:play-services-measurement-sdk-api:22.2.0 +| | | +--- com.google.android.gms:play-services-basement:18.5.0 (*) +| | | \--- com.google.android.gms:play-services-measurement-base:22.2.0 (*) @@ -545,7 +545,7 @@ +| | +--- com.google.firebase:firebase-installations:17.0.1 -> 18.0.0 (*) +| | +--- com.google.firebase:firebase-installations-interop:17.0.0 -> 17.2.0 (*) +| | +--- com.google.firebase:firebase-measurement-connector:19.0.0 -> 20.0.1 (*) -+| | +--- com.google.guava:guava:31.1-android -> 33.3.1-android (*) ++| | +--- 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 +| +--- androidx.collection:collection:1.0.0 -> 1.4.4 (*) @@ -752,15 +752,15 @@ +| +--- com.google.android.horologist:horologist-datalayer:0.6.22 (*) +| +--- io.grpc:grpc-protobuf-lite:1.68.2 -> 1.70.0 +| | +--- io.grpc:grpc-api:1.70.0 -+| | | \--- com.google.guava:guava:33.3.1-android (*) ++| | | \--- com.google.guava:guava:33.3.1-android -> 33.4.0-android (*) +| | +--- com.google.protobuf:protobuf-javalite:3.25.5 -> 4.29.3 -+| | \--- com.google.guava:guava:33.3.1-android (*) ++| | \--- com.google.guava:guava:33.3.1-android -> 33.4.0-android (*) +| +--- io.grpc:grpc-kotlin-stub:1.4.1 +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.0 -> 2.1.10 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 -> 1.9.0 (*) +| | +--- io.grpc:grpc-stub:1.57.2 +| | | +--- io.grpc:grpc-api:1.57.2 -> 1.70.0 (*) -+| | | \--- com.google.guava:guava:32.0.1-android -> 33.3.1-android (*) ++| | | \--- com.google.guava:guava:32.0.1-android -> 33.4.0-android (*) +| | \--- javax.annotation:javax.annotation-api:1.3.2 +| +--- com.google.android.gms:play-services-wearable:19.0.0 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.24 -> 2.1.10 (*) @@ -776,18 +776,18 @@ +| | | +--- com.google.code.gson:gson:2.11.0 +| | | +--- com.google.android:annotations:4.1.1.4 +| | | +--- org.codehaus.mojo:animal-sniffer-annotations:1.24 -+| | | +--- com.google.guava:guava:33.3.1-android (*) ++| | | +--- com.google.guava:guava:33.3.1-android -> 33.4.0-android (*) +| | | +--- io.perfmark:perfmark-api:0.27.0 +| | | \--- io.grpc:grpc-context:1.70.0 +| | | \--- io.grpc:grpc-api:1.70.0 (*) -+| | \--- com.google.guava:guava:33.3.1-android (*) ++| | \--- com.google.guava:guava:33.3.1-android -> 33.4.0-android (*) +| +--- io.grpc:grpc-binder:1.70.0 +| | +--- io.grpc:grpc-api:1.70.0 (*) +| | +--- io.grpc:grpc-core:1.70.0 (*) +| | +--- androidx.annotation:annotation:1.9.0 -> 1.9.1 (*) +| | +--- androidx.core:core:1.13.1 (*) +| | +--- androidx.lifecycle:lifecycle-common:2.8.6 -> 2.8.7 (*) -+| | \--- com.google.guava:guava:33.3.1-android (*) ++| | \--- com.google.guava:guava:33.3.1-android -> 33.4.0-android (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:2.1.10 (*) +| +--- com.google.android.horologist:horologist-datalayer:0.6.22 (*) +| +--- androidx.datastore:datastore-preferences:1.1.2 (*) @@ -1643,31 +1643,31 @@ +| \--- com.google.api-client:google-api-client:2.7.0 -> 2.7.2 +| +--- commons-codec:commons-codec:1.17.1 +| +--- com.google.oauth-client:google-oauth-client:1.36.0 -+| | +--- com.google.http-client:google-http-client:1.43.3 -> 1.45.2 -+| | | +--- com.google.guava:guava:30.1.1-android -> 33.3.1-android (*) -+| | | +--- io.grpc:grpc-context:1.68.2 -> 1.70.0 (*) ++| | +--- com.google.http-client:google-http-client:1.43.3 -> 1.46.0 ++| | | +--- com.google.guava:guava:30.1.1-android -> 33.4.0-android (*) ++| | | +--- io.grpc:grpc-context:1.70.0 (*) +| | | +--- io.opencensus:opencensus-api:0.31.1 +| | | | \--- io.grpc:grpc-context:1.27.2 -> 1.70.0 (*) +| | | \--- io.opencensus:opencensus-contrib-http-util:0.31.1 +| | | +--- io.opencensus:opencensus-api:0.31.1 (*) -+| | | \--- com.google.guava:guava:29.0-android -> 33.3.1-android (*) -+| | +--- com.google.http-client:google-http-client-gson:1.43.3 -> 1.45.2 -+| | | +--- com.google.http-client:google-http-client:1.45.2 (*) ++| | | \--- com.google.guava:guava:29.0-android -> 33.4.0-android (*) ++| | +--- com.google.http-client:google-http-client-gson:1.43.3 -> 1.46.0 ++| | | +--- com.google.http-client:google-http-client:1.46.0 (*) +| | | \--- com.google.code.gson:gson:2.11.0 -+| | \--- com.google.guava:guava:31.1-android -> 33.3.1-android (*) -+| +--- com.google.auth:google-auth-library-credentials:1.30.0 -> 1.30.1 -+| +--- com.google.auth:google-auth-library-oauth2-http:1.30.0 -> 1.30.1 ++| | \--- com.google.guava:guava:31.1-android -> 33.4.0-android (*) ++| +--- com.google.auth:google-auth-library-credentials:1.30.0 -> 1.32.1 ++| +--- com.google.auth:google-auth-library-oauth2-http:1.30.0 -> 1.32.1 +| | +--- com.google.auto.value:auto-value-annotations:1.11.0 -+| | +--- com.google.auth:google-auth-library-credentials:1.30.1 -+| | +--- com.google.http-client:google-http-client:1.45.2 (*) -+| | +--- com.google.http-client:google-http-client-gson:1.45.2 (*) -+| | \--- com.google.guava:guava:33.3.1-android (*) -+| +--- com.google.http-client:google-http-client-gson:1.45.2 (*) -+| +--- com.google.guava:guava:33.1.0-jre -> 33.3.1-android (*) -+| \--- com.google.http-client:google-http-client:1.45.2 (*) ++| | +--- com.google.auth:google-auth-library-credentials:1.32.1 ++| | +--- com.google.http-client:google-http-client:1.46.0 (*) ++| | +--- com.google.http-client:google-http-client-gson:1.46.0 (*) ++| | \--- com.google.guava:guava:33.4.0-android (*) ++| +--- com.google.http-client:google-http-client-gson:1.45.2 -> 1.46.0 (*) ++| +--- com.google.guava:guava:33.1.0-jre -> 33.4.0-android (*) ++| \--- com.google.http-client:google-http-client:1.45.2 -> 1.46.0 (*) ++--- com.google.apis:google-api-services-drive:v3-rev20250122-2.0.0 +| \--- com.google.api-client:google-api-client:2.7.2 (*) -++--- com.google.auth:google-auth-library-oauth2-http:1.30.1 (*) +++--- com.google.auth:google-auth-library-oauth2-http:1.32.1 (*) ++--- androidx.work:work-runtime-ktx:2.10.0 +| +--- androidx.work:work-runtime:2.10.0 (*) +| \--- androidx.work:work-runtime:2.10.0 (c) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 381189d62..89ed3dd06 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,7 +20,7 @@ desugar_jdk_libs = "2.1.3" etebase = "2.3.2" firebase = "33.8.0" firebase-crashlytics-gradle = "3.0.3" -google-oauth2 = "1.30.1" +google-oauth2 = "1.32.1" google-api-drive = "v3-rev20250122-2.0.0" google-api-tasks = "v1-rev20250105-2.0.0" google-services = "4.4.2"