diff --git a/build.gradle b/build.gradle
index 2ed1f717..45b89ed7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,14 +36,14 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:7.4.2"
+        classpath 'com.android.tools.build:gradle:8.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "com.squareup.wire:wire-gradle-plugin:$wireVersion"
     }
 }
 
 
-def gmsVersion = "23.21.15"
+def gmsVersion = "23.22.55"
 def gmsVersionCode = Integer.parseInt(gmsVersion.replaceAll('\\.', ''))
 
 def ourVersionBase = "0.2.28"
diff --git a/gradle.properties b/gradle.properties
index 126b7d28..305b04f6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,3 +3,4 @@ org.gradle.jvmargs=-Xmx2048m -XX:+UseParallelGC
 android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
+android.disableAutomaticComponentCreation=true
\ No newline at end of file