From 8d4fd769c76300d9123a394a7f09a497931f6d0f Mon Sep 17 00:00:00 2001
From: demolaf <demolafadumo@gmail.com>
Date: Tue, 1 Sep 2026 15:27:59 +0100
Subject: [PATCH 1/2] chore(deps): upgrade AGP to 9.3.0

---
 auth/build.gradle.kts           | 2 +-
 common/build.gradle.kts         | 1 -
 database/build.gradle.kts       | 2 +-
 firestore/build.gradle.kts      | 2 +-
 gradle.properties               | 2 ++
 gradle/libs.versions.toml       | 2 +-
 proguard-tests/build.gradle.kts | 7 ++-----
 storage/build.gradle.kts        | 3 +--
 8 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts
index 46e3f4891..8e2e188e2 100644
--- a/auth/build.gradle.kts
+++ b/auth/build.gradle.kts
@@ -106,7 +106,7 @@ dependencies {
     implementation(libs.zxing.core)
     annotationProcessor(libs.androidx.lifecycle.compiler)
 
-    implementation(platform(libs.firebase.bom))
+    api(platform(libs.firebase.bom))
     api(libs.firebase.auth)
 
     // Phone number validation
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 297988e9f..66a744073 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -42,7 +42,6 @@ android {
     buildTypes {
         named("release").configure {
             isMinifyEnabled = false
-            consumerProguardFiles("proguard-rules.pro")
         }
     }
 }
diff --git a/database/build.gradle.kts b/database/build.gradle.kts
index b2fcf8797..af64323ab 100644
--- a/database/build.gradle.kts
+++ b/database/build.gradle.kts
@@ -55,7 +55,7 @@ android {
 }
 
 dependencies {
-    implementation(platform(libs.firebase.bom))
+    api(platform(libs.firebase.bom))
     api(project(":common"))
     api(libs.firebase.database)
 
diff --git a/firestore/build.gradle.kts b/firestore/build.gradle.kts
index d048e6c63..7ceef8c6f 100644
--- a/firestore/build.gradle.kts
+++ b/firestore/build.gradle.kts
@@ -54,7 +54,7 @@ android {
 }
 
 dependencies {
-    implementation(platform(libs.firebase.bom))
+    api(platform(libs.firebase.bom))
     api(project(":common"))
     api(libs.firebase.firestore)
 
diff --git a/gradle.properties b/gradle.properties
index 90e98db8e..180aa474c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,6 +9,8 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=false
+android.builtInKotlin=false
+android.newDsl=false
 GROUP=com.firebaseui
 VERSION_NAME=10.0.0-beta04
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fd7c65638..47a9cd0e2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 kotlin = "2.4.10"
-android-gradle-plugin = "8.10.0"
+android-gradle-plugin = "9.3.0"
 google-services = "4.5.0"
 maven-publish-plugin = "0.34.0"
 
diff --git a/proguard-tests/build.gradle.kts b/proguard-tests/build.gradle.kts
index a86aa2999..854702eca 100644
--- a/proguard-tests/build.gradle.kts
+++ b/proguard-tests/build.gradle.kts
@@ -35,11 +35,8 @@ android {
             // using the debug key
             signingConfig = signingConfigs["debug"]
 
-            postprocessing {
-                isRemoveUnusedCode = true
-                isRemoveUnusedResources = true
-                isObfuscate = true
-            }
+            isMinifyEnabled = true
+            isShrinkResources = true
         }
     }
 
diff --git a/storage/build.gradle.kts b/storage/build.gradle.kts
index 7ac13aeba..c45b44a63 100644
--- a/storage/build.gradle.kts
+++ b/storage/build.gradle.kts
@@ -42,7 +42,6 @@ android {
     buildTypes {
         named("release").configure {
             isMinifyEnabled = false
-            consumerProguardFiles("proguard-rules.pro")
         }
     }
 }
@@ -50,7 +49,7 @@ android {
 dependencies {
     api(libs.glide)
 
-    implementation(platform(libs.firebase.bom))
+    api(platform(libs.firebase.bom))
     api(libs.firebase.storage)
     // Override Play Services
     implementation(libs.androidx.legacy.support.v4)

From f6aaf9b00dea37fe6b2f5f063cabce03ddae274f Mon Sep 17 00:00:00 2001
From: demolaf <demolafadumo@gmail.com>
Date: Tue, 1 Sep 2026 16:06:56 +0100
Subject: [PATCH 2/2] chore(deps): bump compileSdk to 37

---
 buildSrc/src/main/kotlin/Config.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index 41d67933e..f3dea99ba 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -3,7 +3,7 @@ object Config {
     val submodules = listOf("auth", "common", "firestore", "database", "storage")
 
     object SdkVersions {
-        const val compile = 36
+        const val compile = 37
         const val target = 36
         const val min = 23
     }