From 02f73b4f832f62933418bbeb86f33406f879c8d8 Mon Sep 17 00:00:00 2001 From: Rosario Fernandes Date: Tue, 27 Jan 2026 23:17:29 +0000 Subject: [PATCH 1/3] chore: upgrade to AGP 9.0.0 --- admob/app/build.gradle.kts | 9 +------ admob/build.gradle.kts | 1 - .../gradle/wrapper/gradle-wrapper.properties | 2 +- analytics/app/build.gradle.kts | 10 +------- analytics/build.gradle.kts | 1 - .../gradle/wrapper/gradle-wrapper.properties | 2 +- appdistribution/app/build.gradle.kts | 10 +------- .../app/src/main/AndroidManifest.xml | 1 - appdistribution/build.gradle.kts | 1 - .../gradle/wrapper/gradle-wrapper.properties | 2 +- auth/app/build.gradle.kts | 10 +------- auth/app/src/main/AndroidManifest.xml | 1 - auth/build.gradle.kts | 1 - auth/gradle/wrapper/gradle-wrapper.properties | 2 +- build.gradle.kts | 1 - config/app/build.gradle.kts | 9 +------ config/build.gradle.kts | 1 - .../gradle/wrapper/gradle-wrapper.properties | 2 +- crash/app/build.gradle.kts | 14 +++-------- crash/build.gradle.kts | 1 - .../gradle/wrapper/gradle-wrapper.properties | 2 +- database/app/build.gradle.kts | 9 +------ database/build.gradle.kts | 1 - .../gradle/wrapper/gradle-wrapper.properties | 2 +- dataconnect/app/build.gradle.kts | 4 --- dataconnect/build.gradle.kts | 1 - .../gradle/wrapper/gradle-wrapper.properties | 2 +- firebase-ai/app/build.gradle.kts | 7 ------ .../quickstart/ai/feature/live/Junk.java | 25 +++++++++++++++++++ firebase-ai/build.gradle.kts | 1 - firebase-ai/gradle/libs.versions.toml | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- firestore/app/build.gradle.kts | 12 ++------- firestore/app/src/main/AndroidManifest.xml | 1 - firestore/build.gradle.kts | 1 - .../gradle/wrapper/gradle-wrapper.properties | 2 +- functions/app/build.gradle.kts | 11 ++------ functions/build.gradle.kts | 1 - .../gradle/wrapper/gradle-wrapper.properties | 2 +- gradle.properties | 1 - gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- inappmessaging/app/build.gradle.kts | 10 +------- .../app/src/main/AndroidManifest.xml | 1 - inappmessaging/build.gradle.kts | 1 - .../gradle/wrapper/gradle-wrapper.properties | 2 +- internal/chooserx/build.gradle.kts | 2 +- messaging/app/build.gradle.kts | 9 +------ messaging/build.gradle.kts | 1 - .../gradle/wrapper/gradle-wrapper.properties | 2 +- perf/app/build.gradle.kts | 9 +------ perf/build.gradle.kts | 1 - perf/gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle.kts | 2 +- storage/app/build.gradle.kts | 9 +------ storage/build.gradle.kts | 1 - .../gradle/wrapper/gradle-wrapper.properties | 2 +- 57 files changed, 62 insertions(+), 166 deletions(-) create mode 100644 firebase-ai/app/src/main/java/com/google/firebase/quickstart/ai/feature/live/Junk.java 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 @@ { @@ -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/settings.gradle.kts b/settings.gradle.kts index 38bf5ce183..b89ef6b659 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -14,7 +14,7 @@ include(":admob:app", ":config:app", ":crash:app", ":database:app", - ":dataconnect:app", + ":firestore:app", ":functions:app", ":internal:chooserx", 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 From 7d6b1d266ace39c5011b0fd3cc43414876d6ec0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ros=C3=A1rio=20P=2E=20Fernandes?= Date: Tue, 27 Jan 2026 23:54:08 +0000 Subject: [PATCH 2/3] Update firestore/app/src/main/AndroidManifest.xml --- firestore/app/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firestore/app/src/main/AndroidManifest.xml b/firestore/app/src/main/AndroidManifest.xml index 4f48f40c2f..0f998236e7 100644 --- a/firestore/app/src/main/AndroidManifest.xml +++ b/firestore/app/src/main/AndroidManifest.xml @@ -5,7 +5,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:supportsRtl="true" - android:theme="@style/AppTheme" + android:theme="@style/AppTheme"> Date: Wed, 28 Jan 2026 00:16:09 +0000 Subject: [PATCH 3/3] undo unintended changes --- .../quickstart/ai/feature/live/Junk.java | 25 ------------------- settings.gradle.kts | 2 +- 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 firebase-ai/app/src/main/java/com/google/firebase/quickstart/ai/feature/live/Junk.java diff --git a/firebase-ai/app/src/main/java/com/google/firebase/quickstart/ai/feature/live/Junk.java b/firebase-ai/app/src/main/java/com/google/firebase/quickstart/ai/feature/live/Junk.java deleted file mode 100644 index 327db3e6d2..0000000000 --- a/firebase-ai/app/src/main/java/com/google/firebase/quickstart/ai/feature/live/Junk.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.google.firebase.quickstart.ai.feature.live; - -import androidx.annotation.OptIn; - -import com.google.firebase.ai.FirebaseAI; -import com.google.firebase.ai.LiveGenerativeModel; -import com.google.firebase.ai.type.GenerativeBackend; -import com.google.firebase.ai.type.LiveGenerationConfig; -import com.google.firebase.ai.type.PublicPreviewAPI; -import com.google.firebase.ai.type.ResponseModality; - -public class Junk { - - @OptIn(markerClass = PublicPreviewAPI.class) - void a() { - LiveGenerativeModel lm = FirebaseAI.getInstance(GenerativeBackend.googleAI()).liveModel( - "MODEL_NAME", - // Configure the model to respond with audio - new LiveGenerationConfig.Builder() - .setResponseModality(ResponseModality.AUDIO) - .build() - ); - - } -} diff --git a/settings.gradle.kts b/settings.gradle.kts index b89ef6b659..38bf5ce183 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -14,7 +14,7 @@ include(":admob:app", ":config:app", ":crash:app", ":database:app", - + ":dataconnect:app", ":firestore:app", ":functions:app", ":internal:chooserx",