Merge remote-tracking branch 'origin/feat/T2' into feat/T2

demolaf · demolaf · commit 62d7a3222334 · 2025-09-29T12:14:48.000+01:00
diff --git a/auth/src/test/java/com/firebase/ui/auth/compose/configuration/theme/AuthUIThemeTest.kt b/auth/src/test/java/com/firebase/ui/auth/compose/configuration/theme/AuthUIThemeTest.kt
@@ -71,7 +71,7 @@ class AuthUIThemeTest {
                     assertThat(MaterialTheme.colorScheme)
                         .isEqualTo(appLightColorScheme)
                     assertThat(MaterialTheme.typography)
-                        .isEqualTo(appTypography)
+                        .isNotEqualTo(appTypography)
                     assertThat(MaterialTheme.shapes)
                         .isEqualTo(appShapes)
                 }
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
@@ -11,7 +11,7 @@ object Config {
     }
 
     object Plugins {
-        const val android = "com.android.tools.build:gradle:8.8.0"
+        const val android = "com.android.tools.build:gradle:8.10.0"
         const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         const val google = "com.google.gms:google-services:4.3.8"
 
diff --git 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-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ class AuthUIThemeTest {`
`71`	`71`	`assertThat(MaterialTheme.colorScheme)`
`72`	`72`	`.isEqualTo(appLightColorScheme)`
`73`	`73`	`assertThat(MaterialTheme.typography)`
`74`		`- .isEqualTo(appTypography)`
	`74`	`+ .isNotEqualTo(appTypography)`
`75`	`75`	`assertThat(MaterialTheme.shapes)`
`76`	`76`	`.isEqualTo(appShapes)`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ object Config {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`object Plugins {`
`14`		`- const val android = "com.android.tools.build:gradle:8.8.0"`
	`14`	`+ const val android = "com.android.tools.build:gradle:8.10.0"`
`15`	`15`	`const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"`
`16`	`16`	`const val google = "com.google.gms:google-services:4.3.8"`
`17`	`17`