From 531b0b308cfec442372c63453989b7ef1a7b13a9 Mon Sep 17 00:00:00 2001
From: DPE bot <dpebot@google.com>
Date: Mon, 27 Jul 2026 18:12:18 -0400
Subject: [PATCH 1/3] Auto-update dependencies.

---
 gradle/libs.versions.toml      | 6 +++---
 internal/lint/build.gradle.kts | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b4f402e13d..a3c1d0e06b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 activityCompose = "1.13.0"
-agp = "9.2.1"
+agp = "9.3.1"
 camerax = "1.6.1"
 coil3Compose = "3.5.0"
 composeBom = "2026.06.01"
@@ -11,10 +11,10 @@ firebaseBom = "34.16.0"
 googleServices = "4.5.0"
 firebaseCrashlytics = "3.0.7"
 firebasePerf = "2.0.2"
-gradleVersions = "0.54.0"
+gradleVersions = "0.56.0"
 junit = "4.13.2"
 junitVersion = "1.3.0"
-kotlin = "2.4.0"
+kotlin = "2.4.10"
 kotlinxSerializationCore = "1.11.0"
 lifecycle = "2.11.0"
 material = "1.14.0"
diff --git a/internal/lint/build.gradle.kts b/internal/lint/build.gradle.kts
index 88f45fcc43..f93e3d0b16 100755
--- a/internal/lint/build.gradle.kts
+++ b/internal/lint/build.gradle.kts
@@ -9,8 +9,8 @@ java {
 }
 
 dependencies {
-    compileOnly("com.android.tools.lint:lint-api:32.2.1")
-    testImplementation("com.android.tools.lint:lint:32.2.1")
-    testImplementation("com.android.tools.lint:lint-tests:32.2.1")
+    compileOnly("com.android.tools.lint:lint-api:32.3.1")
+    testImplementation("com.android.tools.lint:lint:32.3.1")
+    testImplementation("com.android.tools.lint:lint-tests:32.3.1")
     testImplementation("junit:junit:4.13.2")
 }

From ed4aa85cb41f2481a42c7b9fb1dc369143db6c41 Mon Sep 17 00:00:00 2001
From: Rosario Fernandes <rosariopf@google.com>
Date: Tue, 28 Jul 2026 14:28:26 +0100
Subject: [PATCH 2/3] chore: use new gradle-versions plugin ID

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a3c1d0e06b..cc4305d056 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -70,4 +70,4 @@ compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "
 firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebaseCrashlytics" }
 firebase-perf = { id = "com.google.firebase.firebase-perf", version.ref = "firebasePerf" }
 navigation-safeargs = { id = "androidx.navigation.safeargs", version.ref = "composeNavigation" }
-gradle-versions = { id = "com.github.ben-manes.versions", version.ref = "gradleVersions" }
+gradle-versions = { id = "io.github.ben-manes.versions", version.ref = "gradleVersions" }

From c806e8c7c43821c1018e1012d5b767efed9e110d Mon Sep 17 00:00:00 2001
From: Rosario Fernandes <rosariopf@google.com>
Date: Tue, 28 Jul 2026 14:42:19 +0100
Subject: [PATCH 3/3] chore: reject AGP < 9.3.1 due to b/522845800

---
 build.gradle.kts          | 10 +++++++++-
 gradle/libs.versions.toml |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index d60dd6bf8e..8e4bca7b03 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -77,9 +77,17 @@ fun isBlockListed(candidate: ModuleComponentIdentifier): Boolean {
     }
 }
 
+// TODO(b/522845800): remove this once the bug with AGP 9.3.x and lint has been fixed
+fun isBuggyAGP(candidate: ModuleComponentIdentifier): Boolean {
+  // Skip versions <= 9.3.1
+  return candidate.toString().lowercase().contains("com.android.application") &&
+          candidate.version.replace(".", "").toInt() <= 931
+}
+
 tasks.withType<DependencyUpdatesTask> {
     rejectVersionIf {
-        (isNonStable(candidate) && notFromFirebase(candidate)) || isBlockListed(candidate)
+        (isNonStable(candidate) && notFromFirebase(candidate)) || isBlockListed(candidate) ||
+                isBuggyAGP(candidate)
     }
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index cc4305d056..5824e71d98 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 activityCompose = "1.13.0"
-agp = "9.3.1"
+agp = "9.2.1"
 camerax = "1.6.1"
 coil3Compose = "3.5.0"
 composeBom = "2026.06.01"