Merge branch 'master' of github.com:firebase/quickstart-android into dl/grounding

# Conflicts:
#	firebase-ai/app/src/main/java/com/google/firebase/quickstart/ai/FirebaseAISamples.kt
#	firebase-ai/app/src/main/java/com/google/firebase/quickstart/ai/feature/text/ChatViewModel.kt
#	firebase-ai/app/src/main/java/com/google/firebase/quickstart/ai/ui/navigation/Sample.kt
#	gradle/libs.versions.toml

Author: thatfiredev

.github/workflows/android.yml

@@ -1,12 +1,17 @@
 name: Android CI
 
 on:
-  - pull_request
-  - push
+  pull_request:
+  push:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number  || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
     - uses: actions/checkout@v4
     - name: Set up JDK 17
@@ -28,4 +33,4 @@ jobs:
       if: github.event_name == 'pull_request'
     - name: Build with Gradle (Push)
       run: ./gradlew clean ktlint assemble
-      if: github.event_name != 'pull_request'
+      if: github.event_name != 'pull_request'

README.md

@@ -17,25 +17,20 @@ the generated `google-services.json` file, and copy it to the `app/` directory o
 the sample you wish to run.
 
 - [Admob](admob/README.md)
+- [Firebase AI Logic](firebase-ai/README.md)
 - [Analytics](analytics/README.md)
 - [App Distribution](appdistribution/README.md)
-- [App-Indexing](app-indexing/README.md)
 - [Auth](auth/README.md)
-- [Config](config/README.md)
-- [Crash](crash/README.md)
-- [Database](database/README.md)
+- [Remote Config](config/README.md)
+- [Crashlytics](crash/README.md)
+- [Realtime Database](database/README.md)
+- [Data Connect](dataconnect/README.md)
 - [Firestore](firestore/README.md)
-- [Functions](functions/README.md)
-- [Dynamic Links](dynamiclinks/README.md)
+- [Cloud Functions for Firebase](functions/README.md)
 - [In-App Messaging](inappmessaging/README.md)
-- [Messaging](messaging/README.md)
-- [ML Kit](mlkit/README.md)
-- [ML Kit LanguageID](mlkit-langid/README.md)
-- [ML Kit Smart Reply](mlkit-smartreply/README.md)
-- [ML Kit Translate](mlkit-translate/README.md)
+- [Cloud Messaging](messaging/README.md)
 - [Performance Monitoring](perf/README.md)
-- [Storage](storage/README.md)
-- [Vertex AI](vertexai/README.md)
+- [Cloud Storage for Firebase](storage/README.md)
 
 ## How to make contributions?
 Please read and follow the steps in the [CONTRIBUTING.md](CONTRIBUTING.md)
@@ -44,6 +39,6 @@ Please read and follow the steps in the [CONTRIBUTING.md](CONTRIBUTING.md)
 [![SAM Score][sam-score-badge]][sam-score]
 
 [gh-actions]: https://github.com/firebase/quickstart-android/actions
-[gh-actions-badge]: https://github.com/firebase/quickstart-android/workflows/Android%20CI/badge.svg
+[gh-actions-badge]: https://github.com/firebase/quickstart-android/actions/workflows/android.yml/badge.svg?branch=master&event=push
 [sam-score]: https://ossbot.computer/samscore.html
 [sam-score-badge]: https://ossbot.computer/samscorebadge?org=firebase&repo=quickstart-android

admob/app/build.gradle.kts

@@ -49,22 +49,22 @@ android {
 dependencies {
     implementation(project(":internal:lintchecks"))
     implementation(project(":internal:chooserx"))
-    implementation("androidx.appcompat:appcompat:1.7.0")
+    implementation("androidx.appcompat:appcompat:1.7.1")
     implementation("com.google.android.material:material:1.12.0")
     implementation("androidx.browser:browser:1.5.0")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.8.9")
-    implementation("androidx.navigation:navigation-ui-ktx:2.8.9")
+    implementation("androidx.navigation:navigation-fragment-ktx:2.9.2")
+    implementation("androidx.navigation:navigation-ui-ktx:2.9.2")
 
     implementation("com.google.android.gms:play-services-ads:23.3.0")
 
     // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom)
-    implementation(platform("com.google.firebase:firebase-bom:33.12.0"))
+    implementation(platform("com.google.firebase:firebase-bom:33.16.0"))
 
     // For an optimal experience using AdMob, add the Firebase SDK
     // for Google Analytics. This is recommended, but not required.
     implementation("com.google.firebase:firebase-analytics")
 
-    debugImplementation("androidx.fragment:fragment-testing:1.8.6")
+    debugImplementation("androidx.fragment:fragment-testing:1.8.8")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
     androidTestImplementation("androidx.test:rules:1.6.1")
     androidTestImplementation("androidx.test:runner:1.6.2")

admob/build.gradle.kts

@@ -1,10 +1,10 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 plugins {
-    id("com.android.application") version "8.9.1" apply false
-    id("com.android.library") version "8.9.1" apply false
-    id("org.jetbrains.kotlin.android") version "2.1.20" apply false
-    id("com.google.gms.google-services") version "4.4.2" apply false
+    id("com.android.application") version "8.11.1" apply false
+    id("com.android.library") version "8.11.1" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.0" apply false
+    id("com.google.gms.google-services") version "4.4.3" apply false
 }
 
 allprojects {

admob/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

analytics/app/build.gradle.kts

@@ -50,13 +50,13 @@ dependencies {
     implementation(project(":internal:chooserx"))
 
     implementation("com.google.android.material:material:1.12.0")
-    implementation("androidx.appcompat:appcompat:1.7.0")
+    implementation("androidx.appcompat:appcompat:1.7.1")
     implementation("androidx.preference:preference-ktx:1.2.1")
     // Needed to override the version used by preference-ktx
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.2")
 
     // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom)
-    implementation(platform("com.google.firebase:firebase-bom:33.12.0"))
+    implementation(platform("com.google.firebase:firebase-bom:33.16.0"))
 
     // Firebase Analytics
     implementation("com.google.firebase:firebase-analytics")

analytics/build.gradle.kts

@@ -1,10 +1,10 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 plugins {
-    id("com.android.application") version "8.9.1" apply false
-    id("com.android.library") version "8.9.1" apply false
-    id("org.jetbrains.kotlin.android") version "2.1.20" apply false
-    id("com.google.gms.google-services") version "4.4.2" apply false
+    id("com.android.application") version "8.11.1" apply false
+    id("com.android.library") version "8.11.1" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.0" apply false
+    id("com.google.gms.google-services") version "4.4.3" apply false
 }
 
 allprojects {

analytics/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists