diff --git a/deps_fdroid.txt b/deps_fdroid.txt index 036181c8b..23f6254cb 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -1042,7 +1042,7 @@ +| +--- commons-codec:commons-codec:1.17.0 +| +--- com.google.oauth-client:google-oauth-client:1.36.0 +| | +--- com.google.http-client:google-http-client:1.43.3 -> 1.45.0 -+| | | +--- com.google.guava:guava:30.1.1-android -> 33.2.1-android ++| | | +--- com.google.guava:guava:30.1.1-android -> 33.3.1-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.66.0 @@ -1051,24 +1051,24 @@ +| | | | \--- io.grpc:grpc-context:1.27.2 -> 1.66.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.2.1-android (*) ++| | | \--- com.google.guava:guava:29.0-android -> 33.3.1-android (*) +| | +--- com.google.http-client:google-http-client-gson:1.43.3 -> 1.45.0 +| | | +--- com.google.http-client:google-http-client:1.45.0 (*) +| | | \--- com.google.code.gson:gson:2.11.0 -+| | \--- com.google.guava:guava:31.1-android -> 33.2.1-android (*) -+| +--- com.google.auth:google-auth-library-credentials:1.23.0 -> 1.24.0 -+| +--- com.google.auth:google-auth-library-oauth2-http:1.23.0 -> 1.24.0 -+| | +--- com.google.auto.value:auto-value-annotations:1.10.4 -+| | +--- com.google.auth:google-auth-library-credentials:1.24.0 -+| | +--- com.google.http-client:google-http-client:1.44.2 -> 1.45.0 (*) -+| | +--- com.google.http-client:google-http-client-gson:1.44.2 -> 1.45.0 (*) -+| | \--- com.google.guava:guava:33.2.1-android (*) ++| | \--- com.google.guava:guava:31.1-android -> 33.3.1-android (*) ++| +--- com.google.auth:google-auth-library-credentials:1.23.0 -> 1.30.0 ++| +--- com.google.auth:google-auth-library-oauth2-http:1.23.0 -> 1.30.0 ++| | +--- com.google.auto.value:auto-value-annotations:1.11.0 ++| | +--- com.google.auth:google-auth-library-credentials:1.30.0 ++| | +--- com.google.http-client:google-http-client:1.45.0 (*) ++| | +--- com.google.http-client:google-http-client-gson:1.45.0 (*) ++| | \--- com.google.guava:guava:33.3.1-android (*) +| +--- com.google.http-client:google-http-client-gson:1.45.0 (*) -+| +--- com.google.guava:guava:33.1.0-jre -> 33.2.1-android (*) ++| +--- com.google.guava:guava:33.1.0-jre -> 33.3.1-android (*) +| \--- com.google.http-client:google-http-client:1.45.0 (*) ++--- com.google.apis:google-api-services-drive:v3-rev20240914-2.0.0 +| \--- com.google.api-client:google-api-client:2.7.0 (*) -++--- com.google.auth:google-auth-library-oauth2-http:1.24.0 (*) +++--- com.google.auth:google-auth-library-oauth2-http:1.30.0 (*) ++--- androidx.work:work-runtime-ktx:2.8.1 +| +--- androidx.work:work-runtime:2.8.1 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.21 -> 2.0.21 (*) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 58edb7990..43c7b6d96 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -480,7 +480,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.2.1-android ++| | | | +--- com.google.guava:guava:31.1-android -> 33.3.1-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 @@ -499,7 +499,7 @@ +| | | | +--- androidx.legacy:legacy-support-core-utils:1.0.0 (*) +| | | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.4.0 (*) +| | | +--- com.google.android.gms:play-services-tasks:18.2.0 (*) -+| | | \--- com.google.guava:guava:31.1-android -> 33.2.1-android (*) ++| | | \--- com.google.guava:guava:31.1-android -> 33.3.1-android (*) +| | \--- com.google.android.gms:play-services-stats:17.0.2 (*) +| +--- com.google.android.gms:play-services-measurement-api:22.1.2 +| | +--- com.google.android.gms:play-services-basement:18.4.0 (*) @@ -514,7 +514,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.2.1-android (*) ++| | +--- com.google.guava:guava:31.1-android -> 33.3.1-android (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 2.0.21 (*) +| \--- com.google.android.gms:play-services-measurement-sdk:22.1.2 +| +--- androidx.collection:collection:1.0.0 -> 1.4.4 (*) @@ -681,15 +681,15 @@ +| +--- com.google.android.horologist:horologist-datalayer:0.6.20 (*) +| +--- io.grpc:grpc-protobuf-lite:1.66.0 -> 1.68.0 +| | +--- io.grpc:grpc-api:1.68.0 -+| | | \--- com.google.guava:guava:33.2.1-android (*) ++| | | \--- com.google.guava:guava:33.2.1-android -> 33.3.1-android (*) +| | +--- com.google.protobuf:protobuf-javalite:3.25.3 -> 4.28.2 -+| | \--- com.google.guava:guava:33.2.1-android (*) ++| | \--- com.google.guava:guava:33.2.1-android -> 33.3.1-android (*) +| +--- io.grpc:grpc-kotlin-stub:1.4.1 +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.0 -> 2.0.21 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 -> 1.8.1 (*) +| | +--- io.grpc:grpc-stub:1.57.2 +| | | +--- io.grpc:grpc-api:1.57.2 -> 1.68.0 (*) -+| | | \--- com.google.guava:guava:32.0.1-android -> 33.2.1-android (*) ++| | | \--- com.google.guava:guava:32.0.1-android -> 33.3.1-android (*) +| | \--- javax.annotation:javax.annotation-api:1.3.2 +| \--- com.google.android.gms:play-services-wearable:18.2.0 (*) ++--- com.google.android.horologist:horologist-datalayer:0.6.20 (*) @@ -704,18 +704,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.2.1-android (*) ++| | | +--- com.google.guava:guava:33.2.1-android -> 33.3.1-android (*) +| | | +--- io.perfmark:perfmark-api:0.27.0 +| | | \--- io.grpc:grpc-context:1.68.0 +| | | \--- io.grpc:grpc-api:1.68.0 (*) -+| | \--- com.google.guava:guava:33.2.1-android (*) ++| | \--- com.google.guava:guava:33.2.1-android -> 33.3.1-android (*) +| +--- io.grpc:grpc-binder:1.68.0 +| | +--- io.grpc:grpc-api:1.68.0 (*) +| | +--- io.grpc:grpc-core:1.68.0 (*) +| | +--- androidx.annotation:annotation:1.8.0 -> 1.8.1 (*) +| | +--- androidx.core:core:1.13.1 (*) +| | +--- androidx.lifecycle:lifecycle-common:2.8.3 -> 2.8.6 (*) -+| | \--- com.google.guava:guava:33.2.1-android (*) ++| | \--- com.google.guava:guava:33.2.1-android -> 33.3.1-android (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:2.0.21 (*) +| +--- com.google.android.horologist:horologist-datalayer:0.6.20 (*) +| +--- androidx.datastore:datastore-preferences:1.1.1 (*) @@ -1357,30 +1357,30 @@ +| +--- commons-codec:commons-codec:1.17.0 +| +--- com.google.oauth-client:google-oauth-client:1.36.0 +| | +--- com.google.http-client:google-http-client:1.43.3 -> 1.45.0 -+| | | +--- com.google.guava:guava:30.1.1-android -> 33.2.1-android (*) ++| | | +--- com.google.guava:guava:30.1.1-android -> 33.3.1-android (*) +| | | +--- io.grpc:grpc-context:1.66.0 -> 1.68.0 (*) +| | | +--- io.opencensus:opencensus-api:0.31.1 +| | | | \--- io.grpc:grpc-context:1.27.2 -> 1.68.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.2.1-android (*) ++| | | \--- com.google.guava:guava:29.0-android -> 33.3.1-android (*) +| | +--- com.google.http-client:google-http-client-gson:1.43.3 -> 1.45.0 +| | | +--- com.google.http-client:google-http-client:1.45.0 (*) +| | | \--- com.google.code.gson:gson:2.11.0 -+| | \--- com.google.guava:guava:31.1-android -> 33.2.1-android (*) -+| +--- com.google.auth:google-auth-library-credentials:1.23.0 -> 1.24.0 -+| +--- com.google.auth:google-auth-library-oauth2-http:1.23.0 -> 1.24.0 -+| | +--- com.google.auto.value:auto-value-annotations:1.10.4 -+| | +--- com.google.auth:google-auth-library-credentials:1.24.0 -+| | +--- com.google.http-client:google-http-client:1.44.2 -> 1.45.0 (*) -+| | +--- com.google.http-client:google-http-client-gson:1.44.2 -> 1.45.0 (*) -+| | \--- com.google.guava:guava:33.2.1-android (*) ++| | \--- com.google.guava:guava:31.1-android -> 33.3.1-android (*) ++| +--- com.google.auth:google-auth-library-credentials:1.23.0 -> 1.30.0 ++| +--- com.google.auth:google-auth-library-oauth2-http:1.23.0 -> 1.30.0 ++| | +--- com.google.auto.value:auto-value-annotations:1.11.0 ++| | +--- com.google.auth:google-auth-library-credentials:1.30.0 ++| | +--- com.google.http-client:google-http-client:1.45.0 (*) ++| | +--- com.google.http-client:google-http-client-gson:1.45.0 (*) ++| | \--- com.google.guava:guava:33.3.1-android (*) +| +--- com.google.http-client:google-http-client-gson:1.45.0 (*) -+| +--- com.google.guava:guava:33.1.0-jre -> 33.2.1-android (*) ++| +--- com.google.guava:guava:33.1.0-jre -> 33.3.1-android (*) +| \--- com.google.http-client:google-http-client:1.45.0 (*) ++--- com.google.apis:google-api-services-drive:v3-rev20240914-2.0.0 +| \--- com.google.api-client:google-api-client:2.7.0 (*) -++--- com.google.auth:google-auth-library-oauth2-http:1.24.0 (*) +++--- com.google.auth:google-auth-library-oauth2-http:1.30.0 (*) ++--- androidx.work:work-runtime-ktx:2.8.1 +| +--- androidx.work:work-runtime:2.8.1 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.21 -> 2.0.21 (*) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9e269d7b7..1e882d64a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,7 +23,7 @@ firebase = "33.5.1" firebase-crashlytics-gradle = "3.0.2" flipper = "0.262.0" fragment-ktx = "1.8.5" -google-oauth2 = "1.24.0" +google-oauth2 = "1.30.0" google-api-drive = "v3-rev20240914-2.0.0" google-api-tasks = "v1-rev20240630-2.0.0" google-services = "4.4.2" @@ -214,4 +214,4 @@ ksp = { id = "com.google.devtools.ksp", version = "2.0.21-1.0.26" } jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } protobuf = { id = "com.google.protobuf", version = "0.9.4" } -redacted = { id = "dev.zacsweers.redacted", version = "1.10.0" } \ No newline at end of file +redacted = { id = "dev.zacsweers.redacted", version = "1.10.0" }