From 3aa4c6ba09f5d54d5d59d3a820fcdd122ac177a5 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 28 Jul 2026 08:15:37 +0000 Subject: [PATCH 1/4] Update all dependencies --- build.gradle.kts | 8 ++++---- gradle/libs.versions.toml | 30 +++++++++++++++--------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 447bd6e3ce..868ba40966 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -106,10 +106,10 @@ allprojects { dependencySubstitution { substitute(module("com.google.protobuf:protobuf-java")).using(module("com.google.protobuf:protobuf-javalite:4.35.1")) } - force("io.grpc:grpc-stub:1.82.2") - force("io.grpc:grpc-protobuf-lite:1.82.2") - force("io.grpc:grpc-android:1.82.2") - force("io.grpc:grpc-binder:1.82.2") + force("io.grpc:grpc-stub:1.83.0") + force("io.grpc:grpc-protobuf-lite:1.83.0") + force("io.grpc:grpc-android:1.83.0") + force("io.grpc:grpc-binder:1.83.0") } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1675d08a6e..01fac95df8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ androidx-constraintlayout-compose = "1.1.1" androidx-datastore = "1.2.1" androidx-graphics = "1.1.0" androidx-health-services = "1.1.0-rc02" -androidx-hilt = "1.3.0" +androidx-hilt = "1.4.0" androidx-media3 = "1.10.1" androidx-test-espresso = "3.7.0" androidx-test-ext = "1.3.0" @@ -17,8 +17,8 @@ androidx-wear-watchface = "1.3.0" androidx-wear-watchface-rendering = "1.2.1" androidxActivity = "1.13.0" androidxComposeBom = "2026.04.01" -androidxCore = "1.18.0" -androidxLifecycle = "2.10.0" +androidxCore = "1.19.0" +androidxLifecycle = "2.11.0" androidxNavigation = "2.9.8" androidxPhoneInteractions = "1.1.1" androidxRemoteInteractions = "1.2.0" @@ -33,16 +33,16 @@ app-cash-turbine = "1.2.1" appcompat = "1.7.1" com-squareup-okhttp3 = "5.4.0" com-squareup-retrofit2 = "3.0.0" -compose-animation = "1.11.0" +compose-animation = "1.11.4" compose-material3 = "1.4.0" -composeAiTools = "0.17.2" +composeAiTools = "0.18.5" composesnapshot = "-" -dependencyAnalysis = "3.17.0" +dependencyAnalysis = "3.18.0" desugar_jdk_libs = "2.1.5" dokka = "2.2.0" googledagger = "2.60.1" gradlePublishPlugin = "0.37.0" -grpcStub = "1.82.2" +grpcStub = "1.83.0" io-coil-kt = "2.7.0" junit = "4.13.2" kotlin = "2.4.10" @@ -53,7 +53,7 @@ ktlint = "1.8.0" material = "1.14.0" metalava = "0.5.0" moshi = "1.15.2" -okio = "3.17.0" +okio = "3.18.0" org-robolectric = "4.16.1" ossLicensesPlugin = "0.13.0" osslicenses = "0.10.0" @@ -61,13 +61,13 @@ playServicesAuth = "21.6.0" playServicesOssLicenses = "17.5.1" # Stay on 4.26.1 due to https://github.com/firebase/firebase-android-sdk/issues/5997 protobuf = "4.34.1" -protobuf-gen-grpc-java = "1.82.2" +protobuf-gen-grpc-java = "1.83.0" protobuf-gen-grpc-kotlin = "1.5.0:jdk8@jar" protobuf-gen-javalite = "3.0.0" roborazzi = "1.70.0" room = "2.8.4" runtimeTracing = "1.11.4" -spotless = "8.8.0" +spotless = "8.9.0" ktfmt = "0.26.0" tiles-tooling-preview = "1.6.1" truth = "1.4.5" @@ -77,7 +77,7 @@ wearcompose = "1.6.2" glanceWear = "1.0.0-alpha14" composeRemote = "1.0.0-alpha15" wearComposeRemote = "1.0.0-alpha07" -agp = "9.3.0" +agp = "9.3.1" [libraries] accessibility-test-framework = { module = "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework", version.ref = "accessibilityTestFramework" } @@ -197,16 +197,16 @@ dagger-hiltandroidplugin = { module = "com.google.dagger:hilt-android-gradle-plu dagger-hiltandroidtesting = { module = "com.google.dagger:hilt-android-testing", version.ref = "googledagger" } desugar-jdk-libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar_jdk_libs" } dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" } -google-genai = "com.google.genai:google-genai:1.62.0" +google-genai = "com.google.genai:google-genai:1.63.0" gradleMavenPublishPlugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "gradlePublishPlugin" } grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpcStub" } hilt-ext-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "androidx-hilt" } hilt-ext-work = { module = "androidx.hilt:hilt-work", version.ref = "androidx-hilt" } hilt-navigationcompose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidx-hilt" } -io-grpc-grpc-android = "io.grpc:grpc-android:1.82.2" -io-grpc-grpc-binder = "io.grpc:grpc-binder:1.82.2" +io-grpc-grpc-android = "io.grpc:grpc-android:1.83.0" +io-grpc-grpc-binder = "io.grpc:grpc-binder:1.83.0" io-grpc-grpc-kotlin = "io.grpc:grpc-kotlin-stub:1.5.0" -io-grpc-protobuf-lite = "io.grpc:grpc-protobuf-lite:1.82.2" +io-grpc-protobuf-lite = "io.grpc:grpc-protobuf-lite:1.83.0" junit = { module = "junit:junit", version.ref = "junit" } kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" } From f18fbcba7ff63c4af45f3a8c2363e9e2f3fd6d27 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Tue, 28 Jul 2026 10:47:24 +0000 Subject: [PATCH 2/4] Revert dependencies requiring compileSdk 37 and update Renovate config TAG=agy CONV=7cf5b904-e53a-44bb-8f36-6e0e989eab0b --- gradle/libs.versions.toml | 6 +++--- renovate.json | 23 ++++++++++++++++++++++- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 01fac95df8..dfdc67b93c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ androidx-constraintlayout-compose = "1.1.1" androidx-datastore = "1.2.1" androidx-graphics = "1.1.0" androidx-health-services = "1.1.0-rc02" -androidx-hilt = "1.4.0" +androidx-hilt = "1.3.0" androidx-media3 = "1.10.1" androidx-test-espresso = "3.7.0" androidx-test-ext = "1.3.0" @@ -17,8 +17,8 @@ androidx-wear-watchface = "1.3.0" androidx-wear-watchface-rendering = "1.2.1" androidxActivity = "1.13.0" androidxComposeBom = "2026.04.01" -androidxCore = "1.19.0" -androidxLifecycle = "2.11.0" +androidxCore = "1.18.0" +androidxLifecycle = "2.10.0" androidxNavigation = "2.9.8" androidxPhoneInteractions = "1.1.1" androidxRemoteInteractions = "1.2.0" diff --git a/renovate.json b/renovate.json index 86b8ef7a0a..69316ec184 100644 --- a/renovate.json +++ b/renovate.json @@ -53,9 +53,30 @@ }, { "matchPackagePatterns": [ - "androidx.datastore:*", + "androidx.datastore:*" ], "allowedVersions": "<=1.1.4" + }, + { + "matchPackagePatterns": [ + "androidx.core:*" + ], + "allowedVersions": "<1.19.0", + "description": "Requires compileSdk 37" + }, + { + "matchPackagePatterns": [ + "androidx.lifecycle:*" + ], + "allowedVersions": "<2.11.0", + "description": "Requires compileSdk 37" + }, + { + "matchPackagePatterns": [ + "androidx.hilt:*" + ], + "allowedVersions": "<1.4.0", + "description": "Requires compileSdk 37" } ] } From a9c8d4c3b8830bf487e84f6d6b954d927a3b238f Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Tue, 28 Jul 2026 10:51:00 +0000 Subject: [PATCH 3/4] Use version catalog for forced gRPC dependencies TAG=agy CONV=7cf5b904-e53a-44bb-8f36-6e0e989eab0b --- build.gradle.kts | 8 ++++---- gradle/libs.versions.toml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 868ba40966..4d479648a7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -106,10 +106,10 @@ allprojects { dependencySubstitution { substitute(module("com.google.protobuf:protobuf-java")).using(module("com.google.protobuf:protobuf-javalite:4.35.1")) } - force("io.grpc:grpc-stub:1.83.0") - force("io.grpc:grpc-protobuf-lite:1.83.0") - force("io.grpc:grpc-android:1.83.0") - force("io.grpc:grpc-binder:1.83.0") + force(rootProject.libs.grpc.stub) + force(rootProject.libs.io.grpc.protobuf.lite) + force(rootProject.libs.io.grpc.grpc.android) + force(rootProject.libs.io.grpc.grpc.binder) } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index dfdc67b93c..77ebfcbeb9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -203,10 +203,10 @@ grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpcStub" } hilt-ext-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "androidx-hilt" } hilt-ext-work = { module = "androidx.hilt:hilt-work", version.ref = "androidx-hilt" } hilt-navigationcompose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidx-hilt" } -io-grpc-grpc-android = "io.grpc:grpc-android:1.83.0" -io-grpc-grpc-binder = "io.grpc:grpc-binder:1.83.0" +io-grpc-grpc-android = { module = "io.grpc:grpc-android", version.ref = "grpcStub" } +io-grpc-grpc-binder = { module = "io.grpc:grpc-binder", version.ref = "grpcStub" } io-grpc-grpc-kotlin = "io.grpc:grpc-kotlin-stub:1.5.0" -io-grpc-protobuf-lite = "io.grpc:grpc-protobuf-lite:1.83.0" +io-grpc-protobuf-lite = { module = "io.grpc:grpc-protobuf-lite", version.ref = "grpcStub" } junit = { module = "junit:junit", version.ref = "junit" } kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" } From 8e0620b3643150c2ee69d7eed63127aecd6dc1a7 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Tue, 28 Jul 2026 11:08:37 +0000 Subject: [PATCH 4/4] Force transitive androidx.core and androidx.lifecycle versions in resolutionStrategy TAG=agy CONV=7cf5b904-e53a-44bb-8f36-6e0e989eab0b --- build.gradle.kts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 4d479648a7..2aa848061b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -110,6 +110,14 @@ allprojects { force(rootProject.libs.io.grpc.protobuf.lite) force(rootProject.libs.io.grpc.grpc.android) force(rootProject.libs.io.grpc.grpc.binder) + eachDependency { + if (requested.group == "androidx.core" && (requested.name == "core" || requested.name == "core-ktx")) { + useVersion(rootProject.libs.versions.androidxCore.get()) + } + if (requested.group == "androidx.lifecycle") { + useVersion(rootProject.libs.versions.androidxLifecycle.get()) + } + } } } }