diff --git a/gradle.properties b/gradle.properties
index 01e1aa01f..39c2392ba 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,3 +7,6 @@ systemProp.file.encoding=utf-8
 
 # https://docs.gradle.org/current/userguide/configuration_cache.html
 org.gradle.configuration-cache=true
+android.enableAppCompileTimeRClass=false
+android.r8.strictFullModeForKeepRules=false
+android.r8.optimizedResourceShrinking=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5448848a2..ddfe32a31 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@
 
 [versions]
 acra = "5.13.1"
-agp = "8.13.2"
+agp = "9.0.0"
 appcompat = "1.7.1"
 assertj = "3.27.6"
 autoservice-google = "1.1.1"