Merge branch 'master' into rl.bidi.video

rlazo · web-flow · commit 5d53fdd3f047 · 2025-10-28T12:31:32.000-04:00
diff --git a/admob/build.gradle.kts b/admob/build.gradle.kts
@@ -3,7 +3,7 @@
 plugins {
     id("com.android.application") version "8.13.0" apply false
     id("com.android.library") version "8.13.0" apply false
-    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.21" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
 }
 
diff --git a/analytics/build.gradle.kts b/analytics/build.gradle.kts
@@ -3,7 +3,7 @@
 plugins {
     id("com.android.application") version "8.13.0" apply false
     id("com.android.library") version "8.13.0" apply false
-    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.21" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
 }
 
diff --git a/appdistribution/build.gradle.kts b/appdistribution/build.gradle.kts
@@ -3,7 +3,7 @@
 plugins {
     id("com.android.application") version "8.13.0" apply false
     id("com.android.library") version "8.13.0" apply false
-    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.21" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
 }
 
diff --git a/auth/app/build.gradle.kts b/auth/app/build.gradle.kts
@@ -74,7 +74,7 @@ dependencies {
 
     // Firebase UI
     // Used in FirebaseUIActivity.
-    implementation("com.firebaseui:firebase-ui-auth:9.0.0")
+    implementation("com.firebaseui:firebase-ui-auth:9.1.1")
 
     // Facebook Android SDK (only required for Facebook Login)
     // Used in FacebookLoginActivity.
diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts
@@ -3,7 +3,7 @@
 plugins {
     id("com.android.application") version "8.13.0" apply false
     id("com.android.library") version "8.13.0" apply false
-    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.21" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
 }
 
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,13 +3,13 @@ import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 plugins {
     id("com.android.application") version "8.13.0" apply false
     id("com.android.library") version "8.13.0" apply false
-    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.21" 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.1" apply false
     id("androidx.navigation.safeargs") version "2.9.5" apply false
     id("com.github.ben-manes.versions") version "0.53.0" apply true
-    id("org.jetbrains.kotlin.plugin.compose") version "2.2.20" apply false
+    id("org.jetbrains.kotlin.plugin.compose") version "2.2.21" apply false
 }
 
 allprojects {
diff --git a/config/build.gradle.kts b/config/build.gradle.kts
@@ -3,7 +3,7 @@
 plugins {
     id("com.android.application") version "8.13.0" apply false
     id("com.android.library") version "8.13.0" apply false
-    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.21" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
 }
 
diff --git a/crash/build.gradle.kts b/crash/build.gradle.kts
@@ -3,7 +3,7 @@
 plugins {
     id("com.android.application") version "8.13.0" apply false
     id("com.android.library") version "8.13.0" apply false
-    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.21" 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/database/app/build.gradle.kts b/database/app/build.gradle.kts
@@ -66,7 +66,7 @@ dependencies {
     // Firebase Authentication
     implementation("com.google.firebase:firebase-auth")
 
-    implementation("com.firebaseui:firebase-ui-database:9.0.0")
+    implementation("com.firebaseui:firebase-ui-database:9.1.1")
 
     // Needed to fix a dependency conflict with FirebaseUI'
     implementation("androidx.arch.core:core-runtime:2.2.0")
diff --git a/database/build.gradle.kts b/database/build.gradle.kts
@@ -3,7 +3,7 @@
 plugins {
     id("com.android.application") version "8.13.0" apply false
     id("com.android.library") version "8.13.0" apply false
-    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.21" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
 }
 
diff --git a/firebase-ai/build.gradle.kts b/firebase-ai/build.gradle.kts
@@ -3,8 +3,8 @@
 plugins {
     id("com.android.application") version "8.13.0" apply false
     id("com.android.library") version "8.13.0" apply false
-    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
-    id("org.jetbrains.kotlin.plugin.compose") version "2.2.20" apply false
-    id("org.jetbrains.kotlin.plugin.serialization") version "2.2.20" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.21" apply false
+    id("org.jetbrains.kotlin.plugin.compose") version "2.2.21" apply false
+    id("org.jetbrains.kotlin.plugin.serialization") version "2.2.21" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
 }
diff --git a/firestore/app/build.gradle.kts b/firestore/app/build.gradle.kts
@@ -71,7 +71,7 @@ dependencies {
     implementation("com.google.android.gms:play-services-auth:20.7.0")
 
     // FirebaseUI (for authentication)
-    implementation("com.firebaseui:firebase-ui-auth:9.0.0")
+    implementation("com.firebaseui:firebase-ui-auth:9.1.1")
 
     // Support Libs
     implementation("androidx.activity:activity-ktx:1.11.0")
diff --git a/firestore/build.gradle.kts b/firestore/build.gradle.kts
@@ -3,7 +3,7 @@
 plugins {
     id("com.android.application") version "8.13.0" apply false
     id("com.android.library") version "8.13.0" apply false
-    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.21" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
     id("androidx.navigation.safeargs") version "2.9.5" apply false
 }
diff --git a/functions/app/build.gradle.kts b/functions/app/build.gradle.kts
@@ -67,7 +67,7 @@ dependencies {
     implementation("com.google.firebase:firebase-messaging")
 
     // Firebase UI
-    implementation("com.firebaseui:firebase-ui-auth:9.0.0")
+    implementation("com.firebaseui:firebase-ui-auth:9.1.1")
     
     // Google Play services
     implementation("com.google.android.gms:play-services-auth:21.2.0")
diff --git a/functions/build.gradle.kts b/functions/build.gradle.kts
@@ -3,7 +3,7 @@
 plugins {
     id("com.android.application") version "8.13.0" apply false
     id("com.android.library") version "8.13.0" apply false
-    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.21" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,8 +3,8 @@ activityCompose = "1.11.0"
 agp = "8.13.0"
 camerax = "1.5.1"
 coilCompose = "2.7.0"
-composeBom = "2025.10.00"
-composeNavigation = "2.9.5"
+firebaseBom = "34.4.0"
+kotlin = "2.2.21"
 coreKtx = "1.17.0"
 espressoCore = "3.7.0"
 firebaseBom = "34.4.0"
@@ -14,6 +14,10 @@ junitVersion = "1.3.0"
 kotlin = "2.2.20"
 kotlinxSerializationCore = "1.9.0"
 lifecycle = "2.9.4"
+activityCompose = "1.11.0"
+composeBom = "2025.10.01"
+googleServices = "4.4.4"
+composeNavigation = "2.9.5"
 material = "1.13.0"
 webkit = "1.14.0"
 
diff --git a/inappmessaging/build.gradle.kts b/inappmessaging/build.gradle.kts
@@ -3,7 +3,7 @@
 plugins {
     id("com.android.application") version "8.13.0" apply false
     id("com.android.library") version "8.13.0" apply false
-    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.21" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
 }
 
diff --git a/messaging/app/build.gradle.kts b/messaging/app/build.gradle.kts
@@ -78,7 +78,7 @@ dependencies {
 
     implementation("com.google.firebase:firebase-installations:19.0.1")
 
-    implementation("androidx.work:work-runtime:2.10.5")
+    implementation("androidx.work:work-runtime:2.11.0")
 
     // Testing dependencies
     androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0")
diff --git a/messaging/build.gradle.kts b/messaging/build.gradle.kts
@@ -3,7 +3,7 @@
 plugins {
     id("com.android.application") version "8.13.0" apply false
     id("com.android.library") version "8.13.0" apply false
-    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.21" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
 }
 
diff --git a/perf/build.gradle.kts b/perf/build.gradle.kts
@@ -3,7 +3,7 @@
 plugins {
     id("com.android.application") version "8.13.0" apply false
     id("com.android.library") version "8.13.0" apply false
-    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.21" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
     id("com.google.firebase.firebase-perf") version "2.0.1" apply false
 }
diff --git a/storage/build.gradle.kts b/storage/build.gradle.kts
@@ -3,7 +3,7 @@
 plugins {
     id("com.android.application") version "8.13.0" apply false
     id("com.android.library") version "8.13.0" apply false
-    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.21" apply false
     id("com.google.gms.google-services") version "4.4.4" apply false
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`plugins {`
`4`	`4`	`id("com.android.application") version "8.13.0" apply false`
`5`	`5`	`id("com.android.library") version "8.13.0" apply false`
`6`		`- id("org.jetbrains.kotlin.android") version "2.2.20" apply false`
	`6`	`+ id("org.jetbrains.kotlin.android") version "2.2.21" apply false`
`7`	`7`	`id("com.google.gms.google-services") version "4.4.4" apply false`
`8`	`8`	`}`
`9`	`9`