From 71a59251038dcdf7967170b1b3aa96866b147e2a Mon Sep 17 00:00:00 2001 From: Guillaume Bernos Date: Tue, 24 Mar 2026 10:47:49 +0100 Subject: [PATCH 1/3] fix(android): clean old groovy style declaration in build.gradle files --- .../cloud_functions/cloud_functions/android/build.gradle | 6 ------ .../firebase_analytics/android/build.gradle | 8 -------- .../firebase_performance/android/build.gradle | 5 ----- .../firebase_remote_config/android/build.gradle | 1 - .../firebase_storage/android/build.gradle | 5 ----- 5 files changed, 25 deletions(-) diff --git a/packages/cloud_functions/cloud_functions/android/build.gradle b/packages/cloud_functions/cloud_functions/android/build.gradle index 9d1295a9567c..ea4960c0c698 100644 --- a/packages/cloud_functions/cloud_functions/android/build.gradle +++ b/packages/cloud_functions/cloud_functions/android/build.gradle @@ -11,16 +11,10 @@ if (agpMajor < 9) { } buildscript { - ext.kotlin_version = "1.8.22" repositories { google() mavenCentral() } - - dependencies { - classpath 'com.android.tools.build:gradle:8.1.4' - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version") - } } rootProject.allprojects { diff --git a/packages/firebase_analytics/firebase_analytics/android/build.gradle b/packages/firebase_analytics/firebase_analytics/android/build.gradle index 183ea4605c04..974054588165 100755 --- a/packages/firebase_analytics/firebase_analytics/android/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/android/build.gradle @@ -5,16 +5,10 @@ apply plugin: 'com.android.library' apply from: file("local-config.gradle") buildscript { - ext.kotlin_version = "1.8.22" repositories { google() mavenCentral() } - - dependencies { - classpath 'com.android.tools.build:gradle:8.1.4' - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version") - } } rootProject.allprojects { @@ -24,8 +18,6 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' - // AGP 9+ has built-in Kotlin support; older versions need the plugin explicitly. def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int if (agpMajor < 9) { diff --git a/packages/firebase_performance/firebase_performance/android/build.gradle b/packages/firebase_performance/firebase_performance/android/build.gradle index 6d38c5620117..8fd964b1d15b 100644 --- a/packages/firebase_performance/firebase_performance/android/build.gradle +++ b/packages/firebase_performance/firebase_performance/android/build.gradle @@ -11,15 +11,10 @@ if (agpMajor < 9) { } buildscript { - ext.kotlin_version = "1.8.22" - repositories { google() mavenCentral() } - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } } rootProject.allprojects { diff --git a/packages/firebase_remote_config/firebase_remote_config/android/build.gradle b/packages/firebase_remote_config/firebase_remote_config/android/build.gradle index a03f8e444446..dfe227e94217 100644 --- a/packages/firebase_remote_config/firebase_remote_config/android/build.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/android/build.gradle @@ -5,7 +5,6 @@ apply plugin: 'com.android.library' apply from: file("local-config.gradle") buildscript { - ext.kotlin_version = "1.8.22" repositories { google() mavenCentral() diff --git a/packages/firebase_storage/firebase_storage/android/build.gradle b/packages/firebase_storage/firebase_storage/android/build.gradle index c9e5b5e5940d..bedc0da58ef7 100755 --- a/packages/firebase_storage/firebase_storage/android/build.gradle +++ b/packages/firebase_storage/firebase_storage/android/build.gradle @@ -5,15 +5,10 @@ apply plugin: 'com.android.library' apply from: file("local-config.gradle") buildscript { - ext.kotlin_version = "1.8.22" repositories { google() mavenCentral() } - dependencies { - classpath 'com.android.tools.build:gradle:8.1.4' - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version") - } } rootProject.allprojects { From 8ff1025917eb9b1994c2db9fad0c8af5342cd767 Mon Sep 17 00:00:00 2001 From: Guillaume Bernos Date: Tue, 4 Aug 2026 09:53:17 +0200 Subject: [PATCH 2/3] fix(app_check,android): drop dead ext.kotlin_version from buildscript firebase_app_check declared ext.kotlin_version but no longer had a classpath referencing it, so the variable was dead. It already relies on the consuming app for the Kotlin Gradle Plugin, same as firebase_database. --- .../firebase_app_check/firebase_app_check/android/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/firebase_app_check/firebase_app_check/android/build.gradle b/packages/firebase_app_check/firebase_app_check/android/build.gradle index cc7c342a5ca7..8ae40cbfecb8 100644 --- a/packages/firebase_app_check/firebase_app_check/android/build.gradle +++ b/packages/firebase_app_check/firebase_app_check/android/build.gradle @@ -5,7 +5,6 @@ apply plugin: 'com.android.library' apply from: file("local-config.gradle") buildscript { - ext.kotlin_version = "2.0.0" repositories { google() mavenCentral() From 50a056acbc5971dfe2bdcc079c3a0c940948e9dc Mon Sep 17 00:00:00 2001 From: Guillaume Bernos Date: Tue, 4 Aug 2026 10:21:17 +0200 Subject: [PATCH 3/3] fix(firestore,android): remove plugin-local AGP pin from buildscript cloud_firestore pinned classpath 'com.android.tools.build:gradle:8.3.0' in its own buildscript, which can conflict with the AGP version the consuming app supplies. AGP is inherited from the root project, as it already is in firebase_auth, firebase_core, firebase_messaging and firebase_crashlytics. --- packages/cloud_firestore/cloud_firestore/android/build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/cloud_firestore/cloud_firestore/android/build.gradle b/packages/cloud_firestore/cloud_firestore/android/build.gradle index 2c6840eb2211..66d5b12c19c5 100755 --- a/packages/cloud_firestore/cloud_firestore/android/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/android/build.gradle @@ -9,9 +9,6 @@ buildscript { google() mavenCentral() } - dependencies { - classpath 'com.android.tools.build:gradle:8.3.0' - } } allprojects {