diff --git a/gradle.properties b/gradle.properties
index cc6a08e..d76b58e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,5 +22,8 @@ kotlin.code.style=official
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 
-# Enable build config generation
-android.defaults.buildfeatures.buildconfig=true
\ No newline at end of file
+# AGP 9 enables built-in Kotlin support, which is incompatible with kapt (used here for
+# data binding). Opt out until the project is migrated to built-in Kotlin and KSP.
+# https://developer.android.com/r/tools/built-in-kotlin
+android.builtInKotlin=false
+android.newDsl=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e9c922a..f26cb86 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.9.2"
+agp = "9.4.1"
 kotlin = "2.1.0"
 coreKtx = "1.16.0"
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 47b6027..1f78406 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sat Apr 26 10:15:13 IST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists