diff --git a/admob/app/build.gradle.kts b/admob/app/build.gradle.kts
index de961b22ed..c98d99c038 100644
--- a/admob/app/build.gradle.kts
+++ b/admob/app/build.gradle.kts
@@ -1,9 +1,7 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
-    id("kotlin-android")
     id("com.google.gms.google-services")
 }
 
@@ -29,7 +27,7 @@ android {
     buildTypes {
         getByName("release") {
             isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
     packaging {
@@ -39,11 +37,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        compilerOptions {
-            jvmTarget = JvmTarget.JVM_17
-        }
-    }
     buildFeatures {
         viewBinding = true
     }
diff --git a/admob/build.gradle.kts b/admob/build.gradle.kts
index ca75fa0a37..727b81933c 100644
--- a/admob/build.gradle.kts
+++ b/admob/build.gradle.kts
@@ -3,7 +3,6 @@
 plugins {
     id("com.android.application") version "8.13.2" apply false
     id("com.android.library") version "8.13.2" apply false
-    id("org.jetbrains.kotlin.android") version "2.3.0" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
 }
 
diff --git a/admob/gradle/wrapper/gradle-wrapper.properties b/admob/gradle/wrapper/gradle-wrapper.properties
index d30212c04b..5dc98dbcf3 100644
--- a/admob/gradle/wrapper/gradle-wrapper.properties
+++ b/admob/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/analytics/app/build.gradle.kts b/analytics/app/build.gradle.kts
index f2e72793c5..cc51ce5263 100644
--- a/analytics/app/build.gradle.kts
+++ b/analytics/app/build.gradle.kts
@@ -1,9 +1,7 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
-    id("kotlin-android")
     id("com.google.gms.google-services")
 }
 
@@ -28,7 +26,7 @@ android {
     buildTypes {
         getByName("release") {
             isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
 
@@ -37,12 +35,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlin {
-        compilerOptions {
-            jvmTarget = JvmTarget.JVM_17
-        }
-    }
-
     buildFeatures {
         viewBinding = true
     }
diff --git a/analytics/build.gradle.kts b/analytics/build.gradle.kts
index fbfdd184ae..1f20b7ccc0 100644
--- a/analytics/build.gradle.kts
+++ b/analytics/build.gradle.kts
@@ -3,7 +3,6 @@
 plugins {
     id("com.android.application") version "8.13.2" apply false
     id("com.android.library") version "8.13.2" apply false
-    id("org.jetbrains.kotlin.android") version "2.3.0" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
 }
 
diff --git a/analytics/gradle/wrapper/gradle-wrapper.properties b/analytics/gradle/wrapper/gradle-wrapper.properties
index d30212c04b..5dc98dbcf3 100644
--- a/analytics/gradle/wrapper/gradle-wrapper.properties
+++ b/analytics/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/appdistribution/app/build.gradle.kts b/appdistribution/app/build.gradle.kts
index 42e795fbb0..9a9632e83c 100644
--- a/appdistribution/app/build.gradle.kts
+++ b/appdistribution/app/build.gradle.kts
@@ -1,8 +1,6 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
-    id("kotlin-android")
     id("com.google.gms.google-services")
 }
 
@@ -24,18 +22,13 @@ android {
     buildTypes {
         getByName("release") {
             isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        compilerOptions {
-            jvmTarget = JvmTarget.JVM_17
-        }
-    }
     buildFeatures {
         viewBinding = true
     }
@@ -54,7 +47,6 @@ dependencies {
 
     implementation("com.google.android.material:material:1.13.0")
     implementation("androidx.constraintlayout:constraintlayout:2.2.1")
-    implementation("androidx.multidex:multidex:2.0.1")
 
     // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom)
     implementation(platform("com.google.firebase:firebase-bom:34.7.0"))
diff --git a/appdistribution/app/src/main/AndroidManifest.xml b/appdistribution/app/src/main/AndroidManifest.xml
index a29b19adf7..a5455f3394 100644
--- a/appdistribution/app/src/main/AndroidManifest.xml
+++ b/appdistribution/app/src/main/AndroidManifest.xml
@@ -2,7 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
-        android:name="androidx.multidex.MultiDexApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/appdistribution/build.gradle.kts b/appdistribution/build.gradle.kts
index 5e5a82e697..a042a1fbf0 100644
--- a/appdistribution/build.gradle.kts
+++ b/appdistribution/build.gradle.kts
@@ -3,7 +3,6 @@
 plugins {
     id("com.android.application") version "8.13.2" apply false
     id("com.android.library") version "8.13.2" apply false
-    id("org.jetbrains.kotlin.android") version "2.3.0" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
 }
 
diff --git a/appdistribution/gradle/wrapper/gradle-wrapper.properties b/appdistribution/gradle/wrapper/gradle-wrapper.properties
index d30212c04b..5dc98dbcf3 100644
--- a/appdistribution/gradle/wrapper/gradle-wrapper.properties
+++ b/appdistribution/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/auth/app/build.gradle.kts b/auth/app/build.gradle.kts
index f622c91e86..419d85ae96 100644
--- a/auth/app/build.gradle.kts
+++ b/auth/app/build.gradle.kts
@@ -1,9 +1,7 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
-    id("kotlin-android")
     id("com.google.gms.google-services")
 }
 
@@ -29,7 +27,7 @@ android {
     buildTypes {
         getByName("release") {
             isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
 
@@ -37,11 +35,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        compilerOptions {
-            jvmTarget = JvmTarget.JVM_17
-        }
-    }
 
     buildFeatures {
         viewBinding = true
@@ -52,7 +45,6 @@ android {
 dependencies {
     implementation(project(":internal:chooserx"))
     implementation(project(":internal:lintchecks"))
-    implementation("androidx.multidex:multidex:2.0.1")
 
     implementation("androidx.activity:activity-ktx:1.12.1")
     implementation("androidx.constraintlayout:constraintlayout:2.2.1")
diff --git a/auth/app/src/main/AndroidManifest.xml b/auth/app/src/main/AndroidManifest.xml
index 017af97bbf..bdd94057fb 100644
--- a/auth/app/src/main/AndroidManifest.xml
+++ b/auth/app/src/main/AndroidManifest.xml
@@ -5,7 +5,6 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:name="androidx.multidex.MultiDexApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts
index 5e5a82e697..a042a1fbf0 100644
--- a/auth/build.gradle.kts
+++ b/auth/build.gradle.kts
@@ -3,7 +3,6 @@
 plugins {
     id("com.android.application") version "8.13.2" apply false
     id("com.android.library") version "8.13.2" apply false
-    id("org.jetbrains.kotlin.android") version "2.3.0" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
 }
 
diff --git a/auth/gradle/wrapper/gradle-wrapper.properties b/auth/gradle/wrapper/gradle-wrapper.properties
index d30212c04b..5dc98dbcf3 100644
--- a/auth/gradle/wrapper/gradle-wrapper.properties
+++ b/auth/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/build.gradle.kts b/build.gradle.kts
index 54f53af0bc..47c25adc34 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,6 @@ import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 plugins {
     id("com.android.application") version "8.13.2" apply false
     id("com.android.library") version "8.13.2" apply false
-    id("org.jetbrains.kotlin.android") version "2.3.0" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
     id("com.google.firebase.crashlytics") version "3.0.6" apply false
     id("com.google.firebase.firebase-perf") version "2.0.2" apply false
diff --git a/config/app/build.gradle.kts b/config/app/build.gradle.kts
index 09ddbca120..a5b92f0c01 100644
--- a/config/app/build.gradle.kts
+++ b/config/app/build.gradle.kts
@@ -1,9 +1,7 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
-    id("kotlin-android")
     id("com.google.gms.google-services")
 }
 
@@ -28,18 +26,13 @@ android {
     buildTypes {
         getByName("release") {
             isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        compilerOptions {
-            jvmTarget = JvmTarget.JVM_17
-        }
-    }
 
     buildFeatures {
         viewBinding = true
diff --git a/config/build.gradle.kts b/config/build.gradle.kts
index ca75fa0a37..727b81933c 100644
--- a/config/build.gradle.kts
+++ b/config/build.gradle.kts
@@ -3,7 +3,6 @@
 plugins {
     id("com.android.application") version "8.13.2" apply false
     id("com.android.library") version "8.13.2" apply false
-    id("org.jetbrains.kotlin.android") version "2.3.0" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
 }
 
diff --git a/config/gradle/wrapper/gradle-wrapper.properties b/config/gradle/wrapper/gradle-wrapper.properties
index d30212c04b..5dc98dbcf3 100644
--- a/config/gradle/wrapper/gradle-wrapper.properties
+++ b/config/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/crash/app/build.gradle.kts b/crash/app/build.gradle.kts
index 3e3bdc6e01..a0137d7f10 100644
--- a/crash/app/build.gradle.kts
+++ b/crash/app/build.gradle.kts
@@ -1,9 +1,7 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
-    id("kotlin-android")
     id("com.google.gms.google-services")
     id("com.google.firebase.crashlytics")
 }
@@ -29,12 +27,12 @@ android {
     buildTypes {
         getByName("release") {
             isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
         getByName("debug") {
             isMinifyEnabled = false
-            testProguardFiles(getDefaultProguardFile("proguard-android.txt"), "test-proguard-rules.pro")
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            testProguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "test-proguard-rules.pro")
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
     compileOptions {
@@ -42,12 +40,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlin {
-        compilerOptions {
-            jvmTarget = JvmTarget.JVM_17
-        }
-    }
-
     buildFeatures {
         viewBinding = true
     }
diff --git a/crash/build.gradle.kts b/crash/build.gradle.kts
index a9402189dc..07ff6e0dbc 100644
--- a/crash/build.gradle.kts
+++ b/crash/build.gradle.kts
@@ -3,7 +3,6 @@
 plugins {
     id("com.android.application") version "8.13.2" apply false
     id("com.android.library") version "8.13.2" apply false
-    id("org.jetbrains.kotlin.android") version "2.3.0" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
     id("com.google.firebase.crashlytics") version "3.0.6" apply false
 }
diff --git a/crash/gradle/wrapper/gradle-wrapper.properties b/crash/gradle/wrapper/gradle-wrapper.properties
index d30212c04b..5dc98dbcf3 100644
--- a/crash/gradle/wrapper/gradle-wrapper.properties
+++ b/crash/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/database/app/build.gradle.kts b/database/app/build.gradle.kts
index 84c8a3725d..9a7d3c5e62 100644
--- a/database/app/build.gradle.kts
+++ b/database/app/build.gradle.kts
@@ -1,9 +1,7 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
-    id("kotlin-android")
     id("com.google.gms.google-services")
 }
 
@@ -28,7 +26,7 @@ android {
     buildTypes {
         getByName("release") {
             isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
             signingConfig = signingConfigs.getByName("debug")
         }
     }
@@ -36,11 +34,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        compilerOptions {
-            jvmTarget = JvmTarget.JVM_17
-        }
-    }
 
     buildFeatures {
         viewBinding = true
diff --git a/database/build.gradle.kts b/database/build.gradle.kts
index 5e5a82e697..a042a1fbf0 100644
--- a/database/build.gradle.kts
+++ b/database/build.gradle.kts
@@ -3,7 +3,6 @@
 plugins {
     id("com.android.application") version "8.13.2" apply false
     id("com.android.library") version "8.13.2" apply false
-    id("org.jetbrains.kotlin.android") version "2.3.0" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
 }
 
diff --git a/database/gradle/wrapper/gradle-wrapper.properties b/database/gradle/wrapper/gradle-wrapper.properties
index d30212c04b..5dc98dbcf3 100644
--- a/database/gradle/wrapper/gradle-wrapper.properties
+++ b/database/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/dataconnect/app/build.gradle.kts b/dataconnect/app/build.gradle.kts
index 67dde06181..28fb4f7c25 100644
--- a/dataconnect/app/build.gradle.kts
+++ b/dataconnect/app/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.jetbrains.kotlin.android)
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.google.services)
     alias(libs.plugins.compose.compiler)
@@ -36,9 +35,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
     buildFeatures {
         compose = true
     }
diff --git a/dataconnect/build.gradle.kts b/dataconnect/build.gradle.kts
index 8e1379dd6a..9c6b19866e 100644
--- a/dataconnect/build.gradle.kts
+++ b/dataconnect/build.gradle.kts
@@ -1,7 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.jetbrains.kotlin.android) apply false
     alias(libs.plugins.google.services) apply false
     alias(libs.plugins.compose.compiler) apply false
 }
diff --git a/dataconnect/gradle/wrapper/gradle-wrapper.properties b/dataconnect/gradle/wrapper/gradle-wrapper.properties
index 53d33fcada..2e00545d63 100644
--- a/dataconnect/gradle/wrapper/gradle-wrapper.properties
+++ b/dataconnect/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed May 08 19:29:05 BST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/firebase-ai/app/build.gradle.kts b/firebase-ai/app/build.gradle.kts
index b070d8906d..fa28134b21 100644
--- a/firebase-ai/app/build.gradle.kts
+++ b/firebase-ai/app/build.gradle.kts
@@ -1,8 +1,6 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
-    id("org.jetbrains.kotlin.android")
     id("org.jetbrains.kotlin.plugin.compose")
     id("org.jetbrains.kotlin.plugin.serialization")
     id("com.google.gms.google-services")
@@ -35,11 +33,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlin {
-        compilerOptions {
-            jvmTarget = JvmTarget.JVM_11
-        }
-    }
     buildFeatures {
         compose = true
     }
diff --git a/firebase-ai/build.gradle.kts b/firebase-ai/build.gradle.kts
index 9d63a766ba..3256a9f3b2 100644
--- a/firebase-ai/build.gradle.kts
+++ b/firebase-ai/build.gradle.kts
@@ -3,7 +3,6 @@
 plugins {
     id("com.android.application") version "8.13.2" apply false
     id("com.android.library") version "8.13.2" apply false
-    id("org.jetbrains.kotlin.android") version "2.3.0" apply false
     id("org.jetbrains.kotlin.plugin.compose") version "2.3.0" apply false
     id("org.jetbrains.kotlin.plugin.serialization") version "2.3.0" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
diff --git a/firebase-ai/gradle/libs.versions.toml b/firebase-ai/gradle/libs.versions.toml
index db9d5ed20d..af3dbc442a 100644
--- a/firebase-ai/gradle/libs.versions.toml
+++ b/firebase-ai/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 activityCompose = "1.12.1"
-agp = "8.13.0"
+agp = "9.0.0"
 composeBom = "2025.10.00"
 composeNavigation = "2.9.6"
 coreKtx = "1.17.0"
diff --git a/firebase-ai/gradle/wrapper/gradle-wrapper.properties b/firebase-ai/gradle/wrapper/gradle-wrapper.properties
index 8b5c206224..289e22e5e2 100644
--- a/firebase-ai/gradle/wrapper/gradle-wrapper.properties
+++ b/firebase-ai/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Aug 19 11:04:48 PDT 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/firestore/app/build.gradle.kts b/firestore/app/build.gradle.kts
index 75b4562f90..52fdc7869d 100644
--- a/firestore/app/build.gradle.kts
+++ b/firestore/app/build.gradle.kts
@@ -1,8 +1,6 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
-    id("kotlin-android")
     id("com.google.gms.google-services")
     id("androidx.navigation.safeargs")
 }
@@ -26,8 +24,8 @@ android {
     buildTypes {
         getByName("release") {
             isMinifyEnabled = false
-            testProguardFiles(getDefaultProguardFile("proguard-android.txt"), "test-proguard-rules.pro")
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            testProguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "test-proguard-rules.pro")
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
             signingConfig = signingConfigs.getByName("debug")
         }
     }
@@ -35,11 +33,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        compilerOptions {
-            jvmTarget = JvmTarget.JVM_17
-        }
-    }
 
     buildFeatures {
         viewBinding = true
@@ -83,7 +76,6 @@ dependencies {
     implementation("com.google.android.material:material:1.13.0")
     implementation("androidx.media:media:1.7.1")
     implementation("androidx.recyclerview:recyclerview:1.4.0")
-    implementation("androidx.multidex:multidex:2.0.1")
     implementation("androidx.navigation:navigation-fragment-ktx:2.9.6")
     implementation("androidx.navigation:navigation-ui-ktx:2.9.6")
 
diff --git a/firestore/app/src/main/AndroidManifest.xml b/firestore/app/src/main/AndroidManifest.xml
index 74084c7251..0f998236e7 100644
--- a/firestore/app/src/main/AndroidManifest.xml
+++ b/firestore/app/src/main/AndroidManifest.xml
@@ -5,8 +5,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme"
-        android:name="androidx.multidex.MultiDexApplication">
+        android:theme="@style/AppTheme">
 
         <activity android:name=".EntryChoiceActivity"
             android:label="@string/app_name"
diff --git a/firestore/build.gradle.kts b/firestore/build.gradle.kts
index d5a3155131..c69b056a6c 100644
--- a/firestore/build.gradle.kts
+++ b/firestore/build.gradle.kts
@@ -3,7 +3,6 @@
 plugins {
     id("com.android.application") version "8.13.2" apply false
     id("com.android.library") version "8.13.2" apply false
-    id("org.jetbrains.kotlin.android") version "2.3.0" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
     id("androidx.navigation.safeargs") version "2.9.6" apply false
 }
diff --git a/firestore/gradle/wrapper/gradle-wrapper.properties b/firestore/gradle/wrapper/gradle-wrapper.properties
index d30212c04b..5dc98dbcf3 100644
--- a/firestore/gradle/wrapper/gradle-wrapper.properties
+++ b/firestore/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/functions/app/build.gradle.kts b/functions/app/build.gradle.kts
index 6d09158dc1..f2685f2de5 100644
--- a/functions/app/build.gradle.kts
+++ b/functions/app/build.gradle.kts
@@ -1,8 +1,6 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
-    id("kotlin-android")
     id("com.google.gms.google-services")
 }
 
@@ -25,8 +23,8 @@ android {
     buildTypes {
         getByName("release") {
             isMinifyEnabled = false
-            testProguardFiles(getDefaultProguardFile("proguard-android.txt"), "test-proguard-rules.pro")
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            testProguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "test-proguard-rules.pro")
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
             signingConfig = signingConfigs.getByName("debug")
         }
     }
@@ -34,11 +32,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        compilerOptions {
-            jvmTarget = JvmTarget.JVM_17
-        }
-    }
 
     buildFeatures {
         viewBinding = true
diff --git a/functions/build.gradle.kts b/functions/build.gradle.kts
index 5e5a82e697..a042a1fbf0 100644
--- a/functions/build.gradle.kts
+++ b/functions/build.gradle.kts
@@ -3,7 +3,6 @@
 plugins {
     id("com.android.application") version "8.13.2" apply false
     id("com.android.library") version "8.13.2" apply false
-    id("org.jetbrains.kotlin.android") version "2.3.0" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
 }
 
diff --git a/functions/gradle/wrapper/gradle-wrapper.properties b/functions/gradle/wrapper/gradle-wrapper.properties
index d30212c04b..5dc98dbcf3 100644
--- a/functions/gradle/wrapper/gradle-wrapper.properties
+++ b/functions/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradle.properties b/gradle.properties
index 3c231b0810..93387cb63e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,6 +6,5 @@ org.gradle.caching=true
 
 ## Play and Firebase moving to AndroidX
 android.useAndroidX=true
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3c04547d46..b99548b0f2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 activityCompose = "1.12.1"
-agp = "8.13.2"
+agp = "9.0.0"
 camerax = "1.5.2"
 coilCompose = "2.7.0"
 coil3Compose = "3.3.0"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2a84e188b8..19a6bdeb84 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/inappmessaging/app/build.gradle.kts b/inappmessaging/app/build.gradle.kts
index 550b2ee9fe..2fcc93c3b9 100644
--- a/inappmessaging/app/build.gradle.kts
+++ b/inappmessaging/app/build.gradle.kts
@@ -1,8 +1,6 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
-    id("kotlin-android")
     id("com.google.gms.google-services")
 }
 
@@ -23,18 +21,13 @@ android {
     buildTypes {
         getByName("release") {
             isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        compilerOptions {
-            jvmTarget = JvmTarget.JVM_17
-        }
-    }
 
     buildFeatures {
         viewBinding = true
@@ -53,7 +46,6 @@ dependencies {
 
     implementation("com.google.android.material:material:1.13.0")
     implementation("androidx.constraintlayout:constraintlayout:2.2.1")
-    implementation("androidx.multidex:multidex:2.0.1")
 
     // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom)
     implementation(platform("com.google.firebase:firebase-bom:34.7.0"))
diff --git a/inappmessaging/app/src/main/AndroidManifest.xml b/inappmessaging/app/src/main/AndroidManifest.xml
index f9816bcd6e..b8ae535732 100644
--- a/inappmessaging/app/src/main/AndroidManifest.xml
+++ b/inappmessaging/app/src/main/AndroidManifest.xml
@@ -2,7 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
-        android:name="androidx.multidex.MultiDexApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/inappmessaging/build.gradle.kts b/inappmessaging/build.gradle.kts
index 5e5a82e697..a042a1fbf0 100644
--- a/inappmessaging/build.gradle.kts
+++ b/inappmessaging/build.gradle.kts
@@ -3,7 +3,6 @@
 plugins {
     id("com.android.application") version "8.13.2" apply false
     id("com.android.library") version "8.13.2" apply false
-    id("org.jetbrains.kotlin.android") version "2.3.0" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
 }
 
diff --git a/inappmessaging/gradle/wrapper/gradle-wrapper.properties b/inappmessaging/gradle/wrapper/gradle-wrapper.properties
index d30212c04b..5dc98dbcf3 100644
--- a/inappmessaging/gradle/wrapper/gradle-wrapper.properties
+++ b/inappmessaging/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/internal/chooserx/build.gradle.kts b/internal/chooserx/build.gradle.kts
index 6e21a9ad95..5ca91c14a2 100755
--- a/internal/chooserx/build.gradle.kts
+++ b/internal/chooserx/build.gradle.kts
@@ -15,7 +15,7 @@ android {
     buildTypes {
         getByName("release") {
             isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
 
diff --git a/messaging/app/build.gradle.kts b/messaging/app/build.gradle.kts
index fb4bcf9c44..12a0dde5c6 100644
--- a/messaging/app/build.gradle.kts
+++ b/messaging/app/build.gradle.kts
@@ -1,9 +1,7 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
-    id("kotlin-android")
     id("com.google.gms.google-services")
 }
 
@@ -29,7 +27,7 @@ android {
     buildTypes {
         getByName("release") {
             isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
     packaging {
@@ -39,11 +37,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        compilerOptions {
-            jvmTarget = JvmTarget.JVM_17
-        }
-    }
 
     buildFeatures {
         viewBinding = true
diff --git a/messaging/build.gradle.kts b/messaging/build.gradle.kts
index ca75fa0a37..727b81933c 100644
--- a/messaging/build.gradle.kts
+++ b/messaging/build.gradle.kts
@@ -3,7 +3,6 @@
 plugins {
     id("com.android.application") version "8.13.2" apply false
     id("com.android.library") version "8.13.2" apply false
-    id("org.jetbrains.kotlin.android") version "2.3.0" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
 }
 
diff --git a/messaging/gradle/wrapper/gradle-wrapper.properties b/messaging/gradle/wrapper/gradle-wrapper.properties
index d30212c04b..5dc98dbcf3 100644
--- a/messaging/gradle/wrapper/gradle-wrapper.properties
+++ b/messaging/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/perf/app/build.gradle.kts b/perf/app/build.gradle.kts
index e04827406d..9574ee2788 100644
--- a/perf/app/build.gradle.kts
+++ b/perf/app/build.gradle.kts
@@ -1,10 +1,8 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
 import com.google.firebase.perf.plugin.FirebasePerfExtension
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
-    id("kotlin-android")
     id("com.google.gms.google-services")
     id("com.google.firebase.firebase-perf")
 }
@@ -29,7 +27,7 @@ android {
     buildTypes {
         getByName("release") {
             isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
         getByName("debug") {
 //            configure<FirebasePerfExtension> {
@@ -44,11 +42,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        compilerOptions {
-            jvmTarget = JvmTarget.JVM_17
-        }
-    }
     buildFeatures {
         viewBinding = true
     }
diff --git a/perf/build.gradle.kts b/perf/build.gradle.kts
index dc54e53405..f470cdb6d8 100644
--- a/perf/build.gradle.kts
+++ b/perf/build.gradle.kts
@@ -3,7 +3,6 @@
 plugins {
     id("com.android.application") version "8.13.2" apply false
     id("com.android.library") version "8.13.2" apply false
-    id("org.jetbrains.kotlin.android") version "2.3.0" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
     id("com.google.firebase.firebase-perf") version "2.0.2" apply false
 }
diff --git a/perf/gradle/wrapper/gradle-wrapper.properties b/perf/gradle/wrapper/gradle-wrapper.properties
index d30212c04b..5dc98dbcf3 100644
--- a/perf/gradle/wrapper/gradle-wrapper.properties
+++ b/perf/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/storage/app/build.gradle.kts b/storage/app/build.gradle.kts
index 476b42161e..c003fbf439 100644
--- a/storage/app/build.gradle.kts
+++ b/storage/app/build.gradle.kts
@@ -1,9 +1,7 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
-    id("kotlin-android")
     id("com.google.gms.google-services")
 }
 
@@ -28,18 +26,13 @@ android {
     buildTypes {
         getByName("release") {
             isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlin {
-        compilerOptions {
-            jvmTarget = JvmTarget.JVM_17
-        }
-    }
 
     buildFeatures {
         viewBinding = true
diff --git a/storage/build.gradle.kts b/storage/build.gradle.kts
index 5e5a82e697..a042a1fbf0 100644
--- a/storage/build.gradle.kts
+++ b/storage/build.gradle.kts
@@ -3,7 +3,6 @@
 plugins {
     id("com.android.application") version "8.13.2" apply false
     id("com.android.library") version "8.13.2" apply false
-    id("org.jetbrains.kotlin.android") version "2.3.0" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
 }
 
diff --git a/storage/gradle/wrapper/gradle-wrapper.properties b/storage/gradle/wrapper/gradle-wrapper.properties
index d30212c04b..5dc98dbcf3 100644
--- a/storage/gradle/wrapper/gradle-wrapper.properties
+++ b/storage/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists