From 31aab4a8e74e70114aa23dc27b504b0a5546d5a2 Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Thu, 10 Apr 2025 16:46:50 +0100 Subject: [PATCH 01/29] chore(deps): Unify versions into gobal config and update AGP version to 8.2.1 --- gradle/global-config.gradle | 6 ++++++ .../cloud_firestore/android/build.gradle | 11 ++++++----- .../example/android/app/build.gradle | 9 +++++++-- .../example/android/settings.gradle | 2 +- .../cloud_functions/android/build.gradle | 14 ++++++++------ .../example/android/app/build.gradle | 9 +++++++-- .../example/android/settings.gradle | 2 +- .../firebase_analytics/android/build.gradle | 12 +++++++----- .../example/android/app/build.gradle | 9 +++++++-- .../example/android/settings.gradle | 2 +- .../firebase_app_check/android/build.gradle | 11 ++++++----- .../example/android/app/build.gradle | 9 +++++++-- .../example/android/settings.gradle | 2 +- .../android/build.gradle | 13 +++++++------ .../example/android/app/build.gradle | 9 +++++++-- .../example/android/settings.gradle | 2 +- .../firebase_auth/android/build.gradle | 12 +++++++----- .../example/android/app/build.gradle | 9 ++++++--- .../firebase_core/android/build.gradle | 13 ++++++++----- .../example/android/app/build.gradle | 9 +++++++-- .../firebase_core/example/android/settings.gradle | 2 +- .../firebase_crashlytics/android/build.gradle | 12 +++++++----- .../example/android/app/build.gradle | 9 +++++++-- .../example/android/settings.gradle | 2 +- .../example/android/app/build.gradle | 9 +++++++-- .../example/android/settings.gradle | 2 +- .../firebase_database/android/build.gradle | 11 ++++++----- .../example/android/app/build.gradle | 9 +++++++-- .../example/android/settings.gradle | 2 +- .../firebase_dynamic_links/android/build.gradle | 13 +++++++------ .../example/android/app/build.gradle | 9 +++++++-- .../example/android/settings.gradle | 2 +- .../android/build.gradle | 11 ++++++----- .../example/android/app/build.gradle | 9 +++++++-- .../example/android/settings.gradle | 2 +- .../firebase_messaging/android/build.gradle | 14 ++++++++------ .../example/android/app/build.gradle | 15 +++++++++++++-- .../example/android/settings.gradle | 2 +- .../android/build.gradle | 13 +++++++------ .../example/android/app/build.gradle | 9 +++++++-- .../example/android/settings.gradle | 2 +- .../firebase_performance/android/build.gradle | 12 +++++++----- .../example/android/app/build.gradle | 9 +++++++-- .../example/android/settings.gradle | 2 +- .../firebase_remote_config/android/build.gradle | 11 ++++++----- .../example/android/app/build.gradle | 9 +++++++-- .../example/android/settings.gradle | 2 +- .../firebase_storage/android/build.gradle | 11 ++++++----- .../example/android/app/build.gradle | 9 +++++++-- .../example/android/settings.gradle | 2 +- .../example/android/build.gradle | 2 +- .../example/android/settings.gradle | 2 +- tests/android/app/build.gradle | 10 ++++++---- tests/android/settings.gradle | 2 +- 54 files changed, 264 insertions(+), 143 deletions(-) create mode 100644 gradle/global-config.gradle diff --git a/gradle/global-config.gradle b/gradle/global-config.gradle new file mode 100644 index 000000000000..25a9a1e6c1c5 --- /dev/null +++ b/gradle/global-config.gradle @@ -0,0 +1,6 @@ +ext { + javaVersion = JavaVersion.VERSION_17 + compileSdk = 35 + minSdk = 21 + targetSdk = 35 +} diff --git a/packages/cloud_firestore/cloud_firestore/android/build.gradle b/packages/cloud_firestore/cloud_firestore/android/build.gradle index f4c27a4f460c..ee29d31aec14 100755 --- a/packages/cloud_firestore/cloud_firestore/android/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' + classpath 'com.android.tools.build:gradle:8.2.1' } } @@ -20,6 +20,7 @@ allprojects { } apply plugin: 'com.android.library' +apply from: file("../../../../gradle/global-config.gradle") def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { @@ -40,16 +41,16 @@ android { namespace 'io.flutter.plugins.firebase.firestore' } - compileSdk 35 + compileSdkVersion project.ext.compileSdk defaultConfig { - minSdk 21 + minSdkVersion project.ext.minSdk testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility project.ext.javaVersion + targetCompatibility project.ext.javaVersion } buildFeatures { diff --git a/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle b/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle index 9f10cb25819c..b72147abf01a 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle @@ -7,6 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } +apply from: file("../../../../../../gradle/global-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") @@ -32,8 +33,12 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = project.ext.javaVersion + targetCompatibility = project.ext.javaVersion + } + + kotlinOptions { + jvmTarget = "17" } defaultConfig { diff --git a/packages/cloud_firestore/cloud_firestore/example/android/settings.gradle b/packages/cloud_firestore/cloud_firestore/example/android/settings.gradle index f1a7cdf2514b..5f5242c6fd2f 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/settings.gradle +++ b/packages/cloud_firestore/cloud_firestore/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.1.0" apply false + id "com.android.application" version "8.2.1" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/packages/cloud_functions/cloud_functions/android/build.gradle b/packages/cloud_functions/cloud_functions/android/build.gradle index 849cf1bec6c1..9de27988ff6e 100644 --- a/packages/cloud_functions/cloud_functions/android/build.gradle +++ b/packages/cloud_functions/cloud_functions/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' + classpath 'com.android.tools.build:gradle:8.2.1' } } @@ -20,6 +20,7 @@ rootProject.allprojects { } apply plugin: 'com.android.library' +apply from: file("../../../../gradle/global-config.gradle") def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { @@ -40,17 +41,18 @@ android { namespace 'io.flutter.plugins.firebase.functions' } - compileSdk 35 + compileSdkVersion project.ext.compileSdk defaultConfig { - minSdk 21 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + minSdkVersion project.ext.minSdk + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility project.ext.javaVersion + targetCompatibility project.ext.javaVersion } + buildFeatures { buildConfig = true } diff --git a/packages/cloud_functions/cloud_functions/example/android/app/build.gradle b/packages/cloud_functions/cloud_functions/example/android/app/build.gradle index c731b21805fa..6106180eafdb 100644 --- a/packages/cloud_functions/cloud_functions/example/android/app/build.gradle +++ b/packages/cloud_functions/cloud_functions/example/android/app/build.gradle @@ -7,6 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } +apply from: file("../../../../../../gradle/global-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") @@ -32,8 +33,12 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = project.ext.javaVersion + targetCompatibility = project.ext.javaVersion + } + + kotlinOptions { + jvmTarget = "17" } defaultConfig { diff --git a/packages/cloud_functions/cloud_functions/example/android/settings.gradle b/packages/cloud_functions/cloud_functions/example/android/settings.gradle index 40cbd22bb13b..5f5242c6fd2f 100644 --- a/packages/cloud_functions/cloud_functions/example/android/settings.gradle +++ b/packages/cloud_functions/cloud_functions/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version "8.2.1" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/packages/firebase_analytics/firebase_analytics/android/build.gradle b/packages/firebase_analytics/firebase_analytics/android/build.gradle index cec9a11fa95e..b8bf59f320fc 100755 --- a/packages/firebase_analytics/firebase_analytics/android/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/android/build.gradle @@ -1,5 +1,6 @@ group 'io.flutter.plugins.firebase.analytics' version '1.0-SNAPSHOT' +apply from: rootProject.file('gradle/global-config.gradle') buildscript { repositories { @@ -8,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.1.4' + classpath 'com.android.tools.build:gradle:8.2.1' } } @@ -20,6 +21,7 @@ rootProject.allprojects { } apply plugin: 'com.android.library' +apply from: file("../../../../gradle/global-config.gradle") def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { @@ -40,16 +42,16 @@ android { namespace 'io.flutter.plugins.firebase.analytics' } - compileSdk 35 + compileSdkVersion project.ext.compileSdk defaultConfig { - minSdk 21 + minSdkVersion project.ext.minSdk testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility project.ext.javaVersion + targetCompatibility project.ext.javaVersion } buildFeatures { diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle b/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle index 0f4ded4a249f..e43fc0cfd57b 100644 --- a/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle @@ -7,6 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } +apply from: file("../../../../../../gradle/global-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") @@ -32,8 +33,12 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = project.ext.javaVersion + targetCompatibility = project.ext.javaVersion + } + + kotlinOptions { + jvmTarget = "17" } defaultConfig { diff --git a/packages/firebase_analytics/firebase_analytics/example/android/settings.gradle b/packages/firebase_analytics/firebase_analytics/example/android/settings.gradle index 40cbd22bb13b..5f5242c6fd2f 100644 --- a/packages/firebase_analytics/firebase_analytics/example/android/settings.gradle +++ b/packages/firebase_analytics/firebase_analytics/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version "8.2.1" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration 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 01f3ad92061e..077228f71b11 100644 --- a/packages/firebase_app_check/firebase_app_check/android/build.gradle +++ b/packages/firebase_app_check/firebase_app_check/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' + classpath 'com.android.tools.build:gradle:8.2.1' } } @@ -20,6 +20,7 @@ rootProject.allprojects { } apply plugin: 'com.android.library' +apply from: file("../../../../gradle/global-config.gradle") def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { @@ -40,16 +41,16 @@ android { namespace 'io.flutter.plugins.firebase.appcheck' } - compileSdk 35 + compileSdkVersion project.ext.compileSdk defaultConfig { - minSdk 21 + minSdkVersion project.ext.minSdk testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility project.ext.javaVersion + targetCompatibility project.ext.javaVersion } buildFeatures { diff --git a/packages/firebase_app_check/firebase_app_check/example/android/app/build.gradle b/packages/firebase_app_check/firebase_app_check/example/android/app/build.gradle index 684e3b6d72bb..6f1fb3238edc 100644 --- a/packages/firebase_app_check/firebase_app_check/example/android/app/build.gradle +++ b/packages/firebase_app_check/firebase_app_check/example/android/app/build.gradle @@ -7,6 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } +apply from: file("../../../../../../gradle/global-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") @@ -32,8 +33,12 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = project.ext.javaVersion + targetCompatibility = project.ext.javaVersion + } + + kotlinOptions { + jvmTarget = "17" } defaultConfig { diff --git a/packages/firebase_app_check/firebase_app_check/example/android/settings.gradle b/packages/firebase_app_check/firebase_app_check/example/android/settings.gradle index 40cbd22bb13b..5f5242c6fd2f 100644 --- a/packages/firebase_app_check/firebase_app_check/example/android/settings.gradle +++ b/packages/firebase_app_check/firebase_app_check/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version "8.2.1" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle index 20b145376854..4f19e4c89d39 100644 --- a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' + classpath 'com.android.tools.build:gradle:8.2.1' } } @@ -20,8 +20,8 @@ rootProject.allprojects { } apply plugin: 'com.android.library' +apply from: file("../../../../gradle/global-config.gradle") -def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { throw new GradleException('Could not find the firebase_core FlutterFire plugin, have you added it as a dependency in your pubspec?') } else if (!firebaseCoreProject.properties['FirebaseSDKVersion']) { @@ -40,15 +40,16 @@ android { namespace 'io.flutter.plugins.firebase.installations.firebase_app_installations' } - compileSdk 35 + compileSdkVersion project.ext.compileSdk defaultConfig { - minSdk 21 + minSdkVersion project.ext.minSdk + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility project.ext.javaVersion + targetCompatibility project.ext.javaVersion } buildFeatures { diff --git a/packages/firebase_app_installations/firebase_app_installations/example/android/app/build.gradle b/packages/firebase_app_installations/firebase_app_installations/example/android/app/build.gradle index 1b9bb1a8e8c4..619f14d48a4b 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/android/app/build.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/example/android/app/build.gradle @@ -7,6 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } +apply from: file("../../../../../../gradle/global-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") @@ -32,8 +33,12 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = project.ext.javaVersion + targetCompatibility = project.ext.javaVersion + } + + kotlinOptions { + jvmTarget = "17" } defaultConfig { diff --git a/packages/firebase_app_installations/firebase_app_installations/example/android/settings.gradle b/packages/firebase_app_installations/firebase_app_installations/example/android/settings.gradle index 40cbd22bb13b..5f5242c6fd2f 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/android/settings.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version "8.2.1" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/packages/firebase_auth/firebase_auth/android/build.gradle b/packages/firebase_auth/firebase_auth/android/build.gradle index a6abd8a18c3a..8ec6bcc54174 100755 --- a/packages/firebase_auth/firebase_auth/android/build.gradle +++ b/packages/firebase_auth/firebase_auth/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' + classpath 'com.android.tools.build:gradle:8.2.1' } } @@ -33,6 +33,7 @@ def getRootProjectExtOrCoreProperty(name, firebaseCoreProject) { } apply plugin: 'com.android.library' +apply from: file("../../../../gradle/global-config.gradle") android { // Conditional for compatibility with AGP <4.2. @@ -40,15 +41,16 @@ android { namespace 'io.flutter.plugins.firebase.auth' } - compileSdk 35 + compileSdkVersion project.ext.compileSdk defaultConfig { - minSdk 23 + minSdkVersion project.ext.minSdk testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility project.ext.javaVersion + targetCompatibility project.ext.javaVersion } buildFeatures { diff --git a/packages/firebase_auth/firebase_auth/example/android/app/build.gradle b/packages/firebase_auth/firebase_auth/example/android/app/build.gradle index 9103f89547dc..a1e794830740 100644 --- a/packages/firebase_auth/firebase_auth/example/android/app/build.gradle +++ b/packages/firebase_auth/firebase_auth/example/android/app/build.gradle @@ -7,6 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } +apply from: file("../../../../../../gradle/global-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") @@ -30,12 +31,14 @@ android { namespace = "io.flutter.plugins.firebase.auth.example" compileSdk = flutter.compileSdkVersion ndkVersion = flutter.ndkVersion + compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = project.ext.javaVersion + targetCompatibility = project.ext.javaVersion } + kotlinOptions { - jvmTarget = JavaVersion.VERSION_17 + jvmTarget = project.ext.javaVersion } defaultConfig { diff --git a/packages/firebase_core/firebase_core/android/build.gradle b/packages/firebase_core/firebase_core/android/build.gradle index 6f9775b69f7a..0aff2b0ee6d6 100644 --- a/packages/firebase_core/firebase_core/android/build.gradle +++ b/packages/firebase_core/firebase_core/android/build.gradle @@ -8,11 +8,13 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' + classpath 'com.android.tools.build:gradle:8.2.1' } } apply plugin: 'com.android.library' +apply from: file("../../../../gradle/global-config.gradle") + def getRootProjectExtOrDefaultProperty(name) { if (!rootProject.ext.has("FlutterFire")) return project.properties[name] @@ -26,16 +28,17 @@ android { namespace 'io.flutter.plugins.firebase.core' } - compileSdk 35 + compileSdk project.ext.compileSdk defaultConfig { - minSdk 21 + minSdkVersion project.ext.minSdk + targetSdkVersion project.ext.targetSdk testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility project.ext.javaVersion + targetCompatibility project.ext.javaVersion } buildFeatures { diff --git a/packages/firebase_core/firebase_core/example/android/app/build.gradle b/packages/firebase_core/firebase_core/example/android/app/build.gradle index fed55ad43d2a..330ebf07b857 100644 --- a/packages/firebase_core/firebase_core/example/android/app/build.gradle +++ b/packages/firebase_core/firebase_core/example/android/app/build.gradle @@ -7,6 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } +apply from: file("../../../../../../gradle/global-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") @@ -32,8 +33,12 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = project.ext.javaVersion + targetCompatibility = project.ext.javaVersion + } + + kotlinOptions { + jvmTarget = "17" } defaultConfig { diff --git a/packages/firebase_core/firebase_core/example/android/settings.gradle b/packages/firebase_core/firebase_core/example/android/settings.gradle index 40cbd22bb13b..5f5242c6fd2f 100644 --- a/packages/firebase_core/firebase_core/example/android/settings.gradle +++ b/packages/firebase_core/firebase_core/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version "8.2.1" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle b/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle index 71f56c75d5ac..c610377ee22d 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' + classpath 'com.android.tools.build:gradle:8.2.1' } } @@ -20,6 +20,8 @@ rootProject.allprojects { } apply plugin: 'com.android.library' +apply from: file("../../../../gradle/global-config.gradle") + def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { throw new GradleException('Could not find the firebase_core FlutterFire plugin, have you added it as a dependency in your pubspec?') @@ -39,16 +41,16 @@ android { namespace 'io.flutter.plugins.firebase.crashlytics' } - compileSdk 35 + compileSdkVersion project.ext.compileSdk defaultConfig { - minSdk 21 + minSdkVersion project.ext.minSdk testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility project.ext.javaVersion + targetCompatibility project.ext.javaVersion } buildFeatures { diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle b/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle index af82ea6d4ada..69a487ce30a2 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle @@ -8,6 +8,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } +apply from: file("../../../../../../gradle/global-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") @@ -33,8 +34,12 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = project.ext.javaVersion + targetCompatibility = project.ext.javaVersion + } + + kotlinOptions { + jvmTarget = "17" } defaultConfig { diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/android/settings.gradle b/packages/firebase_crashlytics/firebase_crashlytics/example/android/settings.gradle index a1b1cb2596e7..2d52e1ec2cbf 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/android/settings.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.1.0" apply false + id "com.android.application" version "8.2.1" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false id "com.google.firebase.crashlytics" version "2.8.1" apply false diff --git a/packages/firebase_data_connect/firebase_data_connect/example/android/app/build.gradle b/packages/firebase_data_connect/firebase_data_connect/example/android/app/build.gradle index 1e2e2b673008..b816734f092b 100644 --- a/packages/firebase_data_connect/firebase_data_connect/example/android/app/build.gradle +++ b/packages/firebase_data_connect/firebase_data_connect/example/android/app/build.gradle @@ -4,6 +4,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } +apply from: file("../../../../../../gradle/global-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") @@ -29,8 +30,12 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = project.ext.javaVersion + targetCompatibility = project.ext.javaVersion + } + + kotlinOptions { + jvmTarget = "17" } defaultConfig { diff --git a/packages/firebase_data_connect/firebase_data_connect/example/android/settings.gradle b/packages/firebase_data_connect/firebase_data_connect/example/android/settings.gradle index 6146e13bcc44..e62a70a6c811 100644 --- a/packages/firebase_data_connect/firebase_data_connect/example/android/settings.gradle +++ b/packages/firebase_data_connect/firebase_data_connect/example/android/settings.gradle @@ -19,7 +19,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.1.0" apply false + id "com.android.application" version "8.2.1" apply false id "org.jetbrains.kotlin.android" version "1.9.22" apply false } diff --git a/packages/firebase_database/firebase_database/android/build.gradle b/packages/firebase_database/firebase_database/android/build.gradle index f24038466b3f..8c1f90053a18 100755 --- a/packages/firebase_database/firebase_database/android/build.gradle +++ b/packages/firebase_database/firebase_database/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' + classpath 'com.android.tools.build:gradle:8.2.1' } } @@ -20,6 +20,7 @@ rootProject.allprojects { } apply plugin: 'com.android.library' +apply from: file("../../../../gradle/global-config.gradle") def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { @@ -40,16 +41,16 @@ android { namespace 'io.flutter.plugins.firebase.database' } - compileSdk 35 + compileSdkVersion project.ext.compileSdk defaultConfig { - minSdk 21 + minSdkVersion project.ext.minSdk testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility project.ext.javaVersion + targetCompatibility project.ext.javaVersion } buildFeatures { diff --git a/packages/firebase_database/firebase_database/example/android/app/build.gradle b/packages/firebase_database/firebase_database/example/android/app/build.gradle index f58f58e5d8e3..ca3aceef7abf 100644 --- a/packages/firebase_database/firebase_database/example/android/app/build.gradle +++ b/packages/firebase_database/firebase_database/example/android/app/build.gradle @@ -7,6 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } +apply from: file("../../../../../../gradle/global-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") @@ -32,8 +33,12 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = project.ext.javaVersion + targetCompatibility = project.ext.javaVersion + } + + kotlinOptions { + jvmTarget = "17" } defaultConfig { diff --git a/packages/firebase_database/firebase_database/example/android/settings.gradle b/packages/firebase_database/firebase_database/example/android/settings.gradle index 40cbd22bb13b..5f5242c6fd2f 100644 --- a/packages/firebase_database/firebase_database/example/android/settings.gradle +++ b/packages/firebase_database/firebase_database/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version "8.2.1" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle index 305f207a726f..1d8de7dff376 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' + classpath 'com.android.tools.build:gradle:8.2.1' } } @@ -20,6 +20,7 @@ rootProject.allprojects { } apply plugin: 'com.android.library' +apply from: file("../../../../gradle/global-config.gradle") def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { @@ -40,16 +41,16 @@ android { namespace 'io.flutter.plugins.firebase.dynamiclinks' } - compileSdk 35 + compileSdkVersion project.ext.compileSdk defaultConfig { - minSdk 21 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + minSdkVersion project.ext.minSdk + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility project.ext.javaVersion + targetCompatibility project.ext.javaVersion } buildFeatures { diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle index 9b5983cf9f9a..149b25709050 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle @@ -7,6 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } +apply from: file("../../../../../../gradle/global-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") @@ -32,8 +33,12 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = project.ext.javaVersion + targetCompatibility = project.ext.javaVersion + } + + kotlinOptions { + jvmTarget = "17" } defaultConfig { diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/settings.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/settings.gradle index 40cbd22bb13b..5f5242c6fd2f 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/settings.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version "8.2.1" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle index c9de2381db8b..f0b800f41dea 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' + classpath 'com.android.tools.build:gradle:8.2.1' } } @@ -20,6 +20,7 @@ rootProject.allprojects { } apply plugin: 'com.android.library' +apply from: file("../../../../gradle/global-config.gradle") def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { @@ -40,16 +41,16 @@ android { namespace 'io.flutter.plugins.firebase.inappmessaging' } - compileSdk 35 + compileSdkVersion project.ext.compileSdk defaultConfig { - minSdk 21 + minSdkVersion project.ext.minSdk testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility project.ext.javaVersion + targetCompatibility project.ext.javaVersion } buildFeatures { diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle index 401f578edc37..236a152142a4 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle @@ -7,6 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } +apply from: file("../../../../../../gradle/global-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") @@ -32,8 +33,12 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = project.ext.javaVersion + targetCompatibility = project.ext.javaVersion + } + + kotlinOptions { + jvmTarget = "17" } defaultConfig { diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/settings.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/settings.gradle index 40cbd22bb13b..5f5242c6fd2f 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/settings.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version "8.2.1" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/packages/firebase_messaging/firebase_messaging/android/build.gradle b/packages/firebase_messaging/firebase_messaging/android/build.gradle index f93b9ef3f0f9..6ea8253017f0 100644 --- a/packages/firebase_messaging/firebase_messaging/android/build.gradle +++ b/packages/firebase_messaging/firebase_messaging/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' + classpath 'com.android.tools.build:gradle:8.2.1' } } @@ -20,6 +20,8 @@ rootProject.allprojects { } apply plugin: 'com.android.library' +apply from: file("../../../../gradle/global-config.gradle") + def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { @@ -40,16 +42,16 @@ android { namespace 'io.flutter.plugins.firebase.messaging' } - compileSdk 35 + compileSdkVersion project.ext.compileSdk defaultConfig { - minSdk 21 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + minSdkVersion project.ext.minSdk + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility project.ext.javaVersion + targetCompatibility project.ext.javaVersion } buildFeatures { diff --git a/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle b/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle index f2684a27ec57..914fddc55361 100644 --- a/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle +++ b/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle @@ -7,6 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } +apply from: file("../../../../../../gradle/global-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") @@ -32,8 +33,14 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = javaVersion + targetCompatibility = javaVersion + // Require for flutter_notifications to work on sdk 21+ after AGP upgrade. + coreLibraryDesugaringEnabled true + } + + kotlinOptions { + jvmTarget = "17" } defaultConfig { @@ -55,6 +62,10 @@ android { } } +dependencies { + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4' +} + flutter { source = "../.." } diff --git a/packages/firebase_messaging/firebase_messaging/example/android/settings.gradle b/packages/firebase_messaging/firebase_messaging/example/android/settings.gradle index f1a7cdf2514b..5f5242c6fd2f 100644 --- a/packages/firebase_messaging/firebase_messaging/example/android/settings.gradle +++ b/packages/firebase_messaging/firebase_messaging/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.1.0" apply false + id "com.android.application" version "8.2.1" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle index c3210371a6f2..b9ad24c066b9 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' + classpath 'com.android.tools.build:gradle:8.2.1' } } @@ -33,6 +33,7 @@ def getRootProjectExtOrCoreProperty(name, firebaseCoreProject) { } apply plugin: 'com.android.library' +apply from: file("../../../../gradle/global-config.gradle") android { // Conditional for compatibility with AGP <4.2. @@ -40,16 +41,16 @@ android { namespace 'io.flutter.plugins.firebase.firebase_ml_model_downloader' } - compileSdk 35 + compileSdkVersion project.ext.compileSdk defaultConfig { - minSdk 21 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + minSdkVersion project.ext.minSdk + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility project.ext.javaVersion + targetCompatibility project.ext.javaVersion } buildFeatures { diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle index 401f578edc37..236a152142a4 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle @@ -7,6 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } +apply from: file("../../../../../../gradle/global-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") @@ -32,8 +33,12 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = project.ext.javaVersion + targetCompatibility = project.ext.javaVersion + } + + kotlinOptions { + jvmTarget = "17" } defaultConfig { diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/settings.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/settings.gradle index 40cbd22bb13b..5f5242c6fd2f 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/settings.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version "8.2.1" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/packages/firebase_performance/firebase_performance/android/build.gradle b/packages/firebase_performance/firebase_performance/android/build.gradle index d3323b7ef988..658e4c213f71 100644 --- a/packages/firebase_performance/firebase_performance/android/build.gradle +++ b/packages/firebase_performance/firebase_performance/android/build.gradle @@ -1,5 +1,6 @@ group 'io.flutter.plugins.firebaseperformance' version '1.0-SNAPSHOT' +apply from: rootProject.file('gradle/global-config.gradle') buildscript { repositories { @@ -8,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' + classpath 'com.android.tools.build:gradle:8.2.1' } } @@ -20,6 +21,7 @@ rootProject.allprojects { } apply plugin: 'com.android.library' +apply from: file("../../../../gradle/global-config.gradle") def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { @@ -40,16 +42,16 @@ android { namespace 'io.flutter.plugins.firebase.performance' } - compileSdk 35 + compileSdkVersion project.ext.compileSdk defaultConfig { - minSdk 21 + minSdkVersion project.ext.minSdk testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility project.ext.javaVersion + targetCompatibility project.ext.javaVersion } buildFeatures { diff --git a/packages/firebase_performance/firebase_performance/example/android/app/build.gradle b/packages/firebase_performance/firebase_performance/example/android/app/build.gradle index 228d0bc23eda..5e58d8d6073b 100644 --- a/packages/firebase_performance/firebase_performance/example/android/app/build.gradle +++ b/packages/firebase_performance/firebase_performance/example/android/app/build.gradle @@ -8,6 +8,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } +apply from: file("../../../../../../gradle/global-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") @@ -33,8 +34,12 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = project.ext.javaVersion + targetCompatibility = project.ext.javaVersion + } + + kotlinOptions { + jvmTarget = "17" } defaultConfig { diff --git a/packages/firebase_performance/firebase_performance/example/android/settings.gradle b/packages/firebase_performance/firebase_performance/example/android/settings.gradle index f5479e6b412f..7ba559abde51 100644 --- a/packages/firebase_performance/firebase_performance/example/android/settings.gradle +++ b/packages/firebase_performance/firebase_performance/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version "8.2.1" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false id "com.google.firebase.firebase-perf" version "1.4.1" apply false 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 58952364c46d..a4127a252260 100644 --- a/packages/firebase_remote_config/firebase_remote_config/android/build.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' + classpath 'com.android.tools.build:gradle:8.2.1' } } @@ -20,6 +20,7 @@ rootProject.allprojects { } apply plugin: 'com.android.library' +apply from: file("../../../../gradle/global-config.gradle") def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { @@ -40,16 +41,16 @@ android { namespace 'io.flutter.plugins.firebase.firebaseremoteconfig' } - compileSdk 35 + compileSdkVersion project.ext.compileSdk defaultConfig { - minSdk 21 + minSdkVersion project.ext.minSdk testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility project.ext.javaVersion + targetCompatibility project.ext.javaVersion } buildFeatures { diff --git a/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle b/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle index 20aeafddf497..c4b532f4956f 100644 --- a/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle @@ -7,6 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } +apply from: file("../../../../../../gradle/global-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") @@ -32,8 +33,12 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = project.ext.javaVersion + targetCompatibility = project.ext.javaVersion + } + + kotlinOptions { + jvmTarget = "17" } defaultConfig { diff --git a/packages/firebase_remote_config/firebase_remote_config/example/android/settings.gradle b/packages/firebase_remote_config/firebase_remote_config/example/android/settings.gradle index f1a7cdf2514b..5f5242c6fd2f 100644 --- a/packages/firebase_remote_config/firebase_remote_config/example/android/settings.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.1.0" apply false + id "com.android.application" version "8.2.1" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/packages/firebase_storage/firebase_storage/android/build.gradle b/packages/firebase_storage/firebase_storage/android/build.gradle index 629d0f3a60eb..085ef49e9b0c 100755 --- a/packages/firebase_storage/firebase_storage/android/build.gradle +++ b/packages/firebase_storage/firebase_storage/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' + classpath 'com.android.tools.build:gradle:8.2.1' } } @@ -28,6 +28,7 @@ allprojects { } apply plugin: 'com.android.library' +apply from: file("../../../../gradle/global-config.gradle") def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { @@ -48,16 +49,16 @@ android { namespace 'io.flutter.plugins.firebase.storage' } - compileSdk 35 + compileSdkVersion project.ext.compileSdk defaultConfig { - minSdk 21 + minSdkVersion project.ext.minSdk testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility project.ext.javaVersion + targetCompatibility project.ext.javaVersion } buildFeatures { diff --git a/packages/firebase_storage/firebase_storage/example/android/app/build.gradle b/packages/firebase_storage/firebase_storage/example/android/app/build.gradle index 6ba7545f3ca7..a2ccd5809f51 100644 --- a/packages/firebase_storage/firebase_storage/example/android/app/build.gradle +++ b/packages/firebase_storage/firebase_storage/example/android/app/build.gradle @@ -7,6 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } +apply from: file("../../../../../../gradle/global-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") @@ -32,8 +33,12 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = project.ext.javaVersion + targetCompatibility = project.ext.javaVersion + } + + kotlinOptions { + jvmTarget = "17" } defaultConfig { diff --git a/packages/firebase_storage/firebase_storage/example/android/settings.gradle b/packages/firebase_storage/firebase_storage/example/android/settings.gradle index 40cbd22bb13b..5f5242c6fd2f 100644 --- a/packages/firebase_storage/firebase_storage/example/android/settings.gradle +++ b/packages/firebase_storage/firebase_storage/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version "8.2.1" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/packages/firebase_vertexai/firebase_vertexai/example/android/build.gradle b/packages/firebase_vertexai/firebase_vertexai/example/android/build.gradle index 97c6de922a3d..b671be4e0785 100644 --- a/packages/firebase_vertexai/firebase_vertexai/example/android/build.gradle +++ b/packages/firebase_vertexai/firebase_vertexai/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' + classpath 'com.android.tools.build:gradle:8.2.1' // START: FlutterFire Configuration classpath 'com.google.gms:google-services:4.4.0' // END: FlutterFire Configuration diff --git a/packages/firebase_vertexai/firebase_vertexai/example/android/settings.gradle b/packages/firebase_vertexai/firebase_vertexai/example/android/settings.gradle index 985a6e2ea6af..0d758db89291 100644 --- a/packages/firebase_vertexai/firebase_vertexai/example/android/settings.gradle +++ b/packages/firebase_vertexai/firebase_vertexai/example/android/settings.gradle @@ -19,7 +19,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version "8.2.1" apply false id "org.jetbrains.kotlin.android" version "1.9.22" apply false } diff --git a/tests/android/app/build.gradle b/tests/android/app/build.gradle index 3af574d0809e..03c62d90fea5 100644 --- a/tests/android/app/build.gradle +++ b/tests/android/app/build.gradle @@ -4,6 +4,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } +apply from: file("../../../gradle/global-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") @@ -25,16 +26,17 @@ if (flutterVersionName == null) { android { namespace = "io.flutter.plugins.firebase.tests" - compileSdk = 35 + compileSdk = targetSdk ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = project.ext.javaVersion + targetCompatibility = project.ext.javaVersion + coreLibraryDesugaringEnabled true } kotlinOptions { - jvmTarget = JavaVersion.VERSION_17 + jvmTarget = project.ext.javaVersion } defaultConfig { diff --git a/tests/android/settings.gradle b/tests/android/settings.gradle index 7b836b1ec42e..b6863b1961bf 100644 --- a/tests/android/settings.gradle +++ b/tests/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.1.0" apply false + id "com.android.application" version "8.2.1" apply false id "org.jetbrains.kotlin.android" version "1.9.22" apply false } From 85b93a60229a993a23f28c5b9edf9ce21f21a58d Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Thu, 10 Apr 2025 16:55:39 +0100 Subject: [PATCH 02/29] chore(deps): bump gradle wrapper gradle version --- tests/android/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/android/gradle/wrapper/gradle-wrapper.properties b/tests/android/gradle/wrapper/gradle-wrapper.properties index 8bc9958ab0cf..b5fc5a7b8fee 100644 --- a/tests/android/gradle/wrapper/gradle-wrapper.properties +++ b/tests/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip From 025ce207e415ec0f20ffaabec7b57b94140d8398 Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Fri, 11 Apr 2025 12:33:53 +0100 Subject: [PATCH 03/29] fix(deps): get analytics --- .../firebase_analytics/firebase_analytics/android/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/firebase_analytics/firebase_analytics/android/build.gradle b/packages/firebase_analytics/firebase_analytics/android/build.gradle index b8bf59f320fc..73b96412dd42 100755 --- a/packages/firebase_analytics/firebase_analytics/android/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/android/build.gradle @@ -1,6 +1,5 @@ group 'io.flutter.plugins.firebase.analytics' version '1.0-SNAPSHOT' -apply from: rootProject.file('gradle/global-config.gradle') buildscript { repositories { From 161dc4167260d0136a2ea9f3f9db2bbe264d6e0c Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Fri, 11 Apr 2025 12:34:47 +0100 Subject: [PATCH 04/29] fix(deps): Fix performance --- .../firebase_performance/android/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/firebase_performance/firebase_performance/android/build.gradle b/packages/firebase_performance/firebase_performance/android/build.gradle index 658e4c213f71..0a8deba82ab8 100644 --- a/packages/firebase_performance/firebase_performance/android/build.gradle +++ b/packages/firebase_performance/firebase_performance/android/build.gradle @@ -1,6 +1,5 @@ group 'io.flutter.plugins.firebaseperformance' version '1.0-SNAPSHOT' -apply from: rootProject.file('gradle/global-config.gradle') buildscript { repositories { From 27a600aa21ab525b49f6b17fac3e3e7555b71bb2 Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Fri, 11 Apr 2025 12:53:44 +0100 Subject: [PATCH 05/29] fix(deps): expose firebaseCoreProject --- .../firebase_app_installations/android/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle index 4f19e4c89d39..02fb675cad86 100644 --- a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle @@ -22,6 +22,7 @@ rootProject.allprojects { apply plugin: 'com.android.library' apply from: file("../../../../gradle/global-config.gradle") +def firebaseCoreProject = rootProject.subprojects.find { it.name == "firebase_core" } if (firebaseCoreProject == null) { throw new GradleException('Could not find the firebase_core FlutterFire plugin, have you added it as a dependency in your pubspec?') } else if (!firebaseCoreProject.properties['FirebaseSDKVersion']) { From 6d0660a9a7726faf02174a1b792cc5997c6caa30 Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Fri, 11 Apr 2025 13:06:18 +0100 Subject: [PATCH 06/29] fix(deps): ensure desugaring enabled --- tests/android/app/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/android/app/build.gradle b/tests/android/app/build.gradle index 03c62d90fea5..ae9d4d44088a 100644 --- a/tests/android/app/build.gradle +++ b/tests/android/app/build.gradle @@ -60,3 +60,7 @@ android { flutter { source = "../.." } + +dependencies { + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4' +} From 7c2f8341946b30b7750892da8d3213af1b9dc771 Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Fri, 11 Apr 2025 16:00:24 +0100 Subject: [PATCH 07/29] fix(deps): create local configs for each package --- .../cloud_firestore/android/build.gradle | 2 +- .../android/generated_android_versions.txt | 4 ++++ .../android/local-config.gradle | 19 ++++++++++++++++++ .../cloud_functions/android/build.gradle | 2 +- .../android/generated_android_versions.txt | 4 ++++ .../android/local-config.gradle | 19 ++++++++++++++++++ .../firebase_analytics/android/build.gradle | 2 +- .../android/generated_android_versions.txt | 4 ++++ .../android/local-config.gradle | 19 ++++++++++++++++++ .../firebase_app_check/android/build.gradle | 2 +- .../android/generated_android_versions.txt | 4 ++++ .../android/local-config.gradle | 19 ++++++++++++++++++ .../android/build.gradle | 2 +- .../android/generated_android_versions.txt | 4 ++++ .../android/local-config.gradle | 19 ++++++++++++++++++ .../firebase_auth/android/build.gradle | 2 +- .../android/generated_android_versions.txt | 4 ++++ .../firebase_auth/android/local-config.gradle | 19 ++++++++++++++++++ .../firebase_core/android/build.gradle | 2 +- .../android/generated_android_versions.txt | 4 ++++ .../firebase_core/android/local-config.gradle | 19 ++++++++++++++++++ .../firebase_crashlytics/android/build.gradle | 2 +- .../android/generated_android_versions.txt | 4 ++++ .../android/local-config.gradle | 19 ++++++++++++++++++ .../firebase_database/android/build.gradle | 2 +- .../android/generated_android_versions.txt | 4 ++++ .../android/local-config.gradle | 19 ++++++++++++++++++ .../android/build.gradle | 2 +- .../android/generated_android_versions.txt | 4 ++++ .../android/local-config.gradle | 19 ++++++++++++++++++ .../android/build.gradle | 2 +- .../android/generated_android_versions.txt | 4 ++++ .../android/local-config.gradle | 19 ++++++++++++++++++ .../firebase_messaging/android/build.gradle | 2 +- .../android/generated_android_versions.txt | 4 ++++ .../android/local-config.gradle | 20 +++++++++++++++++++ .../xcshareddata/xcschemes/Runner.xcscheme | 1 + .../android/build.gradle | 2 +- .../android/generated_android_versions.txt | 4 ++++ .../android/local-config.gradle | 19 ++++++++++++++++++ .../firebase_performance/android/build.gradle | 2 +- .../android/generated_android_versions.txt | 4 ++++ .../android/local-config.gradle | 19 ++++++++++++++++++ .../android/build.gradle | 2 +- .../android/generated_android_versions.txt | 4 ++++ .../android/local-config.gradle | 19 ++++++++++++++++++ .../firebase_storage/android/build.gradle | 2 +- .../android/generated_android_versions.txt | 4 ++++ .../android/local-config.gradle | 19 ++++++++++++++++++ 49 files changed, 386 insertions(+), 16 deletions(-) create mode 100644 packages/cloud_firestore/cloud_firestore/android/generated_android_versions.txt create mode 100644 packages/cloud_firestore/cloud_firestore/android/local-config.gradle create mode 100644 packages/cloud_functions/cloud_functions/android/generated_android_versions.txt create mode 100644 packages/cloud_functions/cloud_functions/android/local-config.gradle create mode 100644 packages/firebase_analytics/firebase_analytics/android/generated_android_versions.txt create mode 100644 packages/firebase_analytics/firebase_analytics/android/local-config.gradle create mode 100644 packages/firebase_app_check/firebase_app_check/android/generated_android_versions.txt create mode 100644 packages/firebase_app_check/firebase_app_check/android/local-config.gradle create mode 100644 packages/firebase_app_installations/firebase_app_installations/android/generated_android_versions.txt create mode 100644 packages/firebase_app_installations/firebase_app_installations/android/local-config.gradle create mode 100644 packages/firebase_auth/firebase_auth/android/generated_android_versions.txt create mode 100644 packages/firebase_auth/firebase_auth/android/local-config.gradle create mode 100644 packages/firebase_core/firebase_core/android/generated_android_versions.txt create mode 100644 packages/firebase_core/firebase_core/android/local-config.gradle create mode 100644 packages/firebase_crashlytics/firebase_crashlytics/android/generated_android_versions.txt create mode 100644 packages/firebase_crashlytics/firebase_crashlytics/android/local-config.gradle create mode 100644 packages/firebase_database/firebase_database/android/generated_android_versions.txt create mode 100644 packages/firebase_database/firebase_database/android/local-config.gradle create mode 100644 packages/firebase_dynamic_links/firebase_dynamic_links/android/generated_android_versions.txt create mode 100644 packages/firebase_dynamic_links/firebase_dynamic_links/android/local-config.gradle create mode 100644 packages/firebase_in_app_messaging/firebase_in_app_messaging/android/generated_android_versions.txt create mode 100644 packages/firebase_in_app_messaging/firebase_in_app_messaging/android/local-config.gradle create mode 100644 packages/firebase_messaging/firebase_messaging/android/generated_android_versions.txt create mode 100644 packages/firebase_messaging/firebase_messaging/android/local-config.gradle create mode 100644 packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/generated_android_versions.txt create mode 100644 packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/local-config.gradle create mode 100644 packages/firebase_performance/firebase_performance/android/generated_android_versions.txt create mode 100644 packages/firebase_performance/firebase_performance/android/local-config.gradle create mode 100644 packages/firebase_remote_config/firebase_remote_config/android/generated_android_versions.txt create mode 100644 packages/firebase_remote_config/firebase_remote_config/android/local-config.gradle create mode 100644 packages/firebase_storage/firebase_storage/android/generated_android_versions.txt create mode 100644 packages/firebase_storage/firebase_storage/android/local-config.gradle diff --git a/packages/cloud_firestore/cloud_firestore/android/build.gradle b/packages/cloud_firestore/cloud_firestore/android/build.gradle index ee29d31aec14..5014ba33f023 100755 --- a/packages/cloud_firestore/cloud_firestore/android/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/android/build.gradle @@ -20,7 +20,7 @@ allprojects { } apply plugin: 'com.android.library' -apply from: file("../../../../gradle/global-config.gradle") +apply from: file("local-config.gradle") def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { diff --git a/packages/cloud_firestore/cloud_firestore/android/generated_android_versions.txt b/packages/cloud_firestore/cloud_firestore/android/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/cloud_firestore/cloud_firestore/android/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/cloud_firestore/cloud_firestore/android/local-config.gradle b/packages/cloud_firestore/cloud_firestore/android/local-config.gradle new file mode 100644 index 000000000000..f790702014d7 --- /dev/null +++ b/packages/cloud_firestore/cloud_firestore/android/local-config.gradle @@ -0,0 +1,19 @@ +def versionFile = file("generated_android_versions.txt") +def versionProps = new Properties() + +if (versionFile.exists()) { + versionFile.withInputStream { stream -> + versionProps.load(stream) + } +} else { + throw new GradleException("generated_android_versions.txt not found!") +} + +ext { + compileSdk = versionProps['compileSdk'] as Integer + minSdk = versionProps['minSdk'] as Integer + targetSdk = versionProps['targetSdk'] as Integer + + def javaVerNum = versionProps['javaVersion'] as Integer + javaVersion = JavaVersion.toVersion(javaVerNum) +} diff --git a/packages/cloud_functions/cloud_functions/android/build.gradle b/packages/cloud_functions/cloud_functions/android/build.gradle index 9de27988ff6e..adfcc5aee310 100644 --- a/packages/cloud_functions/cloud_functions/android/build.gradle +++ b/packages/cloud_functions/cloud_functions/android/build.gradle @@ -20,7 +20,7 @@ rootProject.allprojects { } apply plugin: 'com.android.library' -apply from: file("../../../../gradle/global-config.gradle") +apply from: file("local-config.gradle") def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { diff --git a/packages/cloud_functions/cloud_functions/android/generated_android_versions.txt b/packages/cloud_functions/cloud_functions/android/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/cloud_functions/cloud_functions/android/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/cloud_functions/cloud_functions/android/local-config.gradle b/packages/cloud_functions/cloud_functions/android/local-config.gradle new file mode 100644 index 000000000000..f790702014d7 --- /dev/null +++ b/packages/cloud_functions/cloud_functions/android/local-config.gradle @@ -0,0 +1,19 @@ +def versionFile = file("generated_android_versions.txt") +def versionProps = new Properties() + +if (versionFile.exists()) { + versionFile.withInputStream { stream -> + versionProps.load(stream) + } +} else { + throw new GradleException("generated_android_versions.txt not found!") +} + +ext { + compileSdk = versionProps['compileSdk'] as Integer + minSdk = versionProps['minSdk'] as Integer + targetSdk = versionProps['targetSdk'] as Integer + + def javaVerNum = versionProps['javaVersion'] as Integer + javaVersion = JavaVersion.toVersion(javaVerNum) +} diff --git a/packages/firebase_analytics/firebase_analytics/android/build.gradle b/packages/firebase_analytics/firebase_analytics/android/build.gradle index 73b96412dd42..2b2fe853d229 100755 --- a/packages/firebase_analytics/firebase_analytics/android/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/android/build.gradle @@ -20,7 +20,7 @@ rootProject.allprojects { } apply plugin: 'com.android.library' -apply from: file("../../../../gradle/global-config.gradle") +apply from: file("local-config.gradle") def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { diff --git a/packages/firebase_analytics/firebase_analytics/android/generated_android_versions.txt b/packages/firebase_analytics/firebase_analytics/android/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_analytics/firebase_analytics/android/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_analytics/firebase_analytics/android/local-config.gradle b/packages/firebase_analytics/firebase_analytics/android/local-config.gradle new file mode 100644 index 000000000000..f790702014d7 --- /dev/null +++ b/packages/firebase_analytics/firebase_analytics/android/local-config.gradle @@ -0,0 +1,19 @@ +def versionFile = file("generated_android_versions.txt") +def versionProps = new Properties() + +if (versionFile.exists()) { + versionFile.withInputStream { stream -> + versionProps.load(stream) + } +} else { + throw new GradleException("generated_android_versions.txt not found!") +} + +ext { + compileSdk = versionProps['compileSdk'] as Integer + minSdk = versionProps['minSdk'] as Integer + targetSdk = versionProps['targetSdk'] as Integer + + def javaVerNum = versionProps['javaVersion'] as Integer + javaVersion = JavaVersion.toVersion(javaVerNum) +} 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 077228f71b11..c069b42ae5a8 100644 --- a/packages/firebase_app_check/firebase_app_check/android/build.gradle +++ b/packages/firebase_app_check/firebase_app_check/android/build.gradle @@ -20,7 +20,7 @@ rootProject.allprojects { } apply plugin: 'com.android.library' -apply from: file("../../../../gradle/global-config.gradle") +apply from: file("local-config.gradle") def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { diff --git a/packages/firebase_app_check/firebase_app_check/android/generated_android_versions.txt b/packages/firebase_app_check/firebase_app_check/android/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_app_check/firebase_app_check/android/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_app_check/firebase_app_check/android/local-config.gradle b/packages/firebase_app_check/firebase_app_check/android/local-config.gradle new file mode 100644 index 000000000000..f790702014d7 --- /dev/null +++ b/packages/firebase_app_check/firebase_app_check/android/local-config.gradle @@ -0,0 +1,19 @@ +def versionFile = file("generated_android_versions.txt") +def versionProps = new Properties() + +if (versionFile.exists()) { + versionFile.withInputStream { stream -> + versionProps.load(stream) + } +} else { + throw new GradleException("generated_android_versions.txt not found!") +} + +ext { + compileSdk = versionProps['compileSdk'] as Integer + minSdk = versionProps['minSdk'] as Integer + targetSdk = versionProps['targetSdk'] as Integer + + def javaVerNum = versionProps['javaVersion'] as Integer + javaVersion = JavaVersion.toVersion(javaVerNum) +} diff --git a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle index 02fb675cad86..31ce8e99b165 100644 --- a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle @@ -20,7 +20,7 @@ rootProject.allprojects { } apply plugin: 'com.android.library' -apply from: file("../../../../gradle/global-config.gradle") +apply from: file("local-config.gradle") def firebaseCoreProject = rootProject.subprojects.find { it.name == "firebase_core" } if (firebaseCoreProject == null) { diff --git a/packages/firebase_app_installations/firebase_app_installations/android/generated_android_versions.txt b/packages/firebase_app_installations/firebase_app_installations/android/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_app_installations/firebase_app_installations/android/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_app_installations/firebase_app_installations/android/local-config.gradle b/packages/firebase_app_installations/firebase_app_installations/android/local-config.gradle new file mode 100644 index 000000000000..f790702014d7 --- /dev/null +++ b/packages/firebase_app_installations/firebase_app_installations/android/local-config.gradle @@ -0,0 +1,19 @@ +def versionFile = file("generated_android_versions.txt") +def versionProps = new Properties() + +if (versionFile.exists()) { + versionFile.withInputStream { stream -> + versionProps.load(stream) + } +} else { + throw new GradleException("generated_android_versions.txt not found!") +} + +ext { + compileSdk = versionProps['compileSdk'] as Integer + minSdk = versionProps['minSdk'] as Integer + targetSdk = versionProps['targetSdk'] as Integer + + def javaVerNum = versionProps['javaVersion'] as Integer + javaVersion = JavaVersion.toVersion(javaVerNum) +} diff --git a/packages/firebase_auth/firebase_auth/android/build.gradle b/packages/firebase_auth/firebase_auth/android/build.gradle index 8ec6bcc54174..4182a1877d57 100755 --- a/packages/firebase_auth/firebase_auth/android/build.gradle +++ b/packages/firebase_auth/firebase_auth/android/build.gradle @@ -33,7 +33,7 @@ def getRootProjectExtOrCoreProperty(name, firebaseCoreProject) { } apply plugin: 'com.android.library' -apply from: file("../../../../gradle/global-config.gradle") +apply from: file("local-config.gradle") android { // Conditional for compatibility with AGP <4.2. diff --git a/packages/firebase_auth/firebase_auth/android/generated_android_versions.txt b/packages/firebase_auth/firebase_auth/android/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_auth/firebase_auth/android/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_auth/firebase_auth/android/local-config.gradle b/packages/firebase_auth/firebase_auth/android/local-config.gradle new file mode 100644 index 000000000000..f790702014d7 --- /dev/null +++ b/packages/firebase_auth/firebase_auth/android/local-config.gradle @@ -0,0 +1,19 @@ +def versionFile = file("generated_android_versions.txt") +def versionProps = new Properties() + +if (versionFile.exists()) { + versionFile.withInputStream { stream -> + versionProps.load(stream) + } +} else { + throw new GradleException("generated_android_versions.txt not found!") +} + +ext { + compileSdk = versionProps['compileSdk'] as Integer + minSdk = versionProps['minSdk'] as Integer + targetSdk = versionProps['targetSdk'] as Integer + + def javaVerNum = versionProps['javaVersion'] as Integer + javaVersion = JavaVersion.toVersion(javaVerNum) +} diff --git a/packages/firebase_core/firebase_core/android/build.gradle b/packages/firebase_core/firebase_core/android/build.gradle index 0aff2b0ee6d6..7153fdb33e41 100644 --- a/packages/firebase_core/firebase_core/android/build.gradle +++ b/packages/firebase_core/firebase_core/android/build.gradle @@ -13,7 +13,7 @@ buildscript { } apply plugin: 'com.android.library' -apply from: file("../../../../gradle/global-config.gradle") +apply from: file("local-config.gradle") def getRootProjectExtOrDefaultProperty(name) { diff --git a/packages/firebase_core/firebase_core/android/generated_android_versions.txt b/packages/firebase_core/firebase_core/android/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_core/firebase_core/android/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_core/firebase_core/android/local-config.gradle b/packages/firebase_core/firebase_core/android/local-config.gradle new file mode 100644 index 000000000000..f790702014d7 --- /dev/null +++ b/packages/firebase_core/firebase_core/android/local-config.gradle @@ -0,0 +1,19 @@ +def versionFile = file("generated_android_versions.txt") +def versionProps = new Properties() + +if (versionFile.exists()) { + versionFile.withInputStream { stream -> + versionProps.load(stream) + } +} else { + throw new GradleException("generated_android_versions.txt not found!") +} + +ext { + compileSdk = versionProps['compileSdk'] as Integer + minSdk = versionProps['minSdk'] as Integer + targetSdk = versionProps['targetSdk'] as Integer + + def javaVerNum = versionProps['javaVersion'] as Integer + javaVersion = JavaVersion.toVersion(javaVerNum) +} diff --git a/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle b/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle index c610377ee22d..4b0a786198bd 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle @@ -20,7 +20,7 @@ rootProject.allprojects { } apply plugin: 'com.android.library' -apply from: file("../../../../gradle/global-config.gradle") +apply from: file("local-config.gradle") def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { diff --git a/packages/firebase_crashlytics/firebase_crashlytics/android/generated_android_versions.txt b/packages/firebase_crashlytics/firebase_crashlytics/android/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_crashlytics/firebase_crashlytics/android/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_crashlytics/firebase_crashlytics/android/local-config.gradle b/packages/firebase_crashlytics/firebase_crashlytics/android/local-config.gradle new file mode 100644 index 000000000000..f790702014d7 --- /dev/null +++ b/packages/firebase_crashlytics/firebase_crashlytics/android/local-config.gradle @@ -0,0 +1,19 @@ +def versionFile = file("generated_android_versions.txt") +def versionProps = new Properties() + +if (versionFile.exists()) { + versionFile.withInputStream { stream -> + versionProps.load(stream) + } +} else { + throw new GradleException("generated_android_versions.txt not found!") +} + +ext { + compileSdk = versionProps['compileSdk'] as Integer + minSdk = versionProps['minSdk'] as Integer + targetSdk = versionProps['targetSdk'] as Integer + + def javaVerNum = versionProps['javaVersion'] as Integer + javaVersion = JavaVersion.toVersion(javaVerNum) +} diff --git a/packages/firebase_database/firebase_database/android/build.gradle b/packages/firebase_database/firebase_database/android/build.gradle index 8c1f90053a18..33f999a32cca 100755 --- a/packages/firebase_database/firebase_database/android/build.gradle +++ b/packages/firebase_database/firebase_database/android/build.gradle @@ -20,7 +20,7 @@ rootProject.allprojects { } apply plugin: 'com.android.library' -apply from: file("../../../../gradle/global-config.gradle") +apply from: file("local-config.gradle") def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { diff --git a/packages/firebase_database/firebase_database/android/generated_android_versions.txt b/packages/firebase_database/firebase_database/android/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_database/firebase_database/android/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_database/firebase_database/android/local-config.gradle b/packages/firebase_database/firebase_database/android/local-config.gradle new file mode 100644 index 000000000000..f790702014d7 --- /dev/null +++ b/packages/firebase_database/firebase_database/android/local-config.gradle @@ -0,0 +1,19 @@ +def versionFile = file("generated_android_versions.txt") +def versionProps = new Properties() + +if (versionFile.exists()) { + versionFile.withInputStream { stream -> + versionProps.load(stream) + } +} else { + throw new GradleException("generated_android_versions.txt not found!") +} + +ext { + compileSdk = versionProps['compileSdk'] as Integer + minSdk = versionProps['minSdk'] as Integer + targetSdk = versionProps['targetSdk'] as Integer + + def javaVerNum = versionProps['javaVersion'] as Integer + javaVersion = JavaVersion.toVersion(javaVerNum) +} diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle index 1d8de7dff376..c4c6b61a6355 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle @@ -20,7 +20,7 @@ rootProject.allprojects { } apply plugin: 'com.android.library' -apply from: file("../../../../gradle/global-config.gradle") +apply from: file("local-config.gradle") def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/android/generated_android_versions.txt b/packages/firebase_dynamic_links/firebase_dynamic_links/android/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/android/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/android/local-config.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/android/local-config.gradle new file mode 100644 index 000000000000..f790702014d7 --- /dev/null +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/android/local-config.gradle @@ -0,0 +1,19 @@ +def versionFile = file("generated_android_versions.txt") +def versionProps = new Properties() + +if (versionFile.exists()) { + versionFile.withInputStream { stream -> + versionProps.load(stream) + } +} else { + throw new GradleException("generated_android_versions.txt not found!") +} + +ext { + compileSdk = versionProps['compileSdk'] as Integer + minSdk = versionProps['minSdk'] as Integer + targetSdk = versionProps['targetSdk'] as Integer + + def javaVerNum = versionProps['javaVersion'] as Integer + javaVersion = JavaVersion.toVersion(javaVerNum) +} diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle index f0b800f41dea..a39c72ec6b07 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle @@ -20,7 +20,7 @@ rootProject.allprojects { } apply plugin: 'com.android.library' -apply from: file("../../../../gradle/global-config.gradle") +apply from: file("local-config.gradle") def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/generated_android_versions.txt b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/local-config.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/local-config.gradle new file mode 100644 index 000000000000..f790702014d7 --- /dev/null +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/local-config.gradle @@ -0,0 +1,19 @@ +def versionFile = file("generated_android_versions.txt") +def versionProps = new Properties() + +if (versionFile.exists()) { + versionFile.withInputStream { stream -> + versionProps.load(stream) + } +} else { + throw new GradleException("generated_android_versions.txt not found!") +} + +ext { + compileSdk = versionProps['compileSdk'] as Integer + minSdk = versionProps['minSdk'] as Integer + targetSdk = versionProps['targetSdk'] as Integer + + def javaVerNum = versionProps['javaVersion'] as Integer + javaVersion = JavaVersion.toVersion(javaVerNum) +} diff --git a/packages/firebase_messaging/firebase_messaging/android/build.gradle b/packages/firebase_messaging/firebase_messaging/android/build.gradle index 6ea8253017f0..600ee5b5c6d9 100644 --- a/packages/firebase_messaging/firebase_messaging/android/build.gradle +++ b/packages/firebase_messaging/firebase_messaging/android/build.gradle @@ -20,7 +20,7 @@ rootProject.allprojects { } apply plugin: 'com.android.library' -apply from: file("../../../../gradle/global-config.gradle") +apply from: file("local-config.gradle") def firebaseCoreProject = findProject(':firebase_core') diff --git a/packages/firebase_messaging/firebase_messaging/android/generated_android_versions.txt b/packages/firebase_messaging/firebase_messaging/android/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_messaging/firebase_messaging/android/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_messaging/firebase_messaging/android/local-config.gradle b/packages/firebase_messaging/firebase_messaging/android/local-config.gradle new file mode 100644 index 000000000000..48f15b66cb43 --- /dev/null +++ b/packages/firebase_messaging/firebase_messaging/android/local-config.gradle @@ -0,0 +1,20 @@ +def versionFile = file("generated_android_versions.txt") +def versionProps = new Properties() + +if (versionFile.exists()) { + versionFile.withInputStream { stream -> + versionProps.load(stream) + } +} else { + throw new GradleException("generated_android_versions.txt not found!") +} + +ext { + compileSdk = versionProps['compileSdk'] as Integer + minSdk = versionProps['minSdk'] as Integer + targetSdk = versionProps['targetSdk'] as Integer + + def javaVerNum = versionProps['javaVersion'] as Integer + javaVersion = JavaVersion.toVersion(javaVerNum) +} + diff --git a/packages/firebase_messaging/firebase_messaging/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/firebase_messaging/firebase_messaging/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 20582f866aa0..2cfb2e9e694c 100644 --- a/packages/firebase_messaging/firebase_messaging/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/firebase_messaging/firebase_messaging/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -66,6 +66,7 @@ ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" debugServiceExtension = "internal" + enableGPUValidationMode = "1" allowLocationSimulation = "YES"> diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle index b9ad24c066b9..2aa1f9ddd91d 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle @@ -33,7 +33,7 @@ def getRootProjectExtOrCoreProperty(name, firebaseCoreProject) { } apply plugin: 'com.android.library' -apply from: file("../../../../gradle/global-config.gradle") +apply from: file("local-config.gradle") android { // Conditional for compatibility with AGP <4.2. diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/generated_android_versions.txt b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/local-config.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/local-config.gradle new file mode 100644 index 000000000000..f790702014d7 --- /dev/null +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/local-config.gradle @@ -0,0 +1,19 @@ +def versionFile = file("generated_android_versions.txt") +def versionProps = new Properties() + +if (versionFile.exists()) { + versionFile.withInputStream { stream -> + versionProps.load(stream) + } +} else { + throw new GradleException("generated_android_versions.txt not found!") +} + +ext { + compileSdk = versionProps['compileSdk'] as Integer + minSdk = versionProps['minSdk'] as Integer + targetSdk = versionProps['targetSdk'] as Integer + + def javaVerNum = versionProps['javaVersion'] as Integer + javaVersion = JavaVersion.toVersion(javaVerNum) +} diff --git a/packages/firebase_performance/firebase_performance/android/build.gradle b/packages/firebase_performance/firebase_performance/android/build.gradle index 0a8deba82ab8..f66a8ca986ef 100644 --- a/packages/firebase_performance/firebase_performance/android/build.gradle +++ b/packages/firebase_performance/firebase_performance/android/build.gradle @@ -20,7 +20,7 @@ rootProject.allprojects { } apply plugin: 'com.android.library' -apply from: file("../../../../gradle/global-config.gradle") +apply from: file("local-config.gradle") def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { diff --git a/packages/firebase_performance/firebase_performance/android/generated_android_versions.txt b/packages/firebase_performance/firebase_performance/android/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_performance/firebase_performance/android/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_performance/firebase_performance/android/local-config.gradle b/packages/firebase_performance/firebase_performance/android/local-config.gradle new file mode 100644 index 000000000000..f790702014d7 --- /dev/null +++ b/packages/firebase_performance/firebase_performance/android/local-config.gradle @@ -0,0 +1,19 @@ +def versionFile = file("generated_android_versions.txt") +def versionProps = new Properties() + +if (versionFile.exists()) { + versionFile.withInputStream { stream -> + versionProps.load(stream) + } +} else { + throw new GradleException("generated_android_versions.txt not found!") +} + +ext { + compileSdk = versionProps['compileSdk'] as Integer + minSdk = versionProps['minSdk'] as Integer + targetSdk = versionProps['targetSdk'] as Integer + + def javaVerNum = versionProps['javaVersion'] as Integer + javaVersion = JavaVersion.toVersion(javaVerNum) +} 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 a4127a252260..4ca4bfdde584 100644 --- a/packages/firebase_remote_config/firebase_remote_config/android/build.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/android/build.gradle @@ -20,7 +20,7 @@ rootProject.allprojects { } apply plugin: 'com.android.library' -apply from: file("../../../../gradle/global-config.gradle") +apply from: file("local-config.gradle") def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { diff --git a/packages/firebase_remote_config/firebase_remote_config/android/generated_android_versions.txt b/packages/firebase_remote_config/firebase_remote_config/android/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_remote_config/firebase_remote_config/android/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_remote_config/firebase_remote_config/android/local-config.gradle b/packages/firebase_remote_config/firebase_remote_config/android/local-config.gradle new file mode 100644 index 000000000000..f790702014d7 --- /dev/null +++ b/packages/firebase_remote_config/firebase_remote_config/android/local-config.gradle @@ -0,0 +1,19 @@ +def versionFile = file("generated_android_versions.txt") +def versionProps = new Properties() + +if (versionFile.exists()) { + versionFile.withInputStream { stream -> + versionProps.load(stream) + } +} else { + throw new GradleException("generated_android_versions.txt not found!") +} + +ext { + compileSdk = versionProps['compileSdk'] as Integer + minSdk = versionProps['minSdk'] as Integer + targetSdk = versionProps['targetSdk'] as Integer + + def javaVerNum = versionProps['javaVersion'] as Integer + javaVersion = JavaVersion.toVersion(javaVerNum) +} diff --git a/packages/firebase_storage/firebase_storage/android/build.gradle b/packages/firebase_storage/firebase_storage/android/build.gradle index 085ef49e9b0c..3096f323f86b 100755 --- a/packages/firebase_storage/firebase_storage/android/build.gradle +++ b/packages/firebase_storage/firebase_storage/android/build.gradle @@ -28,7 +28,7 @@ allprojects { } apply plugin: 'com.android.library' -apply from: file("../../../../gradle/global-config.gradle") +apply from: file("local-config.gradle") def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { diff --git a/packages/firebase_storage/firebase_storage/android/generated_android_versions.txt b/packages/firebase_storage/firebase_storage/android/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_storage/firebase_storage/android/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_storage/firebase_storage/android/local-config.gradle b/packages/firebase_storage/firebase_storage/android/local-config.gradle new file mode 100644 index 000000000000..f790702014d7 --- /dev/null +++ b/packages/firebase_storage/firebase_storage/android/local-config.gradle @@ -0,0 +1,19 @@ +def versionFile = file("generated_android_versions.txt") +def versionProps = new Properties() + +if (versionFile.exists()) { + versionFile.withInputStream { stream -> + versionProps.load(stream) + } +} else { + throw new GradleException("generated_android_versions.txt not found!") +} + +ext { + compileSdk = versionProps['compileSdk'] as Integer + minSdk = versionProps['minSdk'] as Integer + targetSdk = versionProps['targetSdk'] as Integer + + def javaVerNum = versionProps['javaVersion'] as Integer + javaVersion = JavaVersion.toVersion(javaVerNum) +} From 6ffeef3fc179262dbdfdd94f66df840f90ea28e6 Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Fri, 11 Apr 2025 16:25:39 +0100 Subject: [PATCH 08/29] chore(deps): local configs to example apps --- gradle/global-config.gradle | 6 ------ gradle/global-config.txt | 4 ++++ .../example/android/app/build.gradle | 2 +- .../app/generated_android_versions.txt | 4 ++++ .../example/android/app/build.gradle | 2 +- .../app/generated_android_versions.txt | 4 ++++ .../example/android/app/build.gradle | 2 +- .../app/generated_android_versions.txt | 4 ++++ .../example/android/app/build.gradle | 2 +- .../app/generated_android_versions.txt | 4 ++++ .../example/android/app/build.gradle | 2 +- .../app/generated_android_versions.txt | 4 ++++ .../example/android/app/build.gradle | 2 +- .../app/generated_android_versions.txt | 4 ++++ .../example/android/app/build.gradle | 2 +- .../app/generated_android_versions.txt | 4 ++++ .../example/android/app/build.gradle | 2 +- .../app/generated_android_versions.txt | 4 ++++ .../example/android/app/build.gradle | 2 +- .../example/android/app/build.gradle | 2 +- .../app/generated_android_versions.txt | 4 ++++ .../example/android/app/build.gradle | 2 +- .../app/generated_android_versions.txt | 4 ++++ .../example/android/app/build.gradle | 2 +- .../app/generated_android_versions.txt | 4 ++++ .../example/android/app/build.gradle | 2 +- .../app/generated_android_versions.txt | 4 ++++ .../example/android/app/build.gradle | 2 +- .../app/generated_android_versions.txt | 4 ++++ .../example/android/app/build.gradle | 2 +- .../app/generated_android_versions.txt | 4 ++++ .../example/android/app/build.gradle | 2 +- .../app/generated_android_versions.txt | 4 ++++ .../example/android/app/build.gradle | 2 +- .../app/generated_android_versions.txt | 4 ++++ tests/android/app/build.gradle | 2 +- .../app/generated_android_versions.txt | 4 ++++ tests/android/app/local-config.gradle | 19 +++++++++++++++++++ 38 files changed, 109 insertions(+), 24 deletions(-) delete mode 100644 gradle/global-config.gradle create mode 100644 gradle/global-config.txt create mode 100644 packages/cloud_firestore/cloud_firestore/example/android/app/generated_android_versions.txt create mode 100644 packages/cloud_functions/cloud_functions/example/android/app/generated_android_versions.txt create mode 100644 packages/firebase_analytics/firebase_analytics/example/android/app/generated_android_versions.txt create mode 100644 packages/firebase_app_check/firebase_app_check/example/android/app/generated_android_versions.txt create mode 100644 packages/firebase_app_installations/firebase_app_installations/example/android/app/generated_android_versions.txt create mode 100644 packages/firebase_auth/firebase_auth/example/android/app/generated_android_versions.txt create mode 100644 packages/firebase_core/firebase_core/example/android/app/generated_android_versions.txt create mode 100644 packages/firebase_crashlytics/firebase_crashlytics/example/android/app/generated_android_versions.txt create mode 100644 packages/firebase_database/firebase_database/example/android/app/generated_android_versions.txt create mode 100644 packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/generated_android_versions.txt create mode 100644 packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/generated_android_versions.txt create mode 100644 packages/firebase_messaging/firebase_messaging/example/android/app/generated_android_versions.txt create mode 100644 packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/generated_android_versions.txt create mode 100644 packages/firebase_performance/firebase_performance/example/android/app/generated_android_versions.txt create mode 100644 packages/firebase_remote_config/firebase_remote_config/example/android/app/generated_android_versions.txt create mode 100644 packages/firebase_storage/firebase_storage/example/android/app/generated_android_versions.txt create mode 100644 tests/android/app/generated_android_versions.txt create mode 100644 tests/android/app/local-config.gradle diff --git a/gradle/global-config.gradle b/gradle/global-config.gradle deleted file mode 100644 index 25a9a1e6c1c5..000000000000 --- a/gradle/global-config.gradle +++ /dev/null @@ -1,6 +0,0 @@ -ext { - javaVersion = JavaVersion.VERSION_17 - compileSdk = 35 - minSdk = 21 - targetSdk = 35 -} diff --git a/gradle/global-config.txt b/gradle/global-config.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/gradle/global-config.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle b/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle index b72147abf01a..95f7b105d03e 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle @@ -7,7 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } -apply from: file("../../../../../../gradle/global-config.gradle") +apply from: file("../../../android/local-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") diff --git a/packages/cloud_firestore/cloud_firestore/example/android/app/generated_android_versions.txt b/packages/cloud_firestore/cloud_firestore/example/android/app/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/cloud_firestore/cloud_firestore/example/android/app/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/cloud_functions/cloud_functions/example/android/app/build.gradle b/packages/cloud_functions/cloud_functions/example/android/app/build.gradle index 6106180eafdb..f4d2b35731f2 100644 --- a/packages/cloud_functions/cloud_functions/example/android/app/build.gradle +++ b/packages/cloud_functions/cloud_functions/example/android/app/build.gradle @@ -7,7 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } -apply from: file("../../../../../../gradle/global-config.gradle") +apply from: file("../../../android/local-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") diff --git a/packages/cloud_functions/cloud_functions/example/android/app/generated_android_versions.txt b/packages/cloud_functions/cloud_functions/example/android/app/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/cloud_functions/cloud_functions/example/android/app/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle b/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle index e43fc0cfd57b..b0a12e0a4923 100644 --- a/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle @@ -7,7 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } -apply from: file("../../../../../../gradle/global-config.gradle") +apply from: file("../../../android/local-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/generated_android_versions.txt b/packages/firebase_analytics/firebase_analytics/example/android/app/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_analytics/firebase_analytics/example/android/app/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_app_check/firebase_app_check/example/android/app/build.gradle b/packages/firebase_app_check/firebase_app_check/example/android/app/build.gradle index 6f1fb3238edc..be0098ca048d 100644 --- a/packages/firebase_app_check/firebase_app_check/example/android/app/build.gradle +++ b/packages/firebase_app_check/firebase_app_check/example/android/app/build.gradle @@ -7,7 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } -apply from: file("../../../../../../gradle/global-config.gradle") +apply from: file("../../../android/local-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") diff --git a/packages/firebase_app_check/firebase_app_check/example/android/app/generated_android_versions.txt b/packages/firebase_app_check/firebase_app_check/example/android/app/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_app_check/firebase_app_check/example/android/app/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_app_installations/firebase_app_installations/example/android/app/build.gradle b/packages/firebase_app_installations/firebase_app_installations/example/android/app/build.gradle index 619f14d48a4b..7d1b2e81d27a 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/android/app/build.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/example/android/app/build.gradle @@ -7,7 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } -apply from: file("../../../../../../gradle/global-config.gradle") +apply from: file("../../../android/local-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") diff --git a/packages/firebase_app_installations/firebase_app_installations/example/android/app/generated_android_versions.txt b/packages/firebase_app_installations/firebase_app_installations/example/android/app/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_app_installations/firebase_app_installations/example/android/app/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_auth/firebase_auth/example/android/app/build.gradle b/packages/firebase_auth/firebase_auth/example/android/app/build.gradle index a1e794830740..b1f6468ceeea 100644 --- a/packages/firebase_auth/firebase_auth/example/android/app/build.gradle +++ b/packages/firebase_auth/firebase_auth/example/android/app/build.gradle @@ -7,7 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } -apply from: file("../../../../../../gradle/global-config.gradle") +apply from: file("../../../android/local-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") diff --git a/packages/firebase_auth/firebase_auth/example/android/app/generated_android_versions.txt b/packages/firebase_auth/firebase_auth/example/android/app/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_auth/firebase_auth/example/android/app/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_core/firebase_core/example/android/app/build.gradle b/packages/firebase_core/firebase_core/example/android/app/build.gradle index 330ebf07b857..9825d48ea862 100644 --- a/packages/firebase_core/firebase_core/example/android/app/build.gradle +++ b/packages/firebase_core/firebase_core/example/android/app/build.gradle @@ -7,7 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } -apply from: file("../../../../../../gradle/global-config.gradle") +apply from: file("../../../android/local-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") diff --git a/packages/firebase_core/firebase_core/example/android/app/generated_android_versions.txt b/packages/firebase_core/firebase_core/example/android/app/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_core/firebase_core/example/android/app/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle b/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle index 69a487ce30a2..dc7156338ae3 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle @@ -8,7 +8,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } -apply from: file("../../../../../../gradle/global-config.gradle") +apply from: file("../../../android/local-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/generated_android_versions.txt b/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_data_connect/firebase_data_connect/example/android/app/build.gradle b/packages/firebase_data_connect/firebase_data_connect/example/android/app/build.gradle index b816734f092b..3ed065aed5a9 100644 --- a/packages/firebase_data_connect/firebase_data_connect/example/android/app/build.gradle +++ b/packages/firebase_data_connect/firebase_data_connect/example/android/app/build.gradle @@ -4,7 +4,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } -apply from: file("../../../../../../gradle/global-config.gradle") +apply from: file("../../../android/local-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") diff --git a/packages/firebase_database/firebase_database/example/android/app/build.gradle b/packages/firebase_database/firebase_database/example/android/app/build.gradle index ca3aceef7abf..a9faac52d630 100644 --- a/packages/firebase_database/firebase_database/example/android/app/build.gradle +++ b/packages/firebase_database/firebase_database/example/android/app/build.gradle @@ -7,7 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } -apply from: file("../../../../../../gradle/global-config.gradle") +apply from: file("../../../android/local-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") diff --git a/packages/firebase_database/firebase_database/example/android/app/generated_android_versions.txt b/packages/firebase_database/firebase_database/example/android/app/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_database/firebase_database/example/android/app/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle index 149b25709050..9ea784848caf 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle @@ -7,7 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } -apply from: file("../../../../../../gradle/global-config.gradle") +apply from: file("../../../android/local-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/generated_android_versions.txt b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle index 236a152142a4..a27c032b9325 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle @@ -7,7 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } -apply from: file("../../../../../../gradle/global-config.gradle") +apply from: file("../../../android/local-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/generated_android_versions.txt b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle b/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle index 914fddc55361..5ab3e9883f29 100644 --- a/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle +++ b/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle @@ -7,7 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } -apply from: file("../../../../../../gradle/global-config.gradle") +apply from: file("../../../android/local-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") diff --git a/packages/firebase_messaging/firebase_messaging/example/android/app/generated_android_versions.txt b/packages/firebase_messaging/firebase_messaging/example/android/app/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_messaging/firebase_messaging/example/android/app/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle index 236a152142a4..a27c032b9325 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle @@ -7,7 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } -apply from: file("../../../../../../gradle/global-config.gradle") +apply from: file("../../../android/local-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/generated_android_versions.txt b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_performance/firebase_performance/example/android/app/build.gradle b/packages/firebase_performance/firebase_performance/example/android/app/build.gradle index 5e58d8d6073b..de298199be66 100644 --- a/packages/firebase_performance/firebase_performance/example/android/app/build.gradle +++ b/packages/firebase_performance/firebase_performance/example/android/app/build.gradle @@ -8,7 +8,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } -apply from: file("../../../../../../gradle/global-config.gradle") +apply from: file("../../../android/local-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") diff --git a/packages/firebase_performance/firebase_performance/example/android/app/generated_android_versions.txt b/packages/firebase_performance/firebase_performance/example/android/app/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_performance/firebase_performance/example/android/app/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle b/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle index c4b532f4956f..75f3e44e0360 100644 --- a/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle @@ -7,7 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } -apply from: file("../../../../../../gradle/global-config.gradle") +apply from: file("../../../android/local-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") diff --git a/packages/firebase_remote_config/firebase_remote_config/example/android/app/generated_android_versions.txt b/packages/firebase_remote_config/firebase_remote_config/example/android/app/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_remote_config/firebase_remote_config/example/android/app/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_storage/firebase_storage/example/android/app/build.gradle b/packages/firebase_storage/firebase_storage/example/android/app/build.gradle index a2ccd5809f51..7fb7d1279df9 100644 --- a/packages/firebase_storage/firebase_storage/example/android/app/build.gradle +++ b/packages/firebase_storage/firebase_storage/example/android/app/build.gradle @@ -7,7 +7,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } -apply from: file("../../../../../../gradle/global-config.gradle") +apply from: file("../../../android/local-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") diff --git a/packages/firebase_storage/firebase_storage/example/android/app/generated_android_versions.txt b/packages/firebase_storage/firebase_storage/example/android/app/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_storage/firebase_storage/example/android/app/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/tests/android/app/build.gradle b/tests/android/app/build.gradle index ae9d4d44088a..8b63e93ff326 100644 --- a/tests/android/app/build.gradle +++ b/tests/android/app/build.gradle @@ -4,7 +4,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } -apply from: file("../../../gradle/global-config.gradle") +apply from: file("local-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") diff --git a/tests/android/app/generated_android_versions.txt b/tests/android/app/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/tests/android/app/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/tests/android/app/local-config.gradle b/tests/android/app/local-config.gradle new file mode 100644 index 000000000000..f790702014d7 --- /dev/null +++ b/tests/android/app/local-config.gradle @@ -0,0 +1,19 @@ +def versionFile = file("generated_android_versions.txt") +def versionProps = new Properties() + +if (versionFile.exists()) { + versionFile.withInputStream { stream -> + versionProps.load(stream) + } +} else { + throw new GradleException("generated_android_versions.txt not found!") +} + +ext { + compileSdk = versionProps['compileSdk'] as Integer + minSdk = versionProps['minSdk'] as Integer + targetSdk = versionProps['targetSdk'] as Integer + + def javaVerNum = versionProps['javaVersion'] as Integer + javaVersion = JavaVersion.toVersion(javaVerNum) +} From d80c0d9add495f3f3975c0020b5a38c8aa04c98e Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Fri, 11 Apr 2025 16:35:50 +0100 Subject: [PATCH 09/29] chore(deps): dataconnect config --- .../example/android/app/build.gradle | 2 +- .../app/generated_android_versions.txt | 4 ++++ .../example/android/app/local-config.gradle | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 packages/firebase_data_connect/firebase_data_connect/example/android/app/generated_android_versions.txt create mode 100644 packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle diff --git a/packages/firebase_data_connect/firebase_data_connect/example/android/app/build.gradle b/packages/firebase_data_connect/firebase_data_connect/example/android/app/build.gradle index 3ed065aed5a9..ac9c21031742 100644 --- a/packages/firebase_data_connect/firebase_data_connect/example/android/app/build.gradle +++ b/packages/firebase_data_connect/firebase_data_connect/example/android/app/build.gradle @@ -4,7 +4,7 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } -apply from: file("../../../android/local-config.gradle") +apply from: file("local-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") diff --git a/packages/firebase_data_connect/firebase_data_connect/example/android/app/generated_android_versions.txt b/packages/firebase_data_connect/firebase_data_connect/example/android/app/generated_android_versions.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_data_connect/firebase_data_connect/example/android/app/generated_android_versions.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle b/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle new file mode 100644 index 000000000000..f790702014d7 --- /dev/null +++ b/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle @@ -0,0 +1,19 @@ +def versionFile = file("generated_android_versions.txt") +def versionProps = new Properties() + +if (versionFile.exists()) { + versionFile.withInputStream { stream -> + versionProps.load(stream) + } +} else { + throw new GradleException("generated_android_versions.txt not found!") +} + +ext { + compileSdk = versionProps['compileSdk'] as Integer + minSdk = versionProps['minSdk'] as Integer + targetSdk = versionProps['targetSdk'] as Integer + + def javaVerNum = versionProps['javaVersion'] as Integer + javaVersion = JavaVersion.toVersion(javaVerNum) +} From 5bcf242357510a714799400415f386414e6c3623 Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Fri, 11 Apr 2025 16:55:43 +0100 Subject: [PATCH 10/29] feat(deps): started script file to change java and compile versions --- scripts/generate_versions_gradle.dart | 77 +++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 scripts/generate_versions_gradle.dart diff --git a/scripts/generate_versions_gradle.dart b/scripts/generate_versions_gradle.dart new file mode 100644 index 000000000000..eb4c9c7ccc48 --- /dev/null +++ b/scripts/generate_versions_gradle.dart @@ -0,0 +1,77 @@ +// Copyright 2024 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import 'package:melos/melos.dart' as melos; +import 'package:glob/glob.dart'; +import 'dart:io'; +import 'package:cli_util/cli_logging.dart' as logging; +import 'package:yaml/yaml.dart'; + +// Used to generate a simple txt file for local-config.gradle files to parse in order to use correct java and compilation versions. + +void main() async{ + + final workspace = await getMelosWorkspace(); + final globalConfig = File('../gradle/global_config.gradle'); + + final javaVersion = getVersions(globalConfig); + + for (final package in workspace.filteredPackages.values) { + final localConfigGradleFile = + File('${package.path}/android/local-config.gradle'); + + if (localConfigGradleFile.existsSync()) { + final versionFile = + File('${package.path}/android/generated_android_versions.txt'); + versionFile.writeAsStringSync(await javaVersion); + } + } +} + +Future getMelosWorkspace() async { + final packageFilters = melos.PackageFilters( + includePrivatePackages: false, + ignore: [ + Glob('*web*'), + Glob('*platform*'), + Glob('*internals*'), + ], + ); + final workspace = await melos.MelosWorkspace.fromConfig( + await melos.MelosWorkspaceConfig.fromWorkspaceRoot(Directory.current), + logger: melos.MelosLogger(logging.Logger.standard()), + packageFilters: packageFilters, + ); + + return workspace; +} + +Future getVersions(File globalConfig) async { + if (globalConfig.existsSync()) { + final contents = await globalConfig.readAsString(); + final lines = contents.split('\n'); + final javaVersion = lines.firstWhere((line) => line.contains('javaVersion')); + final compileSdkVersion = + lines.firstWhere((line) => line.contains('compileSdkVersion')); + final minSdkVersion = + lines.firstWhere((line) => line.contains('minSdkVersion')); + final targetSdkVersion = + lines.firstWhere((line) => line.contains('targetSdkVersion')); + + return '$javaVersion\n$compileSdkVersion\n$minSdkVersion\n$targetSdkVersion'; + } + throw Exception( + 'global_config.txt file not found in the expected location.', + ); +} From 44b182e5663db41f71a56544f288027b807af2bc Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Wed, 16 Apr 2025 17:31:44 +0100 Subject: [PATCH 11/29] chore(deps): automated script working --- melos.yaml | 1 + .../android/generated_android_versions.txt | 4 +- .../app/generated_android_versions.txt | 4 +- .../android/generated_android_versions.txt | 4 +- .../app/generated_android_versions.txt | 4 +- .../android/generated_android_versions.txt | 4 +- .../app/generated_android_versions.txt | 4 +- .../android/generated_android_versions.txt | 4 +- .../app/generated_android_versions.txt | 4 +- .../android/generated_android_versions.txt | 4 +- .../app/generated_android_versions.txt | 4 +- .../android/generated_android_versions.txt | 4 +- .../app/generated_android_versions.txt | 4 +- .../android/generated_android_versions.txt | 4 +- .../firebase_core/android/global-config.txt | 4 ++ .../app/generated_android_versions.txt | 4 +- .../android/generated_android_versions.txt | 4 +- .../app/generated_android_versions.txt | 4 +- .../android/generated_android_versions.txt | 4 +- .../app/generated_android_versions.txt | 4 +- .../android/generated_android_versions.txt | 4 +- .../app/generated_android_versions.txt | 4 +- .../android/generated_android_versions.txt | 4 +- .../app/generated_android_versions.txt | 4 +- .../android/generated_android_versions.txt | 4 +- .../app/generated_android_versions.txt | 4 +- .../android/generated_android_versions.txt | 4 +- .../app/generated_android_versions.txt | 4 +- .../android/generated_android_versions.txt | 4 +- .../app/generated_android_versions.txt | 4 +- .../android/generated_android_versions.txt | 4 +- .../app/generated_android_versions.txt | 4 +- .../android/generated_android_versions.txt | 4 +- .../app/generated_android_versions.txt | 4 +- scripts/generate_versions_gradle.dart | 45 ++++++++++++------- 35 files changed, 99 insertions(+), 79 deletions(-) create mode 100644 packages/firebase_core/firebase_core/android/global-config.txt diff --git a/melos.yaml b/melos.yaml index a04e3758f5e5..60f0ae2d0cb0 100644 --- a/melos.yaml +++ b/melos.yaml @@ -20,6 +20,7 @@ command: dart run scripts/generate_vertexai_version.dart && \ dart run scripts/generate_dataconnect_version.dart && \ dart run scripts/generate_versions_spm.dart && \ + dart run scripts/generate_versions_gradle.dart && \ git add packages/firebase_vertexai/firebase_vertexai/lib/src/vertex_version.dart && \ git add packages/firebase_data_connect/firebase_data_connect/lib/src/dataconnect_version.dart post: | diff --git a/packages/cloud_firestore/cloud_firestore/android/generated_android_versions.txt b/packages/cloud_firestore/cloud_firestore/android/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/cloud_firestore/cloud_firestore/android/generated_android_versions.txt +++ b/packages/cloud_firestore/cloud_firestore/android/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/cloud_firestore/cloud_firestore/example/android/app/generated_android_versions.txt b/packages/cloud_firestore/cloud_firestore/example/android/app/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/app/generated_android_versions.txt +++ b/packages/cloud_firestore/cloud_firestore/example/android/app/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/cloud_functions/cloud_functions/android/generated_android_versions.txt b/packages/cloud_functions/cloud_functions/android/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/cloud_functions/cloud_functions/android/generated_android_versions.txt +++ b/packages/cloud_functions/cloud_functions/android/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/cloud_functions/cloud_functions/example/android/app/generated_android_versions.txt b/packages/cloud_functions/cloud_functions/example/android/app/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/cloud_functions/cloud_functions/example/android/app/generated_android_versions.txt +++ b/packages/cloud_functions/cloud_functions/example/android/app/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_analytics/firebase_analytics/android/generated_android_versions.txt b/packages/firebase_analytics/firebase_analytics/android/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_analytics/firebase_analytics/android/generated_android_versions.txt +++ b/packages/firebase_analytics/firebase_analytics/android/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/generated_android_versions.txt b/packages/firebase_analytics/firebase_analytics/example/android/app/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_analytics/firebase_analytics/example/android/app/generated_android_versions.txt +++ b/packages/firebase_analytics/firebase_analytics/example/android/app/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_app_check/firebase_app_check/android/generated_android_versions.txt b/packages/firebase_app_check/firebase_app_check/android/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_app_check/firebase_app_check/android/generated_android_versions.txt +++ b/packages/firebase_app_check/firebase_app_check/android/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_app_check/firebase_app_check/example/android/app/generated_android_versions.txt b/packages/firebase_app_check/firebase_app_check/example/android/app/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_app_check/firebase_app_check/example/android/app/generated_android_versions.txt +++ b/packages/firebase_app_check/firebase_app_check/example/android/app/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_app_installations/firebase_app_installations/android/generated_android_versions.txt b/packages/firebase_app_installations/firebase_app_installations/android/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_app_installations/firebase_app_installations/android/generated_android_versions.txt +++ b/packages/firebase_app_installations/firebase_app_installations/android/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_app_installations/firebase_app_installations/example/android/app/generated_android_versions.txt b/packages/firebase_app_installations/firebase_app_installations/example/android/app/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/android/app/generated_android_versions.txt +++ b/packages/firebase_app_installations/firebase_app_installations/example/android/app/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_auth/firebase_auth/android/generated_android_versions.txt b/packages/firebase_auth/firebase_auth/android/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_auth/firebase_auth/android/generated_android_versions.txt +++ b/packages/firebase_auth/firebase_auth/android/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_auth/firebase_auth/example/android/app/generated_android_versions.txt b/packages/firebase_auth/firebase_auth/example/android/app/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_auth/firebase_auth/example/android/app/generated_android_versions.txt +++ b/packages/firebase_auth/firebase_auth/example/android/app/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_core/firebase_core/android/generated_android_versions.txt b/packages/firebase_core/firebase_core/android/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_core/firebase_core/android/generated_android_versions.txt +++ b/packages/firebase_core/firebase_core/android/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_core/firebase_core/android/global-config.txt b/packages/firebase_core/firebase_core/android/global-config.txt new file mode 100644 index 000000000000..4b434611f002 --- /dev/null +++ b/packages/firebase_core/firebase_core/android/global-config.txt @@ -0,0 +1,4 @@ +compileSdk=35 +minSdk=21 +targetSdk=35 +javaVersion=17 diff --git a/packages/firebase_core/firebase_core/example/android/app/generated_android_versions.txt b/packages/firebase_core/firebase_core/example/android/app/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_core/firebase_core/example/android/app/generated_android_versions.txt +++ b/packages/firebase_core/firebase_core/example/android/app/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_crashlytics/firebase_crashlytics/android/generated_android_versions.txt b/packages/firebase_crashlytics/firebase_crashlytics/android/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/android/generated_android_versions.txt +++ b/packages/firebase_crashlytics/firebase_crashlytics/android/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/generated_android_versions.txt b/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/generated_android_versions.txt +++ b/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_database/firebase_database/android/generated_android_versions.txt b/packages/firebase_database/firebase_database/android/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_database/firebase_database/android/generated_android_versions.txt +++ b/packages/firebase_database/firebase_database/android/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_database/firebase_database/example/android/app/generated_android_versions.txt b/packages/firebase_database/firebase_database/example/android/app/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_database/firebase_database/example/android/app/generated_android_versions.txt +++ b/packages/firebase_database/firebase_database/example/android/app/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/android/generated_android_versions.txt b/packages/firebase_dynamic_links/firebase_dynamic_links/android/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/android/generated_android_versions.txt +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/android/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/generated_android_versions.txt b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/generated_android_versions.txt +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/generated_android_versions.txt b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/generated_android_versions.txt +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/generated_android_versions.txt b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/generated_android_versions.txt +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_messaging/firebase_messaging/android/generated_android_versions.txt b/packages/firebase_messaging/firebase_messaging/android/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_messaging/firebase_messaging/android/generated_android_versions.txt +++ b/packages/firebase_messaging/firebase_messaging/android/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_messaging/firebase_messaging/example/android/app/generated_android_versions.txt b/packages/firebase_messaging/firebase_messaging/example/android/app/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_messaging/firebase_messaging/example/android/app/generated_android_versions.txt +++ b/packages/firebase_messaging/firebase_messaging/example/android/app/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/generated_android_versions.txt b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/generated_android_versions.txt +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/generated_android_versions.txt b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/generated_android_versions.txt +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_performance/firebase_performance/android/generated_android_versions.txt b/packages/firebase_performance/firebase_performance/android/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_performance/firebase_performance/android/generated_android_versions.txt +++ b/packages/firebase_performance/firebase_performance/android/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_performance/firebase_performance/example/android/app/generated_android_versions.txt b/packages/firebase_performance/firebase_performance/example/android/app/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_performance/firebase_performance/example/android/app/generated_android_versions.txt +++ b/packages/firebase_performance/firebase_performance/example/android/app/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_remote_config/firebase_remote_config/android/generated_android_versions.txt b/packages/firebase_remote_config/firebase_remote_config/android/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_remote_config/firebase_remote_config/android/generated_android_versions.txt +++ b/packages/firebase_remote_config/firebase_remote_config/android/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_remote_config/firebase_remote_config/example/android/app/generated_android_versions.txt b/packages/firebase_remote_config/firebase_remote_config/example/android/app/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_remote_config/firebase_remote_config/example/android/app/generated_android_versions.txt +++ b/packages/firebase_remote_config/firebase_remote_config/example/android/app/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_storage/firebase_storage/android/generated_android_versions.txt b/packages/firebase_storage/firebase_storage/android/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_storage/firebase_storage/android/generated_android_versions.txt +++ b/packages/firebase_storage/firebase_storage/android/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_storage/firebase_storage/example/android/app/generated_android_versions.txt b/packages/firebase_storage/firebase_storage/example/android/app/generated_android_versions.txt index 4b434611f002..bff2c7c48b92 100644 --- a/packages/firebase_storage/firebase_storage/example/android/app/generated_android_versions.txt +++ b/packages/firebase_storage/firebase_storage/example/android/app/generated_android_versions.txt @@ -1,4 +1,4 @@ +javaVersion=17 compileSdk=35 minSdk=21 -targetSdk=35 -javaVersion=17 +targetSdk=35 \ No newline at end of file diff --git a/scripts/generate_versions_gradle.dart b/scripts/generate_versions_gradle.dart index eb4c9c7ccc48..0c9889a83b62 100644 --- a/scripts/generate_versions_gradle.dart +++ b/scripts/generate_versions_gradle.dart @@ -16,25 +16,41 @@ import 'package:melos/melos.dart' as melos; import 'package:glob/glob.dart'; import 'dart:io'; import 'package:cli_util/cli_logging.dart' as logging; -import 'package:yaml/yaml.dart'; +import 'package:path/path.dart' as path; // Used to generate a simple txt file for local-config.gradle files to parse in order to use correct java and compilation versions. -void main() async{ - +void main() async { final workspace = await getMelosWorkspace(); - final globalConfig = File('../gradle/global_config.gradle'); + // get version from core + // To edit versions for all packages, edit the global-config.txt file in firebase_core package + // located in the android folder for global-config.txt + final firebaseCorePackage = workspace.filteredPackages.values + .firstWhere((package) => package.name == 'firebase_core'); + + final globalConfig = File( + '${firebaseCorePackage.path}/android/global-config.txt', + ); + + if (!globalConfig.existsSync()) { + throw Exception( + 'global_config.txt file not found in the expected location.', + ); + } - final javaVersion = getVersions(globalConfig); + final versions = getVersions(globalConfig); for (final package in workspace.filteredPackages.values) { final localConfigGradleFile = File('${package.path}/android/local-config.gradle'); if (localConfigGradleFile.existsSync()) { - final versionFile = + final packageVersionFile = File('${package.path}/android/generated_android_versions.txt'); - versionFile.writeAsStringSync(await javaVersion); + packageVersionFile.writeAsStringSync(await versions); + final exampleAppVersionFile = File( + '${package.path}/example/android/app/generated_android_versions.txt'); + exampleAppVersionFile.writeAsStringSync(await versions); } } } @@ -59,19 +75,18 @@ Future getMelosWorkspace() async { Future getVersions(File globalConfig) async { if (globalConfig.existsSync()) { - final contents = await globalConfig.readAsString(); + final contents = globalConfig.readAsStringSync(); final lines = contents.split('\n'); - final javaVersion = lines.firstWhere((line) => line.contains('javaVersion')); + final javaVersion = + lines.firstWhere((line) => line.contains('javaVersion')); final compileSdkVersion = - lines.firstWhere((line) => line.contains('compileSdkVersion')); + lines.firstWhere((line) => line.contains('compileSdk')); final minSdkVersion = - lines.firstWhere((line) => line.contains('minSdkVersion')); + lines.firstWhere((line) => line.contains('minSdk')); final targetSdkVersion = - lines.firstWhere((line) => line.contains('targetSdkVersion')); + lines.firstWhere((line) => line.contains('targetSdk')); return '$javaVersion\n$compileSdkVersion\n$minSdkVersion\n$targetSdkVersion'; } - throw Exception( - 'global_config.txt file not found in the expected location.', - ); + throw Exception('global-config.txt file has wrong format or something missing.'); } From 8b15b09587cbc1e588259563c1b9dfcf29bb9e7a Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Thu, 17 Apr 2025 14:21:04 +0100 Subject: [PATCH 12/29] fix: cleanup and make script copy gradle files only --- gradle/global-config.txt | 4 -- .../android/generated_android_versions.txt | 4 -- .../android/local-config.gradle | 23 +++------- .../android/generated_android_versions.txt | 4 -- .../android/local-config.gradle | 23 +++------- .../app/generated_android_versions.txt | 4 -- .../android/generated_android_versions.txt | 4 -- .../android/local-config.gradle | 23 +++------- .../app/generated_android_versions.txt | 4 -- .../android/generated_android_versions.txt | 4 -- .../android/local-config.gradle | 23 +++------- .../app/generated_android_versions.txt | 4 -- .../android/generated_android_versions.txt | 4 -- .../android/local-config.gradle | 23 +++------- .../app/generated_android_versions.txt | 4 -- .../android/generated_android_versions.txt | 4 -- .../firebase_auth/android/local-config.gradle | 23 +++------- .../app/generated_android_versions.txt | 4 -- .../android/generated_android_versions.txt | 4 -- .../android/global-config.gradle | 6 +++ .../firebase_core/android/global-config.txt | 4 -- .../firebase_core/android/local-config.gradle | 23 +++------- .../app/generated_android_versions.txt | 4 -- .../android/generated_android_versions.txt | 4 -- .../android/local-config.gradle | 23 +++------- .../app/generated_android_versions.txt | 4 -- .../android/local-config.gradle | 23 +++------- .../app/generated_android_versions.txt | 4 -- .../android/generated_android_versions.txt | 4 -- .../android/local-config.gradle | 23 +++------- .../app/generated_android_versions.txt | 4 -- .../android/generated_android_versions.txt | 4 -- .../android/local-config.gradle | 23 +++------- .../app/generated_android_versions.txt | 4 -- .../android/generated_android_versions.txt | 4 -- .../android/local-config.gradle | 24 +++------- .../app/generated_android_versions.txt | 4 -- .../android/generated_android_versions.txt | 4 -- .../android/local-config.gradle | 23 +++------- .../app/generated_android_versions.txt | 4 -- .../android/generated_android_versions.txt | 4 -- .../android/local-config.gradle | 23 +++------- .../app/generated_android_versions.txt | 4 -- .../android/generated_android_versions.txt | 4 -- .../android/local-config.gradle | 23 +++------- .../app/generated_android_versions.txt | 4 -- .../android/generated_android_versions.txt | 4 -- .../android/local-config.gradle | 23 +++------- .../app/generated_android_versions.txt | 4 -- scripts/generate_versions_gradle.dart | 44 ++++++------------- 50 files changed, 99 insertions(+), 448 deletions(-) delete mode 100644 gradle/global-config.txt delete mode 100644 packages/cloud_firestore/cloud_firestore/android/generated_android_versions.txt delete mode 100644 packages/cloud_functions/cloud_functions/android/generated_android_versions.txt delete mode 100644 packages/cloud_functions/cloud_functions/example/android/app/generated_android_versions.txt delete mode 100644 packages/firebase_analytics/firebase_analytics/android/generated_android_versions.txt delete mode 100644 packages/firebase_analytics/firebase_analytics/example/android/app/generated_android_versions.txt delete mode 100644 packages/firebase_app_check/firebase_app_check/android/generated_android_versions.txt delete mode 100644 packages/firebase_app_check/firebase_app_check/example/android/app/generated_android_versions.txt delete mode 100644 packages/firebase_app_installations/firebase_app_installations/android/generated_android_versions.txt delete mode 100644 packages/firebase_app_installations/firebase_app_installations/example/android/app/generated_android_versions.txt delete mode 100644 packages/firebase_auth/firebase_auth/android/generated_android_versions.txt delete mode 100644 packages/firebase_auth/firebase_auth/example/android/app/generated_android_versions.txt delete mode 100644 packages/firebase_core/firebase_core/android/generated_android_versions.txt create mode 100644 packages/firebase_core/firebase_core/android/global-config.gradle delete mode 100644 packages/firebase_core/firebase_core/android/global-config.txt delete mode 100644 packages/firebase_core/firebase_core/example/android/app/generated_android_versions.txt delete mode 100644 packages/firebase_crashlytics/firebase_crashlytics/android/generated_android_versions.txt delete mode 100644 packages/firebase_crashlytics/firebase_crashlytics/example/android/app/generated_android_versions.txt delete mode 100644 packages/firebase_database/firebase_database/example/android/app/generated_android_versions.txt delete mode 100644 packages/firebase_dynamic_links/firebase_dynamic_links/android/generated_android_versions.txt delete mode 100644 packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/generated_android_versions.txt delete mode 100644 packages/firebase_in_app_messaging/firebase_in_app_messaging/android/generated_android_versions.txt delete mode 100644 packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/generated_android_versions.txt delete mode 100644 packages/firebase_messaging/firebase_messaging/android/generated_android_versions.txt delete mode 100644 packages/firebase_messaging/firebase_messaging/example/android/app/generated_android_versions.txt delete mode 100644 packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/generated_android_versions.txt delete mode 100644 packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/generated_android_versions.txt delete mode 100644 packages/firebase_performance/firebase_performance/android/generated_android_versions.txt delete mode 100644 packages/firebase_performance/firebase_performance/example/android/app/generated_android_versions.txt delete mode 100644 packages/firebase_remote_config/firebase_remote_config/android/generated_android_versions.txt delete mode 100644 packages/firebase_remote_config/firebase_remote_config/example/android/app/generated_android_versions.txt delete mode 100644 packages/firebase_storage/firebase_storage/android/generated_android_versions.txt delete mode 100644 packages/firebase_storage/firebase_storage/example/android/app/generated_android_versions.txt diff --git a/gradle/global-config.txt b/gradle/global-config.txt deleted file mode 100644 index 4b434611f002..000000000000 --- a/gradle/global-config.txt +++ /dev/null @@ -1,4 +0,0 @@ -compileSdk=35 -minSdk=21 -targetSdk=35 -javaVersion=17 diff --git a/packages/cloud_firestore/cloud_firestore/android/generated_android_versions.txt b/packages/cloud_firestore/cloud_firestore/android/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/cloud_firestore/cloud_firestore/android/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/cloud_firestore/cloud_firestore/android/local-config.gradle b/packages/cloud_firestore/cloud_firestore/android/local-config.gradle index f790702014d7..2a6a58f07e88 100644 --- a/packages/cloud_firestore/cloud_firestore/android/local-config.gradle +++ b/packages/cloud_firestore/cloud_firestore/android/local-config.gradle @@ -1,19 +1,6 @@ -def versionFile = file("generated_android_versions.txt") -def versionProps = new Properties() - -if (versionFile.exists()) { - versionFile.withInputStream { stream -> - versionProps.load(stream) - } -} else { - throw new GradleException("generated_android_versions.txt not found!") -} - ext { - compileSdk = versionProps['compileSdk'] as Integer - minSdk = versionProps['minSdk'] as Integer - targetSdk = versionProps['targetSdk'] as Integer - - def javaVerNum = versionProps['javaVersion'] as Integer - javaVersion = JavaVersion.toVersion(javaVerNum) -} + compileSdk=35 + minSdk=21 + targetSdk=35 + javaVersion = JavaVersion.toVersion(17) +} \ No newline at end of file diff --git a/packages/cloud_functions/cloud_functions/android/generated_android_versions.txt b/packages/cloud_functions/cloud_functions/android/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/cloud_functions/cloud_functions/android/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/cloud_functions/cloud_functions/android/local-config.gradle b/packages/cloud_functions/cloud_functions/android/local-config.gradle index f790702014d7..2a6a58f07e88 100644 --- a/packages/cloud_functions/cloud_functions/android/local-config.gradle +++ b/packages/cloud_functions/cloud_functions/android/local-config.gradle @@ -1,19 +1,6 @@ -def versionFile = file("generated_android_versions.txt") -def versionProps = new Properties() - -if (versionFile.exists()) { - versionFile.withInputStream { stream -> - versionProps.load(stream) - } -} else { - throw new GradleException("generated_android_versions.txt not found!") -} - ext { - compileSdk = versionProps['compileSdk'] as Integer - minSdk = versionProps['minSdk'] as Integer - targetSdk = versionProps['targetSdk'] as Integer - - def javaVerNum = versionProps['javaVersion'] as Integer - javaVersion = JavaVersion.toVersion(javaVerNum) -} + compileSdk=35 + minSdk=21 + targetSdk=35 + javaVersion = JavaVersion.toVersion(17) +} \ No newline at end of file diff --git a/packages/cloud_functions/cloud_functions/example/android/app/generated_android_versions.txt b/packages/cloud_functions/cloud_functions/example/android/app/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/cloud_functions/cloud_functions/example/android/app/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_analytics/firebase_analytics/android/generated_android_versions.txt b/packages/firebase_analytics/firebase_analytics/android/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_analytics/firebase_analytics/android/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_analytics/firebase_analytics/android/local-config.gradle b/packages/firebase_analytics/firebase_analytics/android/local-config.gradle index f790702014d7..2a6a58f07e88 100644 --- a/packages/firebase_analytics/firebase_analytics/android/local-config.gradle +++ b/packages/firebase_analytics/firebase_analytics/android/local-config.gradle @@ -1,19 +1,6 @@ -def versionFile = file("generated_android_versions.txt") -def versionProps = new Properties() - -if (versionFile.exists()) { - versionFile.withInputStream { stream -> - versionProps.load(stream) - } -} else { - throw new GradleException("generated_android_versions.txt not found!") -} - ext { - compileSdk = versionProps['compileSdk'] as Integer - minSdk = versionProps['minSdk'] as Integer - targetSdk = versionProps['targetSdk'] as Integer - - def javaVerNum = versionProps['javaVersion'] as Integer - javaVersion = JavaVersion.toVersion(javaVerNum) -} + compileSdk=35 + minSdk=21 + targetSdk=35 + javaVersion = JavaVersion.toVersion(17) +} \ No newline at end of file diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/generated_android_versions.txt b/packages/firebase_analytics/firebase_analytics/example/android/app/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_analytics/firebase_analytics/example/android/app/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_app_check/firebase_app_check/android/generated_android_versions.txt b/packages/firebase_app_check/firebase_app_check/android/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_app_check/firebase_app_check/android/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_app_check/firebase_app_check/android/local-config.gradle b/packages/firebase_app_check/firebase_app_check/android/local-config.gradle index f790702014d7..2a6a58f07e88 100644 --- a/packages/firebase_app_check/firebase_app_check/android/local-config.gradle +++ b/packages/firebase_app_check/firebase_app_check/android/local-config.gradle @@ -1,19 +1,6 @@ -def versionFile = file("generated_android_versions.txt") -def versionProps = new Properties() - -if (versionFile.exists()) { - versionFile.withInputStream { stream -> - versionProps.load(stream) - } -} else { - throw new GradleException("generated_android_versions.txt not found!") -} - ext { - compileSdk = versionProps['compileSdk'] as Integer - minSdk = versionProps['minSdk'] as Integer - targetSdk = versionProps['targetSdk'] as Integer - - def javaVerNum = versionProps['javaVersion'] as Integer - javaVersion = JavaVersion.toVersion(javaVerNum) -} + compileSdk=35 + minSdk=21 + targetSdk=35 + javaVersion = JavaVersion.toVersion(17) +} \ No newline at end of file diff --git a/packages/firebase_app_check/firebase_app_check/example/android/app/generated_android_versions.txt b/packages/firebase_app_check/firebase_app_check/example/android/app/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_app_check/firebase_app_check/example/android/app/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_app_installations/firebase_app_installations/android/generated_android_versions.txt b/packages/firebase_app_installations/firebase_app_installations/android/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_app_installations/firebase_app_installations/android/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_app_installations/firebase_app_installations/android/local-config.gradle b/packages/firebase_app_installations/firebase_app_installations/android/local-config.gradle index f790702014d7..2a6a58f07e88 100644 --- a/packages/firebase_app_installations/firebase_app_installations/android/local-config.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/android/local-config.gradle @@ -1,19 +1,6 @@ -def versionFile = file("generated_android_versions.txt") -def versionProps = new Properties() - -if (versionFile.exists()) { - versionFile.withInputStream { stream -> - versionProps.load(stream) - } -} else { - throw new GradleException("generated_android_versions.txt not found!") -} - ext { - compileSdk = versionProps['compileSdk'] as Integer - minSdk = versionProps['minSdk'] as Integer - targetSdk = versionProps['targetSdk'] as Integer - - def javaVerNum = versionProps['javaVersion'] as Integer - javaVersion = JavaVersion.toVersion(javaVerNum) -} + compileSdk=35 + minSdk=21 + targetSdk=35 + javaVersion = JavaVersion.toVersion(17) +} \ No newline at end of file diff --git a/packages/firebase_app_installations/firebase_app_installations/example/android/app/generated_android_versions.txt b/packages/firebase_app_installations/firebase_app_installations/example/android/app/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_app_installations/firebase_app_installations/example/android/app/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_auth/firebase_auth/android/generated_android_versions.txt b/packages/firebase_auth/firebase_auth/android/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_auth/firebase_auth/android/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_auth/firebase_auth/android/local-config.gradle b/packages/firebase_auth/firebase_auth/android/local-config.gradle index f790702014d7..2a6a58f07e88 100644 --- a/packages/firebase_auth/firebase_auth/android/local-config.gradle +++ b/packages/firebase_auth/firebase_auth/android/local-config.gradle @@ -1,19 +1,6 @@ -def versionFile = file("generated_android_versions.txt") -def versionProps = new Properties() - -if (versionFile.exists()) { - versionFile.withInputStream { stream -> - versionProps.load(stream) - } -} else { - throw new GradleException("generated_android_versions.txt not found!") -} - ext { - compileSdk = versionProps['compileSdk'] as Integer - minSdk = versionProps['minSdk'] as Integer - targetSdk = versionProps['targetSdk'] as Integer - - def javaVerNum = versionProps['javaVersion'] as Integer - javaVersion = JavaVersion.toVersion(javaVerNum) -} + compileSdk=35 + minSdk=21 + targetSdk=35 + javaVersion = JavaVersion.toVersion(17) +} \ No newline at end of file diff --git a/packages/firebase_auth/firebase_auth/example/android/app/generated_android_versions.txt b/packages/firebase_auth/firebase_auth/example/android/app/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_auth/firebase_auth/example/android/app/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_core/firebase_core/android/generated_android_versions.txt b/packages/firebase_core/firebase_core/android/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_core/firebase_core/android/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_core/firebase_core/android/global-config.gradle b/packages/firebase_core/firebase_core/android/global-config.gradle new file mode 100644 index 000000000000..2a6a58f07e88 --- /dev/null +++ b/packages/firebase_core/firebase_core/android/global-config.gradle @@ -0,0 +1,6 @@ +ext { + compileSdk=35 + minSdk=21 + targetSdk=35 + javaVersion = JavaVersion.toVersion(17) +} \ No newline at end of file diff --git a/packages/firebase_core/firebase_core/android/global-config.txt b/packages/firebase_core/firebase_core/android/global-config.txt deleted file mode 100644 index 4b434611f002..000000000000 --- a/packages/firebase_core/firebase_core/android/global-config.txt +++ /dev/null @@ -1,4 +0,0 @@ -compileSdk=35 -minSdk=21 -targetSdk=35 -javaVersion=17 diff --git a/packages/firebase_core/firebase_core/android/local-config.gradle b/packages/firebase_core/firebase_core/android/local-config.gradle index f790702014d7..2a6a58f07e88 100644 --- a/packages/firebase_core/firebase_core/android/local-config.gradle +++ b/packages/firebase_core/firebase_core/android/local-config.gradle @@ -1,19 +1,6 @@ -def versionFile = file("generated_android_versions.txt") -def versionProps = new Properties() - -if (versionFile.exists()) { - versionFile.withInputStream { stream -> - versionProps.load(stream) - } -} else { - throw new GradleException("generated_android_versions.txt not found!") -} - ext { - compileSdk = versionProps['compileSdk'] as Integer - minSdk = versionProps['minSdk'] as Integer - targetSdk = versionProps['targetSdk'] as Integer - - def javaVerNum = versionProps['javaVersion'] as Integer - javaVersion = JavaVersion.toVersion(javaVerNum) -} + compileSdk=35 + minSdk=21 + targetSdk=35 + javaVersion = JavaVersion.toVersion(17) +} \ No newline at end of file diff --git a/packages/firebase_core/firebase_core/example/android/app/generated_android_versions.txt b/packages/firebase_core/firebase_core/example/android/app/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_core/firebase_core/example/android/app/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_crashlytics/firebase_crashlytics/android/generated_android_versions.txt b/packages/firebase_crashlytics/firebase_crashlytics/android/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_crashlytics/firebase_crashlytics/android/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_crashlytics/firebase_crashlytics/android/local-config.gradle b/packages/firebase_crashlytics/firebase_crashlytics/android/local-config.gradle index f790702014d7..2a6a58f07e88 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/android/local-config.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/android/local-config.gradle @@ -1,19 +1,6 @@ -def versionFile = file("generated_android_versions.txt") -def versionProps = new Properties() - -if (versionFile.exists()) { - versionFile.withInputStream { stream -> - versionProps.load(stream) - } -} else { - throw new GradleException("generated_android_versions.txt not found!") -} - ext { - compileSdk = versionProps['compileSdk'] as Integer - minSdk = versionProps['minSdk'] as Integer - targetSdk = versionProps['targetSdk'] as Integer - - def javaVerNum = versionProps['javaVersion'] as Integer - javaVersion = JavaVersion.toVersion(javaVerNum) -} + compileSdk=35 + minSdk=21 + targetSdk=35 + javaVersion = JavaVersion.toVersion(17) +} \ No newline at end of file diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/generated_android_versions.txt b/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_database/firebase_database/android/local-config.gradle b/packages/firebase_database/firebase_database/android/local-config.gradle index f790702014d7..2a6a58f07e88 100644 --- a/packages/firebase_database/firebase_database/android/local-config.gradle +++ b/packages/firebase_database/firebase_database/android/local-config.gradle @@ -1,19 +1,6 @@ -def versionFile = file("generated_android_versions.txt") -def versionProps = new Properties() - -if (versionFile.exists()) { - versionFile.withInputStream { stream -> - versionProps.load(stream) - } -} else { - throw new GradleException("generated_android_versions.txt not found!") -} - ext { - compileSdk = versionProps['compileSdk'] as Integer - minSdk = versionProps['minSdk'] as Integer - targetSdk = versionProps['targetSdk'] as Integer - - def javaVerNum = versionProps['javaVersion'] as Integer - javaVersion = JavaVersion.toVersion(javaVerNum) -} + compileSdk=35 + minSdk=21 + targetSdk=35 + javaVersion = JavaVersion.toVersion(17) +} \ No newline at end of file diff --git a/packages/firebase_database/firebase_database/example/android/app/generated_android_versions.txt b/packages/firebase_database/firebase_database/example/android/app/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_database/firebase_database/example/android/app/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/android/generated_android_versions.txt b/packages/firebase_dynamic_links/firebase_dynamic_links/android/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/android/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/android/local-config.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/android/local-config.gradle index f790702014d7..2a6a58f07e88 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/android/local-config.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/android/local-config.gradle @@ -1,19 +1,6 @@ -def versionFile = file("generated_android_versions.txt") -def versionProps = new Properties() - -if (versionFile.exists()) { - versionFile.withInputStream { stream -> - versionProps.load(stream) - } -} else { - throw new GradleException("generated_android_versions.txt not found!") -} - ext { - compileSdk = versionProps['compileSdk'] as Integer - minSdk = versionProps['minSdk'] as Integer - targetSdk = versionProps['targetSdk'] as Integer - - def javaVerNum = versionProps['javaVersion'] as Integer - javaVersion = JavaVersion.toVersion(javaVerNum) -} + compileSdk=35 + minSdk=21 + targetSdk=35 + javaVersion = JavaVersion.toVersion(17) +} \ No newline at end of file diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/generated_android_versions.txt b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/generated_android_versions.txt b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/local-config.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/local-config.gradle index f790702014d7..2a6a58f07e88 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/local-config.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/local-config.gradle @@ -1,19 +1,6 @@ -def versionFile = file("generated_android_versions.txt") -def versionProps = new Properties() - -if (versionFile.exists()) { - versionFile.withInputStream { stream -> - versionProps.load(stream) - } -} else { - throw new GradleException("generated_android_versions.txt not found!") -} - ext { - compileSdk = versionProps['compileSdk'] as Integer - minSdk = versionProps['minSdk'] as Integer - targetSdk = versionProps['targetSdk'] as Integer - - def javaVerNum = versionProps['javaVersion'] as Integer - javaVersion = JavaVersion.toVersion(javaVerNum) -} + compileSdk=35 + minSdk=21 + targetSdk=35 + javaVersion = JavaVersion.toVersion(17) +} \ No newline at end of file diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/generated_android_versions.txt b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_messaging/firebase_messaging/android/generated_android_versions.txt b/packages/firebase_messaging/firebase_messaging/android/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_messaging/firebase_messaging/android/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_messaging/firebase_messaging/android/local-config.gradle b/packages/firebase_messaging/firebase_messaging/android/local-config.gradle index 48f15b66cb43..2a6a58f07e88 100644 --- a/packages/firebase_messaging/firebase_messaging/android/local-config.gradle +++ b/packages/firebase_messaging/firebase_messaging/android/local-config.gradle @@ -1,20 +1,6 @@ -def versionFile = file("generated_android_versions.txt") -def versionProps = new Properties() - -if (versionFile.exists()) { - versionFile.withInputStream { stream -> - versionProps.load(stream) - } -} else { - throw new GradleException("generated_android_versions.txt not found!") -} - ext { - compileSdk = versionProps['compileSdk'] as Integer - minSdk = versionProps['minSdk'] as Integer - targetSdk = versionProps['targetSdk'] as Integer - - def javaVerNum = versionProps['javaVersion'] as Integer - javaVersion = JavaVersion.toVersion(javaVerNum) -} - + compileSdk=35 + minSdk=21 + targetSdk=35 + javaVersion = JavaVersion.toVersion(17) +} \ No newline at end of file diff --git a/packages/firebase_messaging/firebase_messaging/example/android/app/generated_android_versions.txt b/packages/firebase_messaging/firebase_messaging/example/android/app/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_messaging/firebase_messaging/example/android/app/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/generated_android_versions.txt b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/local-config.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/local-config.gradle index f790702014d7..2a6a58f07e88 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/local-config.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/local-config.gradle @@ -1,19 +1,6 @@ -def versionFile = file("generated_android_versions.txt") -def versionProps = new Properties() - -if (versionFile.exists()) { - versionFile.withInputStream { stream -> - versionProps.load(stream) - } -} else { - throw new GradleException("generated_android_versions.txt not found!") -} - ext { - compileSdk = versionProps['compileSdk'] as Integer - minSdk = versionProps['minSdk'] as Integer - targetSdk = versionProps['targetSdk'] as Integer - - def javaVerNum = versionProps['javaVersion'] as Integer - javaVersion = JavaVersion.toVersion(javaVerNum) -} + compileSdk=35 + minSdk=21 + targetSdk=35 + javaVersion = JavaVersion.toVersion(17) +} \ No newline at end of file diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/generated_android_versions.txt b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_performance/firebase_performance/android/generated_android_versions.txt b/packages/firebase_performance/firebase_performance/android/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_performance/firebase_performance/android/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_performance/firebase_performance/android/local-config.gradle b/packages/firebase_performance/firebase_performance/android/local-config.gradle index f790702014d7..2a6a58f07e88 100644 --- a/packages/firebase_performance/firebase_performance/android/local-config.gradle +++ b/packages/firebase_performance/firebase_performance/android/local-config.gradle @@ -1,19 +1,6 @@ -def versionFile = file("generated_android_versions.txt") -def versionProps = new Properties() - -if (versionFile.exists()) { - versionFile.withInputStream { stream -> - versionProps.load(stream) - } -} else { - throw new GradleException("generated_android_versions.txt not found!") -} - ext { - compileSdk = versionProps['compileSdk'] as Integer - minSdk = versionProps['minSdk'] as Integer - targetSdk = versionProps['targetSdk'] as Integer - - def javaVerNum = versionProps['javaVersion'] as Integer - javaVersion = JavaVersion.toVersion(javaVerNum) -} + compileSdk=35 + minSdk=21 + targetSdk=35 + javaVersion = JavaVersion.toVersion(17) +} \ No newline at end of file diff --git a/packages/firebase_performance/firebase_performance/example/android/app/generated_android_versions.txt b/packages/firebase_performance/firebase_performance/example/android/app/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_performance/firebase_performance/example/android/app/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_remote_config/firebase_remote_config/android/generated_android_versions.txt b/packages/firebase_remote_config/firebase_remote_config/android/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_remote_config/firebase_remote_config/android/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_remote_config/firebase_remote_config/android/local-config.gradle b/packages/firebase_remote_config/firebase_remote_config/android/local-config.gradle index f790702014d7..2a6a58f07e88 100644 --- a/packages/firebase_remote_config/firebase_remote_config/android/local-config.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/android/local-config.gradle @@ -1,19 +1,6 @@ -def versionFile = file("generated_android_versions.txt") -def versionProps = new Properties() - -if (versionFile.exists()) { - versionFile.withInputStream { stream -> - versionProps.load(stream) - } -} else { - throw new GradleException("generated_android_versions.txt not found!") -} - ext { - compileSdk = versionProps['compileSdk'] as Integer - minSdk = versionProps['minSdk'] as Integer - targetSdk = versionProps['targetSdk'] as Integer - - def javaVerNum = versionProps['javaVersion'] as Integer - javaVersion = JavaVersion.toVersion(javaVerNum) -} + compileSdk=35 + minSdk=21 + targetSdk=35 + javaVersion = JavaVersion.toVersion(17) +} \ No newline at end of file diff --git a/packages/firebase_remote_config/firebase_remote_config/example/android/app/generated_android_versions.txt b/packages/firebase_remote_config/firebase_remote_config/example/android/app/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_remote_config/firebase_remote_config/example/android/app/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_storage/firebase_storage/android/generated_android_versions.txt b/packages/firebase_storage/firebase_storage/android/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_storage/firebase_storage/android/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_storage/firebase_storage/android/local-config.gradle b/packages/firebase_storage/firebase_storage/android/local-config.gradle index f790702014d7..2a6a58f07e88 100644 --- a/packages/firebase_storage/firebase_storage/android/local-config.gradle +++ b/packages/firebase_storage/firebase_storage/android/local-config.gradle @@ -1,19 +1,6 @@ -def versionFile = file("generated_android_versions.txt") -def versionProps = new Properties() - -if (versionFile.exists()) { - versionFile.withInputStream { stream -> - versionProps.load(stream) - } -} else { - throw new GradleException("generated_android_versions.txt not found!") -} - ext { - compileSdk = versionProps['compileSdk'] as Integer - minSdk = versionProps['minSdk'] as Integer - targetSdk = versionProps['targetSdk'] as Integer - - def javaVerNum = versionProps['javaVersion'] as Integer - javaVersion = JavaVersion.toVersion(javaVerNum) -} + compileSdk=35 + minSdk=21 + targetSdk=35 + javaVersion = JavaVersion.toVersion(17) +} \ No newline at end of file diff --git a/packages/firebase_storage/firebase_storage/example/android/app/generated_android_versions.txt b/packages/firebase_storage/firebase_storage/example/android/app/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_storage/firebase_storage/example/android/app/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/scripts/generate_versions_gradle.dart b/scripts/generate_versions_gradle.dart index 0c9889a83b62..b3e4f6812a44 100644 --- a/scripts/generate_versions_gradle.dart +++ b/scripts/generate_versions_gradle.dart @@ -29,28 +29,28 @@ void main() async { .firstWhere((package) => package.name == 'firebase_core'); final globalConfig = File( - '${firebaseCorePackage.path}/android/global-config.txt', + '${firebaseCorePackage.path}/android/global-config.gradle', ); if (!globalConfig.existsSync()) { throw Exception( - 'global_config.txt file not found in the expected location.', + 'global_config.gradle file not found in the expected location.', ); } - final versions = getVersions(globalConfig); - for (final package in workspace.filteredPackages.values) { - final localConfigGradleFile = - File('${package.path}/android/local-config.gradle'); + // Skip firebase_data_connect and firebase_vertexai packages as they do not have gradle in them. + if (package.name == 'firebase_data_connect' || package.name == 'firebase_vertexai') { + continue; + } + else { + final localConfigGradleFilePath = '${package.path}/android/local-config.gradle'; - if (localConfigGradleFile.existsSync()) { - final packageVersionFile = - File('${package.path}/android/generated_android_versions.txt'); - packageVersionFile.writeAsStringSync(await versions); - final exampleAppVersionFile = File( - '${package.path}/example/android/app/generated_android_versions.txt'); - exampleAppVersionFile.writeAsStringSync(await versions); + final copiedConfig = await globalConfig.copy( + localConfigGradleFilePath, + ); + // ignore: avoid_print + print('File copied to: ${copiedConfig.path}'); } } } @@ -72,21 +72,3 @@ Future getMelosWorkspace() async { return workspace; } - -Future getVersions(File globalConfig) async { - if (globalConfig.existsSync()) { - final contents = globalConfig.readAsStringSync(); - final lines = contents.split('\n'); - final javaVersion = - lines.firstWhere((line) => line.contains('javaVersion')); - final compileSdkVersion = - lines.firstWhere((line) => line.contains('compileSdk')); - final minSdkVersion = - lines.firstWhere((line) => line.contains('minSdk')); - final targetSdkVersion = - lines.firstWhere((line) => line.contains('targetSdk')); - - return '$javaVersion\n$compileSdkVersion\n$minSdkVersion\n$targetSdkVersion'; - } - throw Exception('global-config.txt file has wrong format or something missing.'); -} From 06f4498d38f324c2304f03c32672b8260cbf7ebe Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Thu, 17 Apr 2025 14:57:17 +0100 Subject: [PATCH 13/29] fix: change path of global-config --- .../android => gradle}/global-config.gradle | 0 .../app/generated_android_versions.txt | 4 --- .../app/generated_android_versions.txt | 4 --- .../example/android/app/local-config.gradle | 23 ++++------------ scripts/generate_versions_gradle.dart | 26 ++++++++++++++----- 5 files changed, 24 insertions(+), 33 deletions(-) rename {packages/firebase_core/firebase_core/android => gradle}/global-config.gradle (100%) delete mode 100644 packages/cloud_firestore/cloud_firestore/example/android/app/generated_android_versions.txt delete mode 100644 packages/firebase_data_connect/firebase_data_connect/example/android/app/generated_android_versions.txt diff --git a/packages/firebase_core/firebase_core/android/global-config.gradle b/gradle/global-config.gradle similarity index 100% rename from packages/firebase_core/firebase_core/android/global-config.gradle rename to gradle/global-config.gradle diff --git a/packages/cloud_firestore/cloud_firestore/example/android/app/generated_android_versions.txt b/packages/cloud_firestore/cloud_firestore/example/android/app/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/cloud_firestore/cloud_firestore/example/android/app/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_data_connect/firebase_data_connect/example/android/app/generated_android_versions.txt b/packages/firebase_data_connect/firebase_data_connect/example/android/app/generated_android_versions.txt deleted file mode 100644 index 4b434611f002..000000000000 --- a/packages/firebase_data_connect/firebase_data_connect/example/android/app/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -compileSdk=35 -minSdk=21 -targetSdk=35 -javaVersion=17 diff --git a/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle b/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle index f790702014d7..2a6a58f07e88 100644 --- a/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle +++ b/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle @@ -1,19 +1,6 @@ -def versionFile = file("generated_android_versions.txt") -def versionProps = new Properties() - -if (versionFile.exists()) { - versionFile.withInputStream { stream -> - versionProps.load(stream) - } -} else { - throw new GradleException("generated_android_versions.txt not found!") -} - ext { - compileSdk = versionProps['compileSdk'] as Integer - minSdk = versionProps['minSdk'] as Integer - targetSdk = versionProps['targetSdk'] as Integer - - def javaVerNum = versionProps['javaVersion'] as Integer - javaVersion = JavaVersion.toVersion(javaVerNum) -} + compileSdk=35 + minSdk=21 + targetSdk=35 + javaVersion = JavaVersion.toVersion(17) +} \ No newline at end of file diff --git a/scripts/generate_versions_gradle.dart b/scripts/generate_versions_gradle.dart index b3e4f6812a44..c3748a36f0ec 100644 --- a/scripts/generate_versions_gradle.dart +++ b/scripts/generate_versions_gradle.dart @@ -16,7 +16,7 @@ import 'package:melos/melos.dart' as melos; import 'package:glob/glob.dart'; import 'dart:io'; import 'package:cli_util/cli_logging.dart' as logging; -import 'package:path/path.dart' as path; +import 'package:path/path.dart' show joinAll; // Used to generate a simple txt file for local-config.gradle files to parse in order to use correct java and compilation versions. @@ -25,12 +25,15 @@ void main() async { // get version from core // To edit versions for all packages, edit the global-config.txt file in firebase_core package // located in the android folder for global-config.txt - final firebaseCorePackage = workspace.filteredPackages.values - .firstWhere((package) => package.name == 'firebase_core'); - - final globalConfig = File( - '${firebaseCorePackage.path}/android/global-config.gradle', + final globalConfigPath = joinAll( + [ + Directory.current.path, + 'gradle', + 'global-config.gradle', + ], ); + + final globalConfig = File(globalConfigPath); if (!globalConfig.existsSync()) { throw Exception( @@ -40,7 +43,16 @@ void main() async { for (final package in workspace.filteredPackages.values) { // Skip firebase_data_connect and firebase_vertexai packages as they do not have gradle in them. - if (package.name == 'firebase_data_connect' || package.name == 'firebase_vertexai') { + if (package.name == 'firebase_vertexai') { + continue; + } + else if (package.name == 'firebase_data_connect') { + final localConfigGradleFilePath = '${package.path}/example/android/app/local-config.gradle'; + final copiedConfig = await globalConfig.copy( + localConfigGradleFilePath, + ); + // ignore: avoid_print + print('File copied to: ${copiedConfig.path}'); continue; } else { From 84b2f868a35748082250274ce88fd3012eafa97e Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Thu, 17 Apr 2025 15:05:46 +0100 Subject: [PATCH 14/29] chore: specific handling for auth --- gradle/auth-global-config.gradle | 6 ++ .../example/android/app/local-config.gradle | 2 +- scripts/generate_versions_gradle.dart | 59 ++++++++++++------- 3 files changed, 46 insertions(+), 21 deletions(-) create mode 100644 gradle/auth-global-config.gradle diff --git a/gradle/auth-global-config.gradle b/gradle/auth-global-config.gradle new file mode 100644 index 000000000000..1de8c2a2a47b --- /dev/null +++ b/gradle/auth-global-config.gradle @@ -0,0 +1,6 @@ +ext { + compileSdk=35 + minSdk=23 + targetSdk=35 + javaVersion = JavaVersion.toVersion(17) +} \ No newline at end of file diff --git a/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle b/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle index 2a6a58f07e88..1de8c2a2a47b 100644 --- a/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle +++ b/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle @@ -1,6 +1,6 @@ ext { compileSdk=35 - minSdk=21 + minSdk=23 targetSdk=35 javaVersion = JavaVersion.toVersion(17) } \ No newline at end of file diff --git a/scripts/generate_versions_gradle.dart b/scripts/generate_versions_gradle.dart index c3748a36f0ec..e7a0e43ea46a 100644 --- a/scripts/generate_versions_gradle.dart +++ b/scripts/generate_versions_gradle.dart @@ -33,7 +33,16 @@ void main() async { ], ); + final authConfigPath = joinAll( + [ + Directory.current.path, + 'gradle', + 'auth-global-config.gradle', + ], + ); + final globalConfig = File(globalConfigPath); + final authConfig = File(authConfigPath); if (!globalConfig.existsSync()) { throw Exception( @@ -42,27 +51,37 @@ void main() async { } for (final package in workspace.filteredPackages.values) { - // Skip firebase_data_connect and firebase_vertexai packages as they do not have gradle in them. - if (package.name == 'firebase_vertexai') { - continue; - } - else if (package.name == 'firebase_data_connect') { - final localConfigGradleFilePath = '${package.path}/example/android/app/local-config.gradle'; - final copiedConfig = await globalConfig.copy( - localConfigGradleFilePath, - ); - // ignore: avoid_print - print('File copied to: ${copiedConfig.path}'); - continue; - } - else { - final localConfigGradleFilePath = '${package.path}/android/local-config.gradle'; + switch (package.name) { + case 'firebase_vertexai': + // Skip this package as it does not have gradle in it. + break; + case 'firebase_data_connect': + // Only has gradle in the example application. + final localConfigGradleFilePath = '${package.path}/example/android/app/local-config.gradle'; + final copiedConfig = await authConfig.copy( + localConfigGradleFilePath, + ); + // ignore: avoid_print + print('File copied to: ${copiedConfig.path}'); + break; + case 'firebase_auth': + // Needs minimum compile sdk verstion to 23. + final localConfigGradleFilePath = '${package.path}/android/local-config.gradle'; + final copiedConfig = await globalConfig.copy( + localConfigGradleFilePath, + ); + // ignore: avoid_print + print('File copied to: ${copiedConfig.path}'); + break; + default: + // For all other packages, copy the global-config.gradle file to the local-config.gradle file. + final localConfigGradleFilePath = '${package.path}/android/local-config.gradle'; - final copiedConfig = await globalConfig.copy( - localConfigGradleFilePath, - ); - // ignore: avoid_print - print('File copied to: ${copiedConfig.path}'); + final copiedConfig = await globalConfig.copy( + localConfigGradleFilePath, + ); + // ignore: avoid_print + print('File copied to: ${copiedConfig.path}'); } } } From 537e480e54712ee995a5eced142434fe94d88db1 Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Thu, 17 Apr 2025 15:07:20 +0100 Subject: [PATCH 15/29] fix: revert melos.yaml change --- melos.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/melos.yaml b/melos.yaml index 60f0ae2d0cb0..a04e3758f5e5 100644 --- a/melos.yaml +++ b/melos.yaml @@ -20,7 +20,6 @@ command: dart run scripts/generate_vertexai_version.dart && \ dart run scripts/generate_dataconnect_version.dart && \ dart run scripts/generate_versions_spm.dart && \ - dart run scripts/generate_versions_gradle.dart && \ git add packages/firebase_vertexai/firebase_vertexai/lib/src/vertex_version.dart && \ git add packages/firebase_data_connect/firebase_data_connect/lib/src/dataconnect_version.dart post: | From 3f57b8aec93a916302c62905b86377d28cc5cafb Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Thu, 17 Apr 2025 15:08:15 +0100 Subject: [PATCH 16/29] chore: more meaningful comment --- scripts/generate_versions_gradle.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generate_versions_gradle.dart b/scripts/generate_versions_gradle.dart index e7a0e43ea46a..2231b1908b8b 100644 --- a/scripts/generate_versions_gradle.dart +++ b/scripts/generate_versions_gradle.dart @@ -65,7 +65,7 @@ void main() async { print('File copied to: ${copiedConfig.path}'); break; case 'firebase_auth': - // Needs minimum compile sdk verstion to 23. + // Needs minimum compile sdk verstion to 23 specifically for this package. final localConfigGradleFilePath = '${package.path}/android/local-config.gradle'; final copiedConfig = await globalConfig.copy( localConfigGradleFilePath, From 84d3c01fac91f0c576ccfebfd79ada0db1467202 Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Thu, 17 Apr 2025 15:14:37 +0100 Subject: [PATCH 17/29] chore: match android-sdk versions --- gradle/auth-global-config.gradle | 4 ++-- gradle/global-config.gradle | 4 ++-- .../cloud_firestore/android/local-config.gradle | 4 ++-- .../cloud_functions/android/local-config.gradle | 4 ++-- .../firebase_analytics/android/local-config.gradle | 4 ++-- .../firebase_app_check/android/local-config.gradle | 4 ++-- .../firebase_app_installations/android/local-config.gradle | 4 ++-- .../firebase_auth/firebase_auth/android/local-config.gradle | 4 ++-- .../firebase_core/firebase_core/android/local-config.gradle | 4 ++-- .../firebase_crashlytics/android/local-config.gradle | 4 ++-- .../example/android/app/local-config.gradle | 4 ++-- .../firebase_database/android/local-config.gradle | 4 ++-- .../firebase_dynamic_links/android/local-config.gradle | 4 ++-- .../firebase_in_app_messaging/android/local-config.gradle | 4 ++-- .../firebase_messaging/android/local-config.gradle | 4 ++-- .../firebase_ml_model_downloader/android/local-config.gradle | 4 ++-- .../firebase_performance/android/local-config.gradle | 4 ++-- .../firebase_remote_config/android/local-config.gradle | 4 ++-- .../firebase_storage/android/local-config.gradle | 4 ++-- 19 files changed, 38 insertions(+), 38 deletions(-) diff --git a/gradle/auth-global-config.gradle b/gradle/auth-global-config.gradle index 1de8c2a2a47b..6ab6277fe5e3 100644 --- a/gradle/auth-global-config.gradle +++ b/gradle/auth-global-config.gradle @@ -1,6 +1,6 @@ ext { - compileSdk=35 + compileSdk=34 minSdk=23 - targetSdk=35 + targetSdk=34 javaVersion = JavaVersion.toVersion(17) } \ No newline at end of file diff --git a/gradle/global-config.gradle b/gradle/global-config.gradle index 2a6a58f07e88..1a2ef0c3bede 100644 --- a/gradle/global-config.gradle +++ b/gradle/global-config.gradle @@ -1,6 +1,6 @@ ext { - compileSdk=35 + compileSdk=34 minSdk=21 - targetSdk=35 + targetSdk=34 javaVersion = JavaVersion.toVersion(17) } \ No newline at end of file diff --git a/packages/cloud_firestore/cloud_firestore/android/local-config.gradle b/packages/cloud_firestore/cloud_firestore/android/local-config.gradle index 2a6a58f07e88..1a2ef0c3bede 100644 --- a/packages/cloud_firestore/cloud_firestore/android/local-config.gradle +++ b/packages/cloud_firestore/cloud_firestore/android/local-config.gradle @@ -1,6 +1,6 @@ ext { - compileSdk=35 + compileSdk=34 minSdk=21 - targetSdk=35 + targetSdk=34 javaVersion = JavaVersion.toVersion(17) } \ No newline at end of file diff --git a/packages/cloud_functions/cloud_functions/android/local-config.gradle b/packages/cloud_functions/cloud_functions/android/local-config.gradle index 2a6a58f07e88..1a2ef0c3bede 100644 --- a/packages/cloud_functions/cloud_functions/android/local-config.gradle +++ b/packages/cloud_functions/cloud_functions/android/local-config.gradle @@ -1,6 +1,6 @@ ext { - compileSdk=35 + compileSdk=34 minSdk=21 - targetSdk=35 + targetSdk=34 javaVersion = JavaVersion.toVersion(17) } \ No newline at end of file diff --git a/packages/firebase_analytics/firebase_analytics/android/local-config.gradle b/packages/firebase_analytics/firebase_analytics/android/local-config.gradle index 2a6a58f07e88..1a2ef0c3bede 100644 --- a/packages/firebase_analytics/firebase_analytics/android/local-config.gradle +++ b/packages/firebase_analytics/firebase_analytics/android/local-config.gradle @@ -1,6 +1,6 @@ ext { - compileSdk=35 + compileSdk=34 minSdk=21 - targetSdk=35 + targetSdk=34 javaVersion = JavaVersion.toVersion(17) } \ No newline at end of file diff --git a/packages/firebase_app_check/firebase_app_check/android/local-config.gradle b/packages/firebase_app_check/firebase_app_check/android/local-config.gradle index 2a6a58f07e88..1a2ef0c3bede 100644 --- a/packages/firebase_app_check/firebase_app_check/android/local-config.gradle +++ b/packages/firebase_app_check/firebase_app_check/android/local-config.gradle @@ -1,6 +1,6 @@ ext { - compileSdk=35 + compileSdk=34 minSdk=21 - targetSdk=35 + targetSdk=34 javaVersion = JavaVersion.toVersion(17) } \ No newline at end of file diff --git a/packages/firebase_app_installations/firebase_app_installations/android/local-config.gradle b/packages/firebase_app_installations/firebase_app_installations/android/local-config.gradle index 2a6a58f07e88..1a2ef0c3bede 100644 --- a/packages/firebase_app_installations/firebase_app_installations/android/local-config.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/android/local-config.gradle @@ -1,6 +1,6 @@ ext { - compileSdk=35 + compileSdk=34 minSdk=21 - targetSdk=35 + targetSdk=34 javaVersion = JavaVersion.toVersion(17) } \ No newline at end of file diff --git a/packages/firebase_auth/firebase_auth/android/local-config.gradle b/packages/firebase_auth/firebase_auth/android/local-config.gradle index 2a6a58f07e88..1a2ef0c3bede 100644 --- a/packages/firebase_auth/firebase_auth/android/local-config.gradle +++ b/packages/firebase_auth/firebase_auth/android/local-config.gradle @@ -1,6 +1,6 @@ ext { - compileSdk=35 + compileSdk=34 minSdk=21 - targetSdk=35 + targetSdk=34 javaVersion = JavaVersion.toVersion(17) } \ No newline at end of file diff --git a/packages/firebase_core/firebase_core/android/local-config.gradle b/packages/firebase_core/firebase_core/android/local-config.gradle index 2a6a58f07e88..1a2ef0c3bede 100644 --- a/packages/firebase_core/firebase_core/android/local-config.gradle +++ b/packages/firebase_core/firebase_core/android/local-config.gradle @@ -1,6 +1,6 @@ ext { - compileSdk=35 + compileSdk=34 minSdk=21 - targetSdk=35 + targetSdk=34 javaVersion = JavaVersion.toVersion(17) } \ No newline at end of file diff --git a/packages/firebase_crashlytics/firebase_crashlytics/android/local-config.gradle b/packages/firebase_crashlytics/firebase_crashlytics/android/local-config.gradle index 2a6a58f07e88..1a2ef0c3bede 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/android/local-config.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/android/local-config.gradle @@ -1,6 +1,6 @@ ext { - compileSdk=35 + compileSdk=34 minSdk=21 - targetSdk=35 + targetSdk=34 javaVersion = JavaVersion.toVersion(17) } \ No newline at end of file diff --git a/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle b/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle index 1de8c2a2a47b..6ab6277fe5e3 100644 --- a/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle +++ b/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle @@ -1,6 +1,6 @@ ext { - compileSdk=35 + compileSdk=34 minSdk=23 - targetSdk=35 + targetSdk=34 javaVersion = JavaVersion.toVersion(17) } \ No newline at end of file diff --git a/packages/firebase_database/firebase_database/android/local-config.gradle b/packages/firebase_database/firebase_database/android/local-config.gradle index 2a6a58f07e88..1a2ef0c3bede 100644 --- a/packages/firebase_database/firebase_database/android/local-config.gradle +++ b/packages/firebase_database/firebase_database/android/local-config.gradle @@ -1,6 +1,6 @@ ext { - compileSdk=35 + compileSdk=34 minSdk=21 - targetSdk=35 + targetSdk=34 javaVersion = JavaVersion.toVersion(17) } \ No newline at end of file diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/android/local-config.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/android/local-config.gradle index 2a6a58f07e88..1a2ef0c3bede 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/android/local-config.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/android/local-config.gradle @@ -1,6 +1,6 @@ ext { - compileSdk=35 + compileSdk=34 minSdk=21 - targetSdk=35 + targetSdk=34 javaVersion = JavaVersion.toVersion(17) } \ No newline at end of file diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/local-config.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/local-config.gradle index 2a6a58f07e88..1a2ef0c3bede 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/local-config.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/local-config.gradle @@ -1,6 +1,6 @@ ext { - compileSdk=35 + compileSdk=34 minSdk=21 - targetSdk=35 + targetSdk=34 javaVersion = JavaVersion.toVersion(17) } \ No newline at end of file diff --git a/packages/firebase_messaging/firebase_messaging/android/local-config.gradle b/packages/firebase_messaging/firebase_messaging/android/local-config.gradle index 2a6a58f07e88..1a2ef0c3bede 100644 --- a/packages/firebase_messaging/firebase_messaging/android/local-config.gradle +++ b/packages/firebase_messaging/firebase_messaging/android/local-config.gradle @@ -1,6 +1,6 @@ ext { - compileSdk=35 + compileSdk=34 minSdk=21 - targetSdk=35 + targetSdk=34 javaVersion = JavaVersion.toVersion(17) } \ No newline at end of file diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/local-config.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/local-config.gradle index 2a6a58f07e88..1a2ef0c3bede 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/local-config.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/local-config.gradle @@ -1,6 +1,6 @@ ext { - compileSdk=35 + compileSdk=34 minSdk=21 - targetSdk=35 + targetSdk=34 javaVersion = JavaVersion.toVersion(17) } \ No newline at end of file diff --git a/packages/firebase_performance/firebase_performance/android/local-config.gradle b/packages/firebase_performance/firebase_performance/android/local-config.gradle index 2a6a58f07e88..1a2ef0c3bede 100644 --- a/packages/firebase_performance/firebase_performance/android/local-config.gradle +++ b/packages/firebase_performance/firebase_performance/android/local-config.gradle @@ -1,6 +1,6 @@ ext { - compileSdk=35 + compileSdk=34 minSdk=21 - targetSdk=35 + targetSdk=34 javaVersion = JavaVersion.toVersion(17) } \ No newline at end of file diff --git a/packages/firebase_remote_config/firebase_remote_config/android/local-config.gradle b/packages/firebase_remote_config/firebase_remote_config/android/local-config.gradle index 2a6a58f07e88..1a2ef0c3bede 100644 --- a/packages/firebase_remote_config/firebase_remote_config/android/local-config.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/android/local-config.gradle @@ -1,6 +1,6 @@ ext { - compileSdk=35 + compileSdk=34 minSdk=21 - targetSdk=35 + targetSdk=34 javaVersion = JavaVersion.toVersion(17) } \ No newline at end of file diff --git a/packages/firebase_storage/firebase_storage/android/local-config.gradle b/packages/firebase_storage/firebase_storage/android/local-config.gradle index 2a6a58f07e88..1a2ef0c3bede 100644 --- a/packages/firebase_storage/firebase_storage/android/local-config.gradle +++ b/packages/firebase_storage/firebase_storage/android/local-config.gradle @@ -1,6 +1,6 @@ ext { - compileSdk=35 + compileSdk=34 minSdk=21 - targetSdk=35 + targetSdk=34 javaVersion = JavaVersion.toVersion(17) } \ No newline at end of file From 51f9e280fb6db6248fa390b2883b9c9328b15cba Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Wed, 23 Apr 2025 12:56:11 +0100 Subject: [PATCH 18/29] fix: support gradle --- gradle/auth-global-config.gradle | 1 + gradle/global-config.gradle | 1 + .../cloud_firestore/android/build.gradle | 7 +++--- .../android/local-config.gradle | 1 + .../cloud_functions/android/build.gradle | 8 +++---- .../android/local-config.gradle | 1 + .../firebase_analytics/android/build.gradle | 8 +++---- .../android/local-config.gradle | 1 + .../firebase_app_check/android/build.gradle | 8 +++---- .../android/local-config.gradle | 1 + .../android/build.gradle | 8 +++---- .../android/local-config.gradle | 1 + .../firebase_auth/android/build.gradle | 8 +++---- .../firebase_auth/android/local-config.gradle | 1 + .../firebase_core/android/build.gradle | 9 ++++---- .../firebase_core/android/local-config.gradle | 1 + .../firebase_crashlytics/android/build.gradle | 8 +++---- .../android/local-config.gradle | 1 + .../example/android/app/local-config.gradle | 1 + .../firebase_database/android/build.gradle | 8 +++---- .../android/generated_android_versions.txt | 4 ---- .../android/local-config.gradle | 1 + .../android/build.gradle | 8 +++---- .../android/local-config.gradle | 1 + .../android/build.gradle | 8 +++---- .../android/local-config.gradle | 1 + .../firebase_messaging/android/build.gradle | 9 ++++---- .../android/local-config.gradle | 1 + .../android/build.gradle | 8 +++---- .../android/local-config.gradle | 1 + .../firebase_performance/android/build.gradle | 8 +++---- .../android/local-config.gradle | 1 + .../android/build.gradle | 8 +++---- .../android/local-config.gradle | 1 + .../firebase_storage/android/build.gradle | 8 +++---- .../android/local-config.gradle | 1 + .../app/generated_android_versions.txt | 4 ---- tests/android/app/local-config.gradle | 23 ++++--------------- 38 files changed, 88 insertions(+), 91 deletions(-) delete mode 100644 packages/firebase_database/firebase_database/android/generated_android_versions.txt delete mode 100644 tests/android/app/generated_android_versions.txt diff --git a/gradle/auth-global-config.gradle b/gradle/auth-global-config.gradle index 6ab6277fe5e3..b25bf60d9e5e 100644 --- a/gradle/auth-global-config.gradle +++ b/gradle/auth-global-config.gradle @@ -3,4 +3,5 @@ ext { minSdk=23 targetSdk=34 javaVersion = JavaVersion.toVersion(17) + androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' } \ No newline at end of file diff --git a/gradle/global-config.gradle b/gradle/global-config.gradle index 1a2ef0c3bede..884c2728ec74 100644 --- a/gradle/global-config.gradle +++ b/gradle/global-config.gradle @@ -3,4 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) + androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' } \ No newline at end of file diff --git a/packages/cloud_firestore/cloud_firestore/android/build.gradle b/packages/cloud_firestore/cloud_firestore/android/build.gradle index 5014ba33f023..27417e0651cb 100755 --- a/packages/cloud_firestore/cloud_firestore/android/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/android/build.gradle @@ -1,6 +1,9 @@ group 'io.flutter.plugins.firebase.cloudfirestore' version '1.0-SNAPSHOT' +apply plugin: 'com.android.library' +apply from: file("local-config.gradle") + buildscript { repositories { google() @@ -8,7 +11,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.1' + classpath androidGradlePluginVersion } } @@ -19,8 +22,6 @@ allprojects { } } -apply plugin: 'com.android.library' -apply from: file("local-config.gradle") def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { diff --git a/packages/cloud_firestore/cloud_firestore/android/local-config.gradle b/packages/cloud_firestore/cloud_firestore/android/local-config.gradle index 1a2ef0c3bede..884c2728ec74 100644 --- a/packages/cloud_firestore/cloud_firestore/android/local-config.gradle +++ b/packages/cloud_firestore/cloud_firestore/android/local-config.gradle @@ -3,4 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) + androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' } \ No newline at end of file diff --git a/packages/cloud_functions/cloud_functions/android/build.gradle b/packages/cloud_functions/cloud_functions/android/build.gradle index adfcc5aee310..c55e2d9c2b03 100644 --- a/packages/cloud_functions/cloud_functions/android/build.gradle +++ b/packages/cloud_functions/cloud_functions/android/build.gradle @@ -1,6 +1,9 @@ group 'io.flutter.plugins.firebase.cloudfunctions' version '1.0-SNAPSHOT' +apply plugin: 'com.android.library' +apply from: file("local-config.gradle") + buildscript { repositories { google() @@ -8,7 +11,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.1' + classpath androidGradlePluginVersion } } @@ -19,9 +22,6 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' -apply from: file("local-config.gradle") - def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { throw new GradleException('Could not find the firebase_core FlutterFire plugin, have you added it as a dependency in your pubspec?') diff --git a/packages/cloud_functions/cloud_functions/android/local-config.gradle b/packages/cloud_functions/cloud_functions/android/local-config.gradle index 1a2ef0c3bede..884c2728ec74 100644 --- a/packages/cloud_functions/cloud_functions/android/local-config.gradle +++ b/packages/cloud_functions/cloud_functions/android/local-config.gradle @@ -3,4 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) + androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' } \ No newline at end of file diff --git a/packages/firebase_analytics/firebase_analytics/android/build.gradle b/packages/firebase_analytics/firebase_analytics/android/build.gradle index 2b2fe853d229..ab8b2b0d04d6 100755 --- a/packages/firebase_analytics/firebase_analytics/android/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/android/build.gradle @@ -1,6 +1,9 @@ group 'io.flutter.plugins.firebase.analytics' version '1.0-SNAPSHOT' +apply plugin: 'com.android.library' +apply from: file("local-config.gradle") + buildscript { repositories { google() @@ -8,7 +11,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.1' + classpath androidGradlePluginVersion } } @@ -19,9 +22,6 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' -apply from: file("local-config.gradle") - def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { throw new GradleException('Could not find the firebase_core FlutterFire plugin, have you added it as a dependency in your pubspec?') diff --git a/packages/firebase_analytics/firebase_analytics/android/local-config.gradle b/packages/firebase_analytics/firebase_analytics/android/local-config.gradle index 1a2ef0c3bede..884c2728ec74 100644 --- a/packages/firebase_analytics/firebase_analytics/android/local-config.gradle +++ b/packages/firebase_analytics/firebase_analytics/android/local-config.gradle @@ -3,4 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) + androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' } \ No newline at end of file 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 c069b42ae5a8..875f44c55da6 100644 --- a/packages/firebase_app_check/firebase_app_check/android/build.gradle +++ b/packages/firebase_app_check/firebase_app_check/android/build.gradle @@ -1,6 +1,9 @@ group 'io.flutter.plugins.firebase.appcheck' version '1.0-SNAPSHOT' +apply plugin: 'com.android.library' +apply from: file("local-config.gradle") + buildscript { repositories { google() @@ -8,7 +11,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.1' + classpath androidGradlePluginVersion } } @@ -19,9 +22,6 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' -apply from: file("local-config.gradle") - def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { throw new GradleException('Could not find the firebase_core FlutterFire plugin, have you added it as a dependency in your pubspec?') diff --git a/packages/firebase_app_check/firebase_app_check/android/local-config.gradle b/packages/firebase_app_check/firebase_app_check/android/local-config.gradle index 1a2ef0c3bede..884c2728ec74 100644 --- a/packages/firebase_app_check/firebase_app_check/android/local-config.gradle +++ b/packages/firebase_app_check/firebase_app_check/android/local-config.gradle @@ -3,4 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) + androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' } \ No newline at end of file diff --git a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle index 31ce8e99b165..0986294e9716 100644 --- a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle @@ -1,6 +1,9 @@ group 'io.flutter.plugins.firebase.installations.firebase_app_installations' version '1.0' +apply plugin: 'com.android.library' +apply from: file("local-config.gradle") + buildscript { repositories { google() @@ -8,7 +11,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.1' + classpath androidGradlePluginVersion } } @@ -19,9 +22,6 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' -apply from: file("local-config.gradle") - def firebaseCoreProject = rootProject.subprojects.find { it.name == "firebase_core" } if (firebaseCoreProject == null) { throw new GradleException('Could not find the firebase_core FlutterFire plugin, have you added it as a dependency in your pubspec?') diff --git a/packages/firebase_app_installations/firebase_app_installations/android/local-config.gradle b/packages/firebase_app_installations/firebase_app_installations/android/local-config.gradle index 1a2ef0c3bede..884c2728ec74 100644 --- a/packages/firebase_app_installations/firebase_app_installations/android/local-config.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/android/local-config.gradle @@ -3,4 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) + androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' } \ No newline at end of file diff --git a/packages/firebase_auth/firebase_auth/android/build.gradle b/packages/firebase_auth/firebase_auth/android/build.gradle index 4182a1877d57..7fcc7346aa4a 100755 --- a/packages/firebase_auth/firebase_auth/android/build.gradle +++ b/packages/firebase_auth/firebase_auth/android/build.gradle @@ -1,6 +1,9 @@ group 'io.flutter.plugins.firebase.auth' version '1.0-SNAPSHOT' +apply plugin: 'com.android.library' +apply from: file("local-config.gradle") + buildscript { repositories { google() @@ -8,7 +11,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.1' + classpath androidGradlePluginVersion } } @@ -32,9 +35,6 @@ def getRootProjectExtOrCoreProperty(name, firebaseCoreProject) { return rootProject.ext.get('FlutterFire').get(name) } -apply plugin: 'com.android.library' -apply from: file("local-config.gradle") - android { // Conditional for compatibility with AGP <4.2. if (project.android.hasProperty("namespace")) { diff --git a/packages/firebase_auth/firebase_auth/android/local-config.gradle b/packages/firebase_auth/firebase_auth/android/local-config.gradle index 1a2ef0c3bede..884c2728ec74 100644 --- a/packages/firebase_auth/firebase_auth/android/local-config.gradle +++ b/packages/firebase_auth/firebase_auth/android/local-config.gradle @@ -3,4 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) + androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' } \ No newline at end of file diff --git a/packages/firebase_core/firebase_core/android/build.gradle b/packages/firebase_core/firebase_core/android/build.gradle index 7153fdb33e41..5d229cc373fe 100644 --- a/packages/firebase_core/firebase_core/android/build.gradle +++ b/packages/firebase_core/firebase_core/android/build.gradle @@ -1,6 +1,9 @@ group 'io.flutter.plugins.firebase.core' version '1.0-SNAPSHOT' +apply plugin: 'com.android.library' +apply from: file("local-config.gradle") + buildscript { repositories { google() @@ -8,14 +11,10 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.1' + classpath androidGradlePluginVersion } } -apply plugin: 'com.android.library' -apply from: file("local-config.gradle") - - def getRootProjectExtOrDefaultProperty(name) { if (!rootProject.ext.has("FlutterFire")) return project.properties[name] if (!rootProject.ext.get("FlutterFire")[name]) return project.properties[name] diff --git a/packages/firebase_core/firebase_core/android/local-config.gradle b/packages/firebase_core/firebase_core/android/local-config.gradle index 1a2ef0c3bede..884c2728ec74 100644 --- a/packages/firebase_core/firebase_core/android/local-config.gradle +++ b/packages/firebase_core/firebase_core/android/local-config.gradle @@ -3,4 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) + androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' } \ No newline at end of file diff --git a/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle b/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle index 4b0a786198bd..f22cfc4f1dec 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle @@ -1,6 +1,9 @@ group 'io.flutter.plugins.firebase.crashlytics' version '1.0-SNAPSHOT' +apply plugin: 'com.android.library' +apply from: file("local-config.gradle") + buildscript { repositories { google() @@ -8,7 +11,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.1' + classpath androidGradlePluginVersion } } @@ -19,9 +22,6 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' -apply from: file("local-config.gradle") - def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { throw new GradleException('Could not find the firebase_core FlutterFire plugin, have you added it as a dependency in your pubspec?') diff --git a/packages/firebase_crashlytics/firebase_crashlytics/android/local-config.gradle b/packages/firebase_crashlytics/firebase_crashlytics/android/local-config.gradle index 1a2ef0c3bede..884c2728ec74 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/android/local-config.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/android/local-config.gradle @@ -3,4 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) + androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' } \ No newline at end of file diff --git a/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle b/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle index 6ab6277fe5e3..b25bf60d9e5e 100644 --- a/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle +++ b/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle @@ -3,4 +3,5 @@ ext { minSdk=23 targetSdk=34 javaVersion = JavaVersion.toVersion(17) + androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' } \ No newline at end of file diff --git a/packages/firebase_database/firebase_database/android/build.gradle b/packages/firebase_database/firebase_database/android/build.gradle index 33f999a32cca..b7adebeaace1 100755 --- a/packages/firebase_database/firebase_database/android/build.gradle +++ b/packages/firebase_database/firebase_database/android/build.gradle @@ -1,6 +1,9 @@ group 'io.flutter.plugins.firebase.database' version '1.0-SNAPSHOT' +apply plugin: 'com.android.library' +apply from: file("local-config.gradle") + buildscript { repositories { google() @@ -8,7 +11,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.1' + classpath androidGradlePluginVersion } } @@ -19,9 +22,6 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' -apply from: file("local-config.gradle") - def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { throw new GradleException('Could not find the firebase_core FlutterFire plugin, have you added it as a dependency in your pubspec?') diff --git a/packages/firebase_database/firebase_database/android/generated_android_versions.txt b/packages/firebase_database/firebase_database/android/generated_android_versions.txt deleted file mode 100644 index bff2c7c48b92..000000000000 --- a/packages/firebase_database/firebase_database/android/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -javaVersion=17 -compileSdk=35 -minSdk=21 -targetSdk=35 \ No newline at end of file diff --git a/packages/firebase_database/firebase_database/android/local-config.gradle b/packages/firebase_database/firebase_database/android/local-config.gradle index 1a2ef0c3bede..884c2728ec74 100644 --- a/packages/firebase_database/firebase_database/android/local-config.gradle +++ b/packages/firebase_database/firebase_database/android/local-config.gradle @@ -3,4 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) + androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' } \ No newline at end of file diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle index c4c6b61a6355..4b113b624bea 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle @@ -1,6 +1,9 @@ group 'io.flutter.plugins.firebase.dynamiclinks' version '1.0-SNAPSHOT' +apply plugin: 'com.android.library' +apply from: file("local-config.gradle") + buildscript { repositories { google() @@ -8,7 +11,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.1' + classpath androidGradlePluginVersion } } @@ -19,9 +22,6 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' -apply from: file("local-config.gradle") - def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { throw new GradleException('Could not find the firebase_core FlutterFire plugin, have you added it as a dependency in your pubspec?') diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/android/local-config.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/android/local-config.gradle index 1a2ef0c3bede..884c2728ec74 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/android/local-config.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/android/local-config.gradle @@ -3,4 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) + androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' } \ No newline at end of file diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle index a39c72ec6b07..668fd95e7799 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle @@ -1,6 +1,9 @@ group 'io.flutter.plugins.firebase.inappmessaging' version '1.0-SNAPSHOT' +apply plugin: 'com.android.library' +apply from: file("local-config.gradle") + buildscript { repositories { google() @@ -8,7 +11,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.1' + classpath androidGradlePluginVersion } } @@ -19,9 +22,6 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' -apply from: file("local-config.gradle") - def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { throw new GradleException('Could not find the firebase_core FlutterFire plugin, have you added it as a dependency in your pubspec?') diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/local-config.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/local-config.gradle index 1a2ef0c3bede..884c2728ec74 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/local-config.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/local-config.gradle @@ -3,4 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) + androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' } \ No newline at end of file diff --git a/packages/firebase_messaging/firebase_messaging/android/build.gradle b/packages/firebase_messaging/firebase_messaging/android/build.gradle index 600ee5b5c6d9..c665f666628d 100644 --- a/packages/firebase_messaging/firebase_messaging/android/build.gradle +++ b/packages/firebase_messaging/firebase_messaging/android/build.gradle @@ -1,6 +1,9 @@ group 'io.flutter.plugins.firebasemessaging' version '1.0-SNAPSHOT' +apply plugin: 'com.android.library' +apply from: file("local-config.gradle") + buildscript { repositories { google() @@ -8,7 +11,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.1' + classpath androidGradlePluginVersion } } @@ -19,10 +22,6 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' -apply from: file("local-config.gradle") - - def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { throw new GradleException('Could not find the firebase_core FlutterFire plugin, have you added it as a dependency in your pubspec?') diff --git a/packages/firebase_messaging/firebase_messaging/android/local-config.gradle b/packages/firebase_messaging/firebase_messaging/android/local-config.gradle index 1a2ef0c3bede..884c2728ec74 100644 --- a/packages/firebase_messaging/firebase_messaging/android/local-config.gradle +++ b/packages/firebase_messaging/firebase_messaging/android/local-config.gradle @@ -3,4 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) + androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' } \ No newline at end of file diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle index 2aa1f9ddd91d..aac616a1ee3b 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle @@ -1,6 +1,9 @@ group 'io.flutter.plugins.firebase.firebase_ml_model_downloader' version '1.0' +apply plugin: 'com.android.library' +apply from: file("local-config.gradle") + buildscript { repositories { google() @@ -8,7 +11,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.1' + classpath androidGradlePluginVersion } } @@ -32,9 +35,6 @@ def getRootProjectExtOrCoreProperty(name, firebaseCoreProject) { return rootProject.ext.get('FlutterFire').get(name) } -apply plugin: 'com.android.library' -apply from: file("local-config.gradle") - android { // Conditional for compatibility with AGP <4.2. if (project.android.hasProperty("namespace")) { diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/local-config.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/local-config.gradle index 1a2ef0c3bede..884c2728ec74 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/local-config.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/local-config.gradle @@ -3,4 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) + androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' } \ No newline at end of file diff --git a/packages/firebase_performance/firebase_performance/android/build.gradle b/packages/firebase_performance/firebase_performance/android/build.gradle index f66a8ca986ef..726ed33f6fd9 100644 --- a/packages/firebase_performance/firebase_performance/android/build.gradle +++ b/packages/firebase_performance/firebase_performance/android/build.gradle @@ -1,6 +1,9 @@ group 'io.flutter.plugins.firebaseperformance' version '1.0-SNAPSHOT' +apply plugin: 'com.android.library' +apply from: file("local-config.gradle") + buildscript { repositories { google() @@ -8,7 +11,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.1' + classpath androidGradlePluginVersion } } @@ -19,9 +22,6 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' -apply from: file("local-config.gradle") - def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { throw new GradleException('Could not find the firebase_core FlutterFire plugin, have you added it as a dependency in your pubspec?') diff --git a/packages/firebase_performance/firebase_performance/android/local-config.gradle b/packages/firebase_performance/firebase_performance/android/local-config.gradle index 1a2ef0c3bede..884c2728ec74 100644 --- a/packages/firebase_performance/firebase_performance/android/local-config.gradle +++ b/packages/firebase_performance/firebase_performance/android/local-config.gradle @@ -3,4 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) + androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' } \ No newline at end of file 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 4ca4bfdde584..ac25bd771f62 100644 --- a/packages/firebase_remote_config/firebase_remote_config/android/build.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/android/build.gradle @@ -1,6 +1,9 @@ group 'io.flutter.plugins.firebase.firebaseremoteconfig' version '1.0-SNAPSHOT' +apply plugin: 'com.android.library' +apply from: file("local-config.gradle") + buildscript { repositories { google() @@ -8,7 +11,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.1' + classpath androidGradlePluginVersion } } @@ -19,9 +22,6 @@ rootProject.allprojects { } } -apply plugin: 'com.android.library' -apply from: file("local-config.gradle") - def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { throw new GradleException('Could not find the firebase_core FlutterFire plugin, have you added it as a dependency in your pubspec?') diff --git a/packages/firebase_remote_config/firebase_remote_config/android/local-config.gradle b/packages/firebase_remote_config/firebase_remote_config/android/local-config.gradle index 1a2ef0c3bede..884c2728ec74 100644 --- a/packages/firebase_remote_config/firebase_remote_config/android/local-config.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/android/local-config.gradle @@ -3,4 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) + androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' } \ No newline at end of file diff --git a/packages/firebase_storage/firebase_storage/android/build.gradle b/packages/firebase_storage/firebase_storage/android/build.gradle index 3096f323f86b..f7bdc8ab6900 100755 --- a/packages/firebase_storage/firebase_storage/android/build.gradle +++ b/packages/firebase_storage/firebase_storage/android/build.gradle @@ -1,6 +1,9 @@ group 'io.flutter.plugins.firebase.storage' version '1.0-SNAPSHOT' +apply plugin: 'com.android.library' +apply from: file("local-config.gradle") + buildscript { repositories { google() @@ -8,7 +11,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.1' + classpath androidGradlePluginVersion } } @@ -27,9 +30,6 @@ allprojects { } } -apply plugin: 'com.android.library' -apply from: file("local-config.gradle") - def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { throw new GradleException('Could not find the firebase_core FlutterFire plugin, have you added it as a dependency in your pubspec?') diff --git a/packages/firebase_storage/firebase_storage/android/local-config.gradle b/packages/firebase_storage/firebase_storage/android/local-config.gradle index 1a2ef0c3bede..884c2728ec74 100644 --- a/packages/firebase_storage/firebase_storage/android/local-config.gradle +++ b/packages/firebase_storage/firebase_storage/android/local-config.gradle @@ -3,4 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) + androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' } \ No newline at end of file diff --git a/tests/android/app/generated_android_versions.txt b/tests/android/app/generated_android_versions.txt deleted file mode 100644 index 4b434611f002..000000000000 --- a/tests/android/app/generated_android_versions.txt +++ /dev/null @@ -1,4 +0,0 @@ -compileSdk=35 -minSdk=21 -targetSdk=35 -javaVersion=17 diff --git a/tests/android/app/local-config.gradle b/tests/android/app/local-config.gradle index f790702014d7..1a2ef0c3bede 100644 --- a/tests/android/app/local-config.gradle +++ b/tests/android/app/local-config.gradle @@ -1,19 +1,6 @@ -def versionFile = file("generated_android_versions.txt") -def versionProps = new Properties() - -if (versionFile.exists()) { - versionFile.withInputStream { stream -> - versionProps.load(stream) - } -} else { - throw new GradleException("generated_android_versions.txt not found!") -} - ext { - compileSdk = versionProps['compileSdk'] as Integer - minSdk = versionProps['minSdk'] as Integer - targetSdk = versionProps['targetSdk'] as Integer - - def javaVerNum = versionProps['javaVersion'] as Integer - javaVersion = JavaVersion.toVersion(javaVerNum) -} + compileSdk=34 + minSdk=21 + targetSdk=34 + javaVersion = JavaVersion.toVersion(17) +} \ No newline at end of file From 578b5315c7dc2b26e84fc7e8bf309883aa149bc5 Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Wed, 23 Apr 2025 13:14:23 +0100 Subject: [PATCH 19/29] fix: ext issue --- packages/cloud_firestore/cloud_firestore/android/build.gradle | 2 +- packages/cloud_functions/cloud_functions/android/build.gradle | 2 +- .../firebase_analytics/firebase_analytics/android/build.gradle | 2 +- .../firebase_app_check/firebase_app_check/android/build.gradle | 2 +- .../firebase_app_installations/android/build.gradle | 2 +- packages/firebase_auth/firebase_auth/android/build.gradle | 2 +- packages/firebase_core/firebase_core/android/build.gradle | 2 +- .../firebase_crashlytics/android/build.gradle | 2 +- .../firebase_database/firebase_database/android/build.gradle | 2 +- .../firebase_dynamic_links/android/build.gradle | 2 +- .../firebase_in_app_messaging/android/build.gradle | 2 +- .../firebase_messaging/firebase_messaging/android/build.gradle | 2 +- .../firebase_ml_model_downloader/android/build.gradle | 2 +- .../firebase_performance/android/build.gradle | 2 +- .../firebase_remote_config/android/build.gradle | 2 +- packages/firebase_storage/firebase_storage/android/build.gradle | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/cloud_firestore/cloud_firestore/android/build.gradle b/packages/cloud_firestore/cloud_firestore/android/build.gradle index 27417e0651cb..71047dcc2d3d 100755 --- a/packages/cloud_firestore/cloud_firestore/android/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath androidGradlePluginVersion + classpath ext.androidGradlePluginVersion } } diff --git a/packages/cloud_functions/cloud_functions/android/build.gradle b/packages/cloud_functions/cloud_functions/android/build.gradle index c55e2d9c2b03..6f69de5d1c1c 100644 --- a/packages/cloud_functions/cloud_functions/android/build.gradle +++ b/packages/cloud_functions/cloud_functions/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath androidGradlePluginVersion + classpath ext.androidGradlePluginVersion } } diff --git a/packages/firebase_analytics/firebase_analytics/android/build.gradle b/packages/firebase_analytics/firebase_analytics/android/build.gradle index ab8b2b0d04d6..5625e8f53e25 100755 --- a/packages/firebase_analytics/firebase_analytics/android/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath androidGradlePluginVersion + classpath ext.androidGradlePluginVersion } } 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 875f44c55da6..8e4b8241f5e5 100644 --- a/packages/firebase_app_check/firebase_app_check/android/build.gradle +++ b/packages/firebase_app_check/firebase_app_check/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath androidGradlePluginVersion + classpath ext.androidGradlePluginVersion } } diff --git a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle index 0986294e9716..cda153bb0bd5 100644 --- a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath androidGradlePluginVersion + classpath ext.androidGradlePluginVersion } } diff --git a/packages/firebase_auth/firebase_auth/android/build.gradle b/packages/firebase_auth/firebase_auth/android/build.gradle index 7fcc7346aa4a..c72cfaab62ca 100755 --- a/packages/firebase_auth/firebase_auth/android/build.gradle +++ b/packages/firebase_auth/firebase_auth/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath androidGradlePluginVersion + classpath ext.androidGradlePluginVersion } } diff --git a/packages/firebase_core/firebase_core/android/build.gradle b/packages/firebase_core/firebase_core/android/build.gradle index 5d229cc373fe..8e2dcb882c49 100644 --- a/packages/firebase_core/firebase_core/android/build.gradle +++ b/packages/firebase_core/firebase_core/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath androidGradlePluginVersion + classpath ext.androidGradlePluginVersion } } diff --git a/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle b/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle index f22cfc4f1dec..cc2296a1760f 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath androidGradlePluginVersion + classpath ext.androidGradlePluginVersion } } diff --git a/packages/firebase_database/firebase_database/android/build.gradle b/packages/firebase_database/firebase_database/android/build.gradle index b7adebeaace1..584aa9d4ca3c 100755 --- a/packages/firebase_database/firebase_database/android/build.gradle +++ b/packages/firebase_database/firebase_database/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath androidGradlePluginVersion + classpath ext.androidGradlePluginVersion } } diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle index 4b113b624bea..ba3f8ce9a64d 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath androidGradlePluginVersion + classpath ext.androidGradlePluginVersion } } diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle index 668fd95e7799..6dbf1ee7d5d8 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath androidGradlePluginVersion + classpath ext.androidGradlePluginVersion } } diff --git a/packages/firebase_messaging/firebase_messaging/android/build.gradle b/packages/firebase_messaging/firebase_messaging/android/build.gradle index c665f666628d..60d5ac9622eb 100644 --- a/packages/firebase_messaging/firebase_messaging/android/build.gradle +++ b/packages/firebase_messaging/firebase_messaging/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath androidGradlePluginVersion + classpath ext.androidGradlePluginVersion } } diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle index aac616a1ee3b..7d6ba312efd6 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath androidGradlePluginVersion + classpath ext.androidGradlePluginVersion } } diff --git a/packages/firebase_performance/firebase_performance/android/build.gradle b/packages/firebase_performance/firebase_performance/android/build.gradle index 726ed33f6fd9..f9cf1940deab 100644 --- a/packages/firebase_performance/firebase_performance/android/build.gradle +++ b/packages/firebase_performance/firebase_performance/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath androidGradlePluginVersion + classpath ext.androidGradlePluginVersion } } 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 ac25bd771f62..f4be5ccdd270 100644 --- a/packages/firebase_remote_config/firebase_remote_config/android/build.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath androidGradlePluginVersion + classpath ext.androidGradlePluginVersion } } diff --git a/packages/firebase_storage/firebase_storage/android/build.gradle b/packages/firebase_storage/firebase_storage/android/build.gradle index f7bdc8ab6900..bf6aae667774 100755 --- a/packages/firebase_storage/firebase_storage/android/build.gradle +++ b/packages/firebase_storage/firebase_storage/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath androidGradlePluginVersion + classpath ext.androidGradlePluginVersion } } From de70f8701111b26c94e56bc4f2d99daa132473a1 Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Wed, 23 Apr 2025 13:20:07 +0100 Subject: [PATCH 20/29] fix: removed random change --- .../ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/firebase_messaging/firebase_messaging/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/firebase_messaging/firebase_messaging/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 2cfb2e9e694c..20582f866aa0 100644 --- a/packages/firebase_messaging/firebase_messaging/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/firebase_messaging/firebase_messaging/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -66,7 +66,6 @@ ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" debugServiceExtension = "internal" - enableGPUValidationMode = "1" allowLocationSimulation = "YES"> From 1196c9c1c8e95d133dd79c5ad3b1e2272a081be4 Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Wed, 23 Apr 2025 13:29:27 +0100 Subject: [PATCH 21/29] fix: ext issue --- packages/cloud_firestore/cloud_firestore/android/build.gradle | 2 +- packages/cloud_functions/cloud_functions/android/build.gradle | 2 +- .../firebase_analytics/firebase_analytics/android/build.gradle | 2 +- .../firebase_app_check/firebase_app_check/android/build.gradle | 2 +- .../firebase_app_installations/android/build.gradle | 2 +- packages/firebase_auth/firebase_auth/android/build.gradle | 2 +- packages/firebase_core/firebase_core/android/build.gradle | 2 +- .../firebase_crashlytics/android/build.gradle | 2 +- .../firebase_database/firebase_database/android/build.gradle | 2 +- .../firebase_dynamic_links/android/build.gradle | 2 +- .../firebase_in_app_messaging/android/build.gradle | 2 +- .../firebase_messaging/firebase_messaging/android/build.gradle | 2 +- .../firebase_ml_model_downloader/android/build.gradle | 2 +- .../firebase_performance/android/build.gradle | 2 +- .../firebase_remote_config/android/build.gradle | 2 +- packages/firebase_storage/firebase_storage/android/build.gradle | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/cloud_firestore/cloud_firestore/android/build.gradle b/packages/cloud_firestore/cloud_firestore/android/build.gradle index 71047dcc2d3d..59897a0a09ab 100755 --- a/packages/cloud_firestore/cloud_firestore/android/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath ext.androidGradlePluginVersion + classpath project.ext.androidGradlePluginVersion } } diff --git a/packages/cloud_functions/cloud_functions/android/build.gradle b/packages/cloud_functions/cloud_functions/android/build.gradle index 6f69de5d1c1c..f7de866d3610 100644 --- a/packages/cloud_functions/cloud_functions/android/build.gradle +++ b/packages/cloud_functions/cloud_functions/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath ext.androidGradlePluginVersion + classpath project.ext.androidGradlePluginVersion } } diff --git a/packages/firebase_analytics/firebase_analytics/android/build.gradle b/packages/firebase_analytics/firebase_analytics/android/build.gradle index 5625e8f53e25..e130b274d4a3 100755 --- a/packages/firebase_analytics/firebase_analytics/android/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath ext.androidGradlePluginVersion + classpath project.ext.androidGradlePluginVersion } } 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 8e4b8241f5e5..e95ef0a64c09 100644 --- a/packages/firebase_app_check/firebase_app_check/android/build.gradle +++ b/packages/firebase_app_check/firebase_app_check/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath ext.androidGradlePluginVersion + classpath project.ext.androidGradlePluginVersion } } diff --git a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle index cda153bb0bd5..ce27debe8aad 100644 --- a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath ext.androidGradlePluginVersion + classpath project.ext.androidGradlePluginVersion } } diff --git a/packages/firebase_auth/firebase_auth/android/build.gradle b/packages/firebase_auth/firebase_auth/android/build.gradle index c72cfaab62ca..48e7b7131c75 100755 --- a/packages/firebase_auth/firebase_auth/android/build.gradle +++ b/packages/firebase_auth/firebase_auth/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath ext.androidGradlePluginVersion + classpath project.ext.androidGradlePluginVersion } } diff --git a/packages/firebase_core/firebase_core/android/build.gradle b/packages/firebase_core/firebase_core/android/build.gradle index 8e2dcb882c49..cf438317e242 100644 --- a/packages/firebase_core/firebase_core/android/build.gradle +++ b/packages/firebase_core/firebase_core/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath ext.androidGradlePluginVersion + classpath project.ext.androidGradlePluginVersion } } diff --git a/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle b/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle index cc2296a1760f..1bce42d15a69 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath ext.androidGradlePluginVersion + classpath project.ext.androidGradlePluginVersion } } diff --git a/packages/firebase_database/firebase_database/android/build.gradle b/packages/firebase_database/firebase_database/android/build.gradle index 584aa9d4ca3c..9b778318ad28 100755 --- a/packages/firebase_database/firebase_database/android/build.gradle +++ b/packages/firebase_database/firebase_database/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath ext.androidGradlePluginVersion + classpath project.ext.androidGradlePluginVersion } } diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle index ba3f8ce9a64d..9adb85948d32 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath ext.androidGradlePluginVersion + classpath project.ext.androidGradlePluginVersion } } diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle index 6dbf1ee7d5d8..973f2078fbda 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath ext.androidGradlePluginVersion + classpath project.ext.androidGradlePluginVersion } } diff --git a/packages/firebase_messaging/firebase_messaging/android/build.gradle b/packages/firebase_messaging/firebase_messaging/android/build.gradle index 60d5ac9622eb..c0b81c05fdef 100644 --- a/packages/firebase_messaging/firebase_messaging/android/build.gradle +++ b/packages/firebase_messaging/firebase_messaging/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath ext.androidGradlePluginVersion + classpath project.ext.androidGradlePluginVersion } } diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle index 7d6ba312efd6..dc486c323e08 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath ext.androidGradlePluginVersion + classpath project.ext.androidGradlePluginVersion } } diff --git a/packages/firebase_performance/firebase_performance/android/build.gradle b/packages/firebase_performance/firebase_performance/android/build.gradle index f9cf1940deab..f6e1f2b12d88 100644 --- a/packages/firebase_performance/firebase_performance/android/build.gradle +++ b/packages/firebase_performance/firebase_performance/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath ext.androidGradlePluginVersion + classpath project.ext.androidGradlePluginVersion } } 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 f4be5ccdd270..19220578bbe4 100644 --- a/packages/firebase_remote_config/firebase_remote_config/android/build.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath ext.androidGradlePluginVersion + classpath project.ext.androidGradlePluginVersion } } diff --git a/packages/firebase_storage/firebase_storage/android/build.gradle b/packages/firebase_storage/firebase_storage/android/build.gradle index bf6aae667774..6cdfc5cec19a 100755 --- a/packages/firebase_storage/firebase_storage/android/build.gradle +++ b/packages/firebase_storage/firebase_storage/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath ext.androidGradlePluginVersion + classpath project.ext.androidGradlePluginVersion } } From b7cea8209ef320db79afd317902d817928a99b60 Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Thu, 24 Apr 2025 06:20:44 +0100 Subject: [PATCH 22/29] fix: test --- packages/firebase_core/firebase_core/android/build.gradle | 4 +++- .../firebase_messaging/android/build.gradle | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/firebase_core/firebase_core/android/build.gradle b/packages/firebase_core/firebase_core/android/build.gradle index cf438317e242..3690f17a1f8b 100644 --- a/packages/firebase_core/firebase_core/android/build.gradle +++ b/packages/firebase_core/firebase_core/android/build.gradle @@ -4,6 +4,8 @@ version '1.0-SNAPSHOT' apply plugin: 'com.android.library' apply from: file("local-config.gradle") +androidGradlePluginVersion = project.ext.androidGradlePluginVersion + buildscript { repositories { google() @@ -11,7 +13,7 @@ buildscript { } dependencies { - classpath project.ext.androidGradlePluginVersion + classpath androidGradlePluginVersion } } diff --git a/packages/firebase_messaging/firebase_messaging/android/build.gradle b/packages/firebase_messaging/firebase_messaging/android/build.gradle index c0b81c05fdef..658d83bbd50e 100644 --- a/packages/firebase_messaging/firebase_messaging/android/build.gradle +++ b/packages/firebase_messaging/firebase_messaging/android/build.gradle @@ -4,6 +4,8 @@ version '1.0-SNAPSHOT' apply plugin: 'com.android.library' apply from: file("local-config.gradle") +androidGradlePluginVersion = project.ext.androidGradlePluginVersion + buildscript { repositories { google() @@ -11,7 +13,7 @@ buildscript { } dependencies { - classpath project.ext.androidGradlePluginVersion + classpath androidGradlePluginVersion } } From 3bf1a7610c5e6e1c88148572a369bbb328838858 Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Wed, 30 Apr 2025 12:01:24 +0100 Subject: [PATCH 23/29] feat: add AGP version support --- gradle/global-config.gradle | 2 +- .../cloud_firestore/cloud_firestore/android/build.gradle | 4 ---- .../cloud_firestore/android/settings.gradle | 9 +++++++++ .../cloud_functions/cloud_functions/android/build.gradle | 4 ---- .../cloud_functions/android/settings.gradle | 9 +++++++++ .../firebase_analytics/android/build.gradle | 4 ---- .../firebase_analytics/android/settings.gradle | 9 +++++++++ .../firebase_app_check/android/build.gradle | 4 ---- .../firebase_app_check/android/settings.gradle | 9 +++++++++ .../firebase_app_installations/android/build.gradle | 4 ---- .../firebase_app_installations/android/settings.gradle | 9 +++++++++ .../firebase_auth/firebase_auth/android/build.gradle | 4 ---- .../firebase_auth/android/local-config.gradle | 2 +- .../firebase_auth/firebase_auth/android/settings.gradle | 9 +++++++++ .../firebase_core/firebase_core/android/build.gradle | 6 ------ .../firebase_core/android/local-config.gradle | 2 +- .../firebase_core/firebase_core/android/settings.gradle | 9 +++++++++ .../firebase_crashlytics/android/build.gradle | 4 ---- .../firebase_crashlytics/android/settings.gradle | 9 +++++++++ .../firebase_database/android/build.gradle | 4 ---- .../firebase_database/android/settings.gradle | 9 +++++++++ .../firebase_dynamic_links/android/build.gradle | 4 ---- .../firebase_dynamic_links/android/settings.gradle | 9 +++++++++ .../firebase_in_app_messaging/android/build.gradle | 4 ---- .../firebase_in_app_messaging/android/settings.gradle | 9 +++++++++ .../firebase_messaging/android/build.gradle | 4 ---- .../firebase_messaging/android/settings.gradle | 9 +++++++++ .../firebase_ml_model_downloader/android/build.gradle | 4 ---- .../firebase_ml_model_downloader/android/settings.gradle | 9 +++++++++ .../firebase_performance/android/build.gradle | 4 ---- .../firebase_performance/android/settings.gradle | 9 +++++++++ .../firebase_remote_config/android/build.gradle | 4 ---- .../firebase_remote_config/android/settings.gradle | 9 +++++++++ .../firebase_storage/android/build.gradle | 4 ---- .../firebase_storage/android/settings.gradle | 9 +++++++++ 35 files changed, 147 insertions(+), 69 deletions(-) diff --git a/gradle/global-config.gradle b/gradle/global-config.gradle index 884c2728ec74..b8cf843dca09 100644 --- a/gradle/global-config.gradle +++ b/gradle/global-config.gradle @@ -3,5 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' + androidGradlePluginVersion = '8.2.1' } \ No newline at end of file diff --git a/packages/cloud_firestore/cloud_firestore/android/build.gradle b/packages/cloud_firestore/cloud_firestore/android/build.gradle index 59897a0a09ab..66d5b12c19c5 100755 --- a/packages/cloud_firestore/cloud_firestore/android/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/android/build.gradle @@ -9,10 +9,6 @@ buildscript { google() mavenCentral() } - - dependencies { - classpath project.ext.androidGradlePluginVersion - } } allprojects { diff --git a/packages/cloud_firestore/cloud_firestore/android/settings.gradle b/packages/cloud_firestore/cloud_firestore/android/settings.gradle index caf10656889a..3f25aa26e407 100755 --- a/packages/cloud_firestore/cloud_firestore/android/settings.gradle +++ b/packages/cloud_firestore/cloud_firestore/android/settings.gradle @@ -1 +1,10 @@ rootProject.name = 'cloud_firestore' + +apply from: file("local-config.gradle") + +pluginManagement { + plugins { + id "com.android.application" version project.ext.androidGradlePluginVersion + id "com.android.library" version project.ext.androidGradlePluginVersion + } +} diff --git a/packages/cloud_functions/cloud_functions/android/build.gradle b/packages/cloud_functions/cloud_functions/android/build.gradle index f7de866d3610..4f93458138ca 100644 --- a/packages/cloud_functions/cloud_functions/android/build.gradle +++ b/packages/cloud_functions/cloud_functions/android/build.gradle @@ -9,10 +9,6 @@ buildscript { google() mavenCentral() } - - dependencies { - classpath project.ext.androidGradlePluginVersion - } } rootProject.allprojects { diff --git a/packages/cloud_functions/cloud_functions/android/settings.gradle b/packages/cloud_functions/cloud_functions/android/settings.gradle index 94986afd276c..0fcd910d1c3c 100644 --- a/packages/cloud_functions/cloud_functions/android/settings.gradle +++ b/packages/cloud_functions/cloud_functions/android/settings.gradle @@ -1 +1,10 @@ rootProject.name = 'cloud_functions' + +apply from: file("local-config.gradle") + +pluginManagement { + plugins { + id "com.android.application" version project.ext.androidGradlePluginVersion + id "com.android.library" version project.ext.androidGradlePluginVersion + } +} diff --git a/packages/firebase_analytics/firebase_analytics/android/build.gradle b/packages/firebase_analytics/firebase_analytics/android/build.gradle index e130b274d4a3..0e4272480903 100755 --- a/packages/firebase_analytics/firebase_analytics/android/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/android/build.gradle @@ -9,10 +9,6 @@ buildscript { google() mavenCentral() } - - dependencies { - classpath project.ext.androidGradlePluginVersion - } } rootProject.allprojects { diff --git a/packages/firebase_analytics/firebase_analytics/android/settings.gradle b/packages/firebase_analytics/firebase_analytics/android/settings.gradle index 4b80dda8afc7..b9b8bf755cea 100755 --- a/packages/firebase_analytics/firebase_analytics/android/settings.gradle +++ b/packages/firebase_analytics/firebase_analytics/android/settings.gradle @@ -1 +1,10 @@ rootProject.name = 'firebase_analytics' + +apply from: file("local-config.gradle") + +pluginManagement { + plugins { + id "com.android.application" version project.ext.androidGradlePluginVersion + id "com.android.library" version project.ext.androidGradlePluginVersion + } +} 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 e95ef0a64c09..f96972fb9ce3 100644 --- a/packages/firebase_app_check/firebase_app_check/android/build.gradle +++ b/packages/firebase_app_check/firebase_app_check/android/build.gradle @@ -9,10 +9,6 @@ buildscript { google() mavenCentral() } - - dependencies { - classpath project.ext.androidGradlePluginVersion - } } rootProject.allprojects { diff --git a/packages/firebase_app_check/firebase_app_check/android/settings.gradle b/packages/firebase_app_check/firebase_app_check/android/settings.gradle index 5cd8520f8176..11ac1690729d 100644 --- a/packages/firebase_app_check/firebase_app_check/android/settings.gradle +++ b/packages/firebase_app_check/firebase_app_check/android/settings.gradle @@ -1 +1,10 @@ rootProject.name = 'firebase_app_check' + +apply from: file("local-config.gradle") + +pluginManagement { + plugins { + id "com.android.application" version project.ext.androidGradlePluginVersion + id "com.android.library" version project.ext.androidGradlePluginVersion + } +} diff --git a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle index ce27debe8aad..e4ad7c1cade5 100644 --- a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle @@ -9,10 +9,6 @@ buildscript { google() mavenCentral() } - - dependencies { - classpath project.ext.androidGradlePluginVersion - } } rootProject.allprojects { diff --git a/packages/firebase_app_installations/firebase_app_installations/android/settings.gradle b/packages/firebase_app_installations/firebase_app_installations/android/settings.gradle index aee00677e78a..b146463b0765 100644 --- a/packages/firebase_app_installations/firebase_app_installations/android/settings.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/android/settings.gradle @@ -1 +1,10 @@ rootProject.name = 'firebase_app_installations' + +apply from: file("local-config.gradle") + +pluginManagement { + plugins { + id "com.android.application" version project.ext.androidGradlePluginVersion + id "com.android.library" version project.ext.androidGradlePluginVersion + } +} diff --git a/packages/firebase_auth/firebase_auth/android/build.gradle b/packages/firebase_auth/firebase_auth/android/build.gradle index 48e7b7131c75..0dda6923dcde 100755 --- a/packages/firebase_auth/firebase_auth/android/build.gradle +++ b/packages/firebase_auth/firebase_auth/android/build.gradle @@ -9,10 +9,6 @@ buildscript { google() mavenCentral() } - - dependencies { - classpath project.ext.androidGradlePluginVersion - } } allprojects { diff --git a/packages/firebase_auth/firebase_auth/android/local-config.gradle b/packages/firebase_auth/firebase_auth/android/local-config.gradle index 884c2728ec74..b8cf843dca09 100644 --- a/packages/firebase_auth/firebase_auth/android/local-config.gradle +++ b/packages/firebase_auth/firebase_auth/android/local-config.gradle @@ -3,5 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' + androidGradlePluginVersion = '8.2.1' } \ No newline at end of file diff --git a/packages/firebase_auth/firebase_auth/android/settings.gradle b/packages/firebase_auth/firebase_auth/android/settings.gradle index acfe1855910f..48dc092d29e3 100755 --- a/packages/firebase_auth/firebase_auth/android/settings.gradle +++ b/packages/firebase_auth/firebase_auth/android/settings.gradle @@ -1 +1,10 @@ rootProject.name = 'firebase_auth' + +apply from: file("local-config.gradle") + +pluginManagement { + plugins { + id "com.android.application" version project.ext.androidGradlePluginVersion + id "com.android.library" version project.ext.androidGradlePluginVersion + } +} diff --git a/packages/firebase_core/firebase_core/android/build.gradle b/packages/firebase_core/firebase_core/android/build.gradle index 3690f17a1f8b..33904fddc266 100644 --- a/packages/firebase_core/firebase_core/android/build.gradle +++ b/packages/firebase_core/firebase_core/android/build.gradle @@ -4,17 +4,11 @@ version '1.0-SNAPSHOT' apply plugin: 'com.android.library' apply from: file("local-config.gradle") -androidGradlePluginVersion = project.ext.androidGradlePluginVersion - buildscript { repositories { google() mavenCentral() } - - dependencies { - classpath androidGradlePluginVersion - } } def getRootProjectExtOrDefaultProperty(name) { diff --git a/packages/firebase_core/firebase_core/android/local-config.gradle b/packages/firebase_core/firebase_core/android/local-config.gradle index 884c2728ec74..b8cf843dca09 100644 --- a/packages/firebase_core/firebase_core/android/local-config.gradle +++ b/packages/firebase_core/firebase_core/android/local-config.gradle @@ -3,5 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' + androidGradlePluginVersion = '8.2.1' } \ No newline at end of file diff --git a/packages/firebase_core/firebase_core/android/settings.gradle b/packages/firebase_core/firebase_core/android/settings.gradle index 6b9f7039d668..1689243f09d5 100644 --- a/packages/firebase_core/firebase_core/android/settings.gradle +++ b/packages/firebase_core/firebase_core/android/settings.gradle @@ -1 +1,10 @@ rootProject.name = 'firebase_core' + +apply from: file("local-config.gradle") + +pluginManagement { + plugins { + id "com.android.application" version project.ext.androidGradlePluginVersion + id "com.android.library" version project.ext.androidGradlePluginVersion + } +} diff --git a/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle b/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle index 1bce42d15a69..97476950e971 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle @@ -9,10 +9,6 @@ buildscript { google() mavenCentral() } - - dependencies { - classpath project.ext.androidGradlePluginVersion - } } rootProject.allprojects { diff --git a/packages/firebase_crashlytics/firebase_crashlytics/android/settings.gradle b/packages/firebase_crashlytics/firebase_crashlytics/android/settings.gradle index 0db0f63e40fd..8e6488457202 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/android/settings.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/android/settings.gradle @@ -1 +1,10 @@ rootProject.name = 'firebase_crashlytics' + +apply from: file("local-config.gradle") + +pluginManagement { + plugins { + id "com.android.application" version project.ext.androidGradlePluginVersion + id "com.android.library" version project.ext.androidGradlePluginVersion + } +} diff --git a/packages/firebase_database/firebase_database/android/build.gradle b/packages/firebase_database/firebase_database/android/build.gradle index 9b778318ad28..bdf3a78ddbbd 100755 --- a/packages/firebase_database/firebase_database/android/build.gradle +++ b/packages/firebase_database/firebase_database/android/build.gradle @@ -9,10 +9,6 @@ buildscript { google() mavenCentral() } - - dependencies { - classpath project.ext.androidGradlePluginVersion - } } rootProject.allprojects { diff --git a/packages/firebase_database/firebase_database/android/settings.gradle b/packages/firebase_database/firebase_database/android/settings.gradle index 853b33390159..cd0aad296053 100755 --- a/packages/firebase_database/firebase_database/android/settings.gradle +++ b/packages/firebase_database/firebase_database/android/settings.gradle @@ -1 +1,10 @@ rootProject.name = 'firebase_database' + +apply from: file("local-config.gradle") + +pluginManagement { + plugins { + id "com.android.application" version project.ext.androidGradlePluginVersion + id "com.android.library" version project.ext.androidGradlePluginVersion + } +} diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle index 9adb85948d32..325c2f50379b 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle @@ -9,10 +9,6 @@ buildscript { google() mavenCentral() } - - dependencies { - classpath project.ext.androidGradlePluginVersion - } } rootProject.allprojects { diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/android/settings.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/android/settings.gradle index 2a833554f85c..86909274f0d6 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/android/settings.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/android/settings.gradle @@ -1 +1,10 @@ rootProject.name = 'firebase_dynamic_links' + +apply from: file("local-config.gradle") + +pluginManagement { + plugins { + id "com.android.application" version project.ext.androidGradlePluginVersion + id "com.android.library" version project.ext.androidGradlePluginVersion + } +} diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle index 973f2078fbda..0f9e3a498d60 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle @@ -9,10 +9,6 @@ buildscript { google() mavenCentral() } - - dependencies { - classpath project.ext.androidGradlePluginVersion - } } rootProject.allprojects { diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/settings.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/settings.gradle index 727175685e2b..78ac939d9166 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/settings.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/settings.gradle @@ -1 +1,10 @@ rootProject.name = 'firebase_in_app_messaging' + +apply from: file("local-config.gradle") + +pluginManagement { + plugins { + id "com.android.application" version project.ext.androidGradlePluginVersion + id "com.android.library" version project.ext.androidGradlePluginVersion + } +} diff --git a/packages/firebase_messaging/firebase_messaging/android/build.gradle b/packages/firebase_messaging/firebase_messaging/android/build.gradle index 658d83bbd50e..8a7291976765 100644 --- a/packages/firebase_messaging/firebase_messaging/android/build.gradle +++ b/packages/firebase_messaging/firebase_messaging/android/build.gradle @@ -11,10 +11,6 @@ buildscript { google() mavenCentral() } - - dependencies { - classpath androidGradlePluginVersion - } } rootProject.allprojects { diff --git a/packages/firebase_messaging/firebase_messaging/android/settings.gradle b/packages/firebase_messaging/firebase_messaging/android/settings.gradle index f82964eb43a1..c645de8b147c 100644 --- a/packages/firebase_messaging/firebase_messaging/android/settings.gradle +++ b/packages/firebase_messaging/firebase_messaging/android/settings.gradle @@ -1 +1,10 @@ rootProject.name = 'firebase_messaging' + +apply from: file("local-config.gradle") + +pluginManagement { + plugins { + id "com.android.application" version project.ext.androidGradlePluginVersion + id "com.android.library" version project.ext.androidGradlePluginVersion + } +} diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle index dc486c323e08..952896e696cc 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle @@ -9,10 +9,6 @@ buildscript { google() mavenCentral() } - - dependencies { - classpath project.ext.androidGradlePluginVersion - } } rootProject.allprojects { diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/settings.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/settings.gradle index a9eadb293261..c3f031cf0552 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/settings.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/settings.gradle @@ -1 +1,10 @@ rootProject.name = 'firebase_ml_model_downloader' + +apply from: file("local-config.gradle") + +pluginManagement { + plugins { + id "com.android.application" version project.ext.androidGradlePluginVersion + id "com.android.library" version project.ext.androidGradlePluginVersion + } +} diff --git a/packages/firebase_performance/firebase_performance/android/build.gradle b/packages/firebase_performance/firebase_performance/android/build.gradle index f6e1f2b12d88..8f0b4fb8a89d 100644 --- a/packages/firebase_performance/firebase_performance/android/build.gradle +++ b/packages/firebase_performance/firebase_performance/android/build.gradle @@ -9,10 +9,6 @@ buildscript { google() mavenCentral() } - - dependencies { - classpath project.ext.androidGradlePluginVersion - } } rootProject.allprojects { diff --git a/packages/firebase_performance/firebase_performance/android/settings.gradle b/packages/firebase_performance/firebase_performance/android/settings.gradle index 50c3a2d77af8..972b4b96862d 100644 --- a/packages/firebase_performance/firebase_performance/android/settings.gradle +++ b/packages/firebase_performance/firebase_performance/android/settings.gradle @@ -1 +1,10 @@ rootProject.name = 'firebase_performance' + +apply from: file("local-config.gradle") + +pluginManagement { + plugins { + id "com.android.application" version project.ext.androidGradlePluginVersion + id "com.android.library" version project.ext.androidGradlePluginVersion + } +} 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 19220578bbe4..17c4c4ec04ee 100644 --- a/packages/firebase_remote_config/firebase_remote_config/android/build.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/android/build.gradle @@ -9,10 +9,6 @@ buildscript { google() mavenCentral() } - - dependencies { - classpath project.ext.androidGradlePluginVersion - } } rootProject.allprojects { diff --git a/packages/firebase_remote_config/firebase_remote_config/android/settings.gradle b/packages/firebase_remote_config/firebase_remote_config/android/settings.gradle index 1ab71539c02f..c59b17006d16 100644 --- a/packages/firebase_remote_config/firebase_remote_config/android/settings.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/android/settings.gradle @@ -1 +1,10 @@ rootProject.name = 'firebase_remote_config' + +apply from: file("local-config.gradle") + +pluginManagement { + plugins { + id "com.android.application" version project.ext.androidGradlePluginVersion + id "com.android.library" version project.ext.androidGradlePluginVersion + } +} diff --git a/packages/firebase_storage/firebase_storage/android/build.gradle b/packages/firebase_storage/firebase_storage/android/build.gradle index 6cdfc5cec19a..cbd0de9d4ba6 100755 --- a/packages/firebase_storage/firebase_storage/android/build.gradle +++ b/packages/firebase_storage/firebase_storage/android/build.gradle @@ -9,10 +9,6 @@ buildscript { google() mavenCentral() } - - dependencies { - classpath project.ext.androidGradlePluginVersion - } } rootProject.allprojects { diff --git a/packages/firebase_storage/firebase_storage/android/settings.gradle b/packages/firebase_storage/firebase_storage/android/settings.gradle index f0aec4453e6d..e691f422d4e9 100755 --- a/packages/firebase_storage/firebase_storage/android/settings.gradle +++ b/packages/firebase_storage/firebase_storage/android/settings.gradle @@ -1 +1,10 @@ rootProject.name = 'firebase_storage' + +apply from: file("local-config.gradle") + +pluginManagement { + plugins { + id "com.android.application" version project.ext.androidGradlePluginVersion + id "com.android.library" version project.ext.androidGradlePluginVersion + } +} From ece43491b716279e66e074e9c1084338b53cf64d Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Wed, 30 Apr 2025 12:04:05 +0100 Subject: [PATCH 24/29] chore: run script --- gradle/auth-global-config.gradle | 2 +- .../cloud_firestore/cloud_firestore/android/local-config.gradle | 2 +- .../cloud_functions/cloud_functions/android/local-config.gradle | 2 +- .../firebase_analytics/android/local-config.gradle | 2 +- .../firebase_app_check/android/local-config.gradle | 2 +- .../firebase_app_installations/android/local-config.gradle | 2 +- .../firebase_crashlytics/android/local-config.gradle | 2 +- .../example/android/app/local-config.gradle | 2 +- .../firebase_database/android/local-config.gradle | 2 +- .../firebase_dynamic_links/android/local-config.gradle | 2 +- .../firebase_in_app_messaging/android/local-config.gradle | 2 +- .../firebase_messaging/android/local-config.gradle | 2 +- .../firebase_ml_model_downloader/android/local-config.gradle | 2 +- .../firebase_performance/android/local-config.gradle | 2 +- .../firebase_remote_config/android/local-config.gradle | 2 +- .../firebase_storage/android/local-config.gradle | 2 +- scripts/generate_versions_gradle.dart | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/gradle/auth-global-config.gradle b/gradle/auth-global-config.gradle index b25bf60d9e5e..9d6f216adcc1 100644 --- a/gradle/auth-global-config.gradle +++ b/gradle/auth-global-config.gradle @@ -3,5 +3,5 @@ ext { minSdk=23 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' + androidGradlePluginVersion = '8.2.1' } \ No newline at end of file diff --git a/packages/cloud_firestore/cloud_firestore/android/local-config.gradle b/packages/cloud_firestore/cloud_firestore/android/local-config.gradle index 884c2728ec74..b8cf843dca09 100644 --- a/packages/cloud_firestore/cloud_firestore/android/local-config.gradle +++ b/packages/cloud_firestore/cloud_firestore/android/local-config.gradle @@ -3,5 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' + androidGradlePluginVersion = '8.2.1' } \ No newline at end of file diff --git a/packages/cloud_functions/cloud_functions/android/local-config.gradle b/packages/cloud_functions/cloud_functions/android/local-config.gradle index 884c2728ec74..b8cf843dca09 100644 --- a/packages/cloud_functions/cloud_functions/android/local-config.gradle +++ b/packages/cloud_functions/cloud_functions/android/local-config.gradle @@ -3,5 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' + androidGradlePluginVersion = '8.2.1' } \ No newline at end of file diff --git a/packages/firebase_analytics/firebase_analytics/android/local-config.gradle b/packages/firebase_analytics/firebase_analytics/android/local-config.gradle index 884c2728ec74..b8cf843dca09 100644 --- a/packages/firebase_analytics/firebase_analytics/android/local-config.gradle +++ b/packages/firebase_analytics/firebase_analytics/android/local-config.gradle @@ -3,5 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' + androidGradlePluginVersion = '8.2.1' } \ No newline at end of file diff --git a/packages/firebase_app_check/firebase_app_check/android/local-config.gradle b/packages/firebase_app_check/firebase_app_check/android/local-config.gradle index 884c2728ec74..b8cf843dca09 100644 --- a/packages/firebase_app_check/firebase_app_check/android/local-config.gradle +++ b/packages/firebase_app_check/firebase_app_check/android/local-config.gradle @@ -3,5 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' + androidGradlePluginVersion = '8.2.1' } \ No newline at end of file diff --git a/packages/firebase_app_installations/firebase_app_installations/android/local-config.gradle b/packages/firebase_app_installations/firebase_app_installations/android/local-config.gradle index 884c2728ec74..b8cf843dca09 100644 --- a/packages/firebase_app_installations/firebase_app_installations/android/local-config.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/android/local-config.gradle @@ -3,5 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' + androidGradlePluginVersion = '8.2.1' } \ No newline at end of file diff --git a/packages/firebase_crashlytics/firebase_crashlytics/android/local-config.gradle b/packages/firebase_crashlytics/firebase_crashlytics/android/local-config.gradle index 884c2728ec74..b8cf843dca09 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/android/local-config.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/android/local-config.gradle @@ -3,5 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' + androidGradlePluginVersion = '8.2.1' } \ No newline at end of file diff --git a/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle b/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle index b25bf60d9e5e..9d6f216adcc1 100644 --- a/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle +++ b/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle @@ -3,5 +3,5 @@ ext { minSdk=23 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' + androidGradlePluginVersion = '8.2.1' } \ No newline at end of file diff --git a/packages/firebase_database/firebase_database/android/local-config.gradle b/packages/firebase_database/firebase_database/android/local-config.gradle index 884c2728ec74..b8cf843dca09 100644 --- a/packages/firebase_database/firebase_database/android/local-config.gradle +++ b/packages/firebase_database/firebase_database/android/local-config.gradle @@ -3,5 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' + androidGradlePluginVersion = '8.2.1' } \ No newline at end of file diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/android/local-config.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/android/local-config.gradle index 884c2728ec74..b8cf843dca09 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/android/local-config.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/android/local-config.gradle @@ -3,5 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' + androidGradlePluginVersion = '8.2.1' } \ No newline at end of file diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/local-config.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/local-config.gradle index 884c2728ec74..b8cf843dca09 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/local-config.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/local-config.gradle @@ -3,5 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' + androidGradlePluginVersion = '8.2.1' } \ No newline at end of file diff --git a/packages/firebase_messaging/firebase_messaging/android/local-config.gradle b/packages/firebase_messaging/firebase_messaging/android/local-config.gradle index 884c2728ec74..b8cf843dca09 100644 --- a/packages/firebase_messaging/firebase_messaging/android/local-config.gradle +++ b/packages/firebase_messaging/firebase_messaging/android/local-config.gradle @@ -3,5 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' + androidGradlePluginVersion = '8.2.1' } \ No newline at end of file diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/local-config.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/local-config.gradle index 884c2728ec74..b8cf843dca09 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/local-config.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/local-config.gradle @@ -3,5 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' + androidGradlePluginVersion = '8.2.1' } \ No newline at end of file diff --git a/packages/firebase_performance/firebase_performance/android/local-config.gradle b/packages/firebase_performance/firebase_performance/android/local-config.gradle index 884c2728ec74..b8cf843dca09 100644 --- a/packages/firebase_performance/firebase_performance/android/local-config.gradle +++ b/packages/firebase_performance/firebase_performance/android/local-config.gradle @@ -3,5 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' + androidGradlePluginVersion = '8.2.1' } \ No newline at end of file diff --git a/packages/firebase_remote_config/firebase_remote_config/android/local-config.gradle b/packages/firebase_remote_config/firebase_remote_config/android/local-config.gradle index 884c2728ec74..b8cf843dca09 100644 --- a/packages/firebase_remote_config/firebase_remote_config/android/local-config.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/android/local-config.gradle @@ -3,5 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' + androidGradlePluginVersion = '8.2.1' } \ No newline at end of file diff --git a/packages/firebase_storage/firebase_storage/android/local-config.gradle b/packages/firebase_storage/firebase_storage/android/local-config.gradle index 884c2728ec74..b8cf843dca09 100644 --- a/packages/firebase_storage/firebase_storage/android/local-config.gradle +++ b/packages/firebase_storage/firebase_storage/android/local-config.gradle @@ -3,5 +3,5 @@ ext { minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = 'com.android.tools.build:gradle:8.2.1' + androidGradlePluginVersion = '8.2.1' } \ No newline at end of file diff --git a/scripts/generate_versions_gradle.dart b/scripts/generate_versions_gradle.dart index 2231b1908b8b..1931dd1cf52b 100644 --- a/scripts/generate_versions_gradle.dart +++ b/scripts/generate_versions_gradle.dart @@ -18,7 +18,7 @@ import 'dart:io'; import 'package:cli_util/cli_logging.dart' as logging; import 'package:path/path.dart' show joinAll; -// Used to generate a simple txt file for local-config.gradle files to parse in order to use correct java and compilation versions. +// Used to generate config files from ../gradle/local-config.gradle in order to use correct java and compilation versions. void main() async { final workspace = await getMelosWorkspace(); From ed5b1103a854b0709b056855c9741cecb3b17af2 Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Thu, 8 May 2025 11:40:30 +0100 Subject: [PATCH 25/29] feat: added supprot for example apps --- .../crashlytics-example-app-settings.gradle | 29 +++++ gradle/example-app-settings.gradle | 28 ++++ gradle/perf-example-app-settings.gradle | 29 +++++ .../example/android/settings.gradle | 4 +- .../example/android/settings.gradle | 3 + scripts/generate_versions_gradle.dart | 122 +++++++++++++++++- 6 files changed, 208 insertions(+), 7 deletions(-) create mode 100644 gradle/crashlytics-example-app-settings.gradle create mode 100644 gradle/example-app-settings.gradle create mode 100644 gradle/perf-example-app-settings.gradle diff --git a/gradle/crashlytics-example-app-settings.gradle b/gradle/crashlytics-example-app-settings.gradle new file mode 100644 index 000000000000..2d52e1ec2cbf --- /dev/null +++ b/gradle/crashlytics-example-app-settings.gradle @@ -0,0 +1,29 @@ +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() + + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") + + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "8.2.1" apply false + // START: FlutterFire Configuration + id "com.google.gms.google-services" version "4.3.15" apply false + id "com.google.firebase.crashlytics" version "2.8.1" apply false + // END: FlutterFire Configuration + id "org.jetbrains.kotlin.android" version "1.9.22" apply false +} + +include ":app" diff --git a/gradle/example-app-settings.gradle b/gradle/example-app-settings.gradle new file mode 100644 index 000000000000..5f5242c6fd2f --- /dev/null +++ b/gradle/example-app-settings.gradle @@ -0,0 +1,28 @@ +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() + + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") + + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "8.2.1" apply false + // START: FlutterFire Configuration + id "com.google.gms.google-services" version "4.3.15" apply false + // END: FlutterFire Configuration + id "org.jetbrains.kotlin.android" version "1.9.22" apply false +} + +include ":app" diff --git a/gradle/perf-example-app-settings.gradle b/gradle/perf-example-app-settings.gradle new file mode 100644 index 000000000000..7ba559abde51 --- /dev/null +++ b/gradle/perf-example-app-settings.gradle @@ -0,0 +1,29 @@ +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() + + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") + + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "8.2.1" apply false + // START: FlutterFire Configuration + id "com.google.gms.google-services" version "4.3.15" apply false + id "com.google.firebase.firebase-perf" version "1.4.1" apply false + // END: FlutterFire Configuration + id "org.jetbrains.kotlin.android" version "1.9.22" apply false +} + +include ":app" diff --git a/packages/firebase_data_connect/firebase_data_connect/example/android/settings.gradle b/packages/firebase_data_connect/firebase_data_connect/example/android/settings.gradle index e62a70a6c811..5f5242c6fd2f 100644 --- a/packages/firebase_data_connect/firebase_data_connect/example/android/settings.gradle +++ b/packages/firebase_data_connect/firebase_data_connect/example/android/settings.gradle @@ -18,8 +18,10 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.2.1" apply false + // START: FlutterFire Configuration + id "com.google.gms.google-services" version "4.3.15" apply false + // END: FlutterFire Configuration id "org.jetbrains.kotlin.android" version "1.9.22" apply false } diff --git a/packages/firebase_vertexai/firebase_vertexai/example/android/settings.gradle b/packages/firebase_vertexai/firebase_vertexai/example/android/settings.gradle index b6863b1961bf..5f5242c6fd2f 100644 --- a/packages/firebase_vertexai/firebase_vertexai/example/android/settings.gradle +++ b/packages/firebase_vertexai/firebase_vertexai/example/android/settings.gradle @@ -19,6 +19,9 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" id "com.android.application" version "8.2.1" apply false + // START: FlutterFire Configuration + id "com.google.gms.google-services" version "4.3.15" apply false + // END: FlutterFire Configuration id "org.jetbrains.kotlin.android" version "1.9.22" apply false } diff --git a/scripts/generate_versions_gradle.dart b/scripts/generate_versions_gradle.dart index 1931dd1cf52b..8491a85620a9 100644 --- a/scripts/generate_versions_gradle.dart +++ b/scripts/generate_versions_gradle.dart @@ -19,12 +19,10 @@ import 'package:cli_util/cli_logging.dart' as logging; import 'package:path/path.dart' show joinAll; // Used to generate config files from ../gradle/local-config.gradle in order to use correct java and compilation versions. - +// Also works on every example app in the packages. void main() async { final workspace = await getMelosWorkspace(); - // get version from core - // To edit versions for all packages, edit the global-config.txt file in firebase_core package - // located in the android folder for global-config.txt + // To edit versions for all packages, edit the global-config.gradle file in FlutterFire/Gradle final globalConfigPath = joinAll( [ Directory.current.path, @@ -41,19 +39,78 @@ void main() async { ], ); + final exampleAppConfigPath = joinAll( + [ + Directory.current.path, + 'gradle', + 'example-app-settings.gradle', + ], + ); + + final perfExampleAppConfigPath = joinAll( + [ + Directory.current.path, + 'gradle', + 'perf-example-app-settings.gradle', + ], + ); + + final crashlyticsExampleAppConfigPath = joinAll( + [ + Directory.current.path, + 'gradle', + 'crashlytics-example-app-settings.gradle', + ], + ); + + // Define files using paths final globalConfig = File(globalConfigPath); final authConfig = File(authConfigPath); + final exampleAppConfig = File(exampleAppConfigPath); + final perfExampleAppConfig = File(perfExampleAppConfigPath); + final crashlyticsExampleAppConfig = File(crashlyticsExampleAppConfigPath); + // Check if the files exist if (!globalConfig.existsSync()) { throw Exception( 'global_config.gradle file not found in the expected location.', ); } + if (!authConfig.existsSync()) { + throw Exception( + 'global_config.gradle file not found in the expected location.', + ); + } + + if (!exampleAppConfig.existsSync()) { + throw Exception( + 'example-app-settings.gradle file not found in the expected location.', + ); + } + + if (!perfExampleAppConfig.existsSync()) { + throw Exception( + 'per-example-app-settings.gradle file not found in the expected location.', + ); + } + + if (!crashlyticsExampleAppConfig.existsSync()) { + throw Exception( + 'crashlytics-example-app-settings.gradle file not found in the expected location.', + ); + } + for (final package in workspace.filteredPackages.values) { switch (package.name) { case 'firebase_vertexai': - // Skip this package as it does not have gradle in it. + final exampleAppConfigFilePath = '${package.path}/example/android/settings.gradle'; + final copiedExampleAppConfig = await exampleAppConfig.copy( + exampleAppConfigFilePath, + ); + // ignore: avoid_print + print('File copied to: ${copiedExampleAppConfig.path}'); + // Only has gradle in example app. break; case 'firebase_data_connect': // Only has gradle in the example application. @@ -63,6 +120,14 @@ void main() async { ); // ignore: avoid_print print('File copied to: ${copiedConfig.path}'); + + final exampleAppConfigFilePath = '${package.path}/example/android/settings.gradle'; + final copiedExampleAppConfig = await exampleAppConfig.copy( + exampleAppConfigFilePath, + ); + // ignore: avoid_print + print('File copied to: ${copiedExampleAppConfig.path}'); + break; case 'firebase_auth': // Needs minimum compile sdk verstion to 23 specifically for this package. @@ -72,6 +137,45 @@ void main() async { ); // ignore: avoid_print print('File copied to: ${copiedConfig.path}'); + + final exampleAppConfigFilePath = '${package.path}/example/android/settings.gradle'; + final copiedExampleAppConfig = await exampleAppConfig.copy( + exampleAppConfigFilePath, + ); + // ignore: avoid_print + print('File copied to: ${copiedExampleAppConfig.path}'); + + break; + case 'firebase_crashlytics': + final localConfigGradleFilePath = '${package.path}/android/local-config.gradle'; + + final copiedConfig = await globalConfig.copy( + localConfigGradleFilePath, + ); + print('File copied to: ${copiedConfig.path}'); + + final exampleAppConfigFilePath = '${package.path}/example/android/settings.gradle'; + final copiedExampleAppConfig = await crashlyticsExampleAppConfig.copy( + exampleAppConfigFilePath, + ); + print('File copied to: ${copiedExampleAppConfig.path}'); + // ignore: avoid_print + break; + case 'firebase_performance': + // Has a more unique settings.gradle for example app. + final localConfigGradleFilePath = '${package.path}/android/local-config.gradle'; + + final copiedConfig = await globalConfig.copy( + localConfigGradleFilePath, + ); + print('File copied to: ${copiedConfig.path}'); + + final exampleAppConfigFilePath = '${package.path}/example/android/settings.gradle'; + final copiedExampleAppConfig = await perfExampleAppConfig.copy( + exampleAppConfigFilePath, + ); + print('File copied to: ${copiedExampleAppConfig.path}'); + // ignore: avoid_print break; default: // For all other packages, copy the global-config.gradle file to the local-config.gradle file. @@ -80,8 +184,14 @@ void main() async { final copiedConfig = await globalConfig.copy( localConfigGradleFilePath, ); - // ignore: avoid_print print('File copied to: ${copiedConfig.path}'); + + final exampleAppConfigFilePath = '${package.path}/example/android/settings.gradle'; + final copiedExampleAppConfig = await exampleAppConfig.copy( + exampleAppConfigFilePath, + ); + print('File copied to: ${copiedExampleAppConfig.path}'); + // ignore: avoid_print } } } From ec898979edc149d4181af01c66ca6e1556378559 Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Thu, 8 May 2025 12:54:13 +0100 Subject: [PATCH 26/29] feat: handle vertexai example app --- gradle/vertexai-global-config.gradle | 8 ++++++ .../example/android/app/build.gradle | 8 +++--- .../example/android/app/local-config.gradle | 8 ++++++ scripts/generate_versions_gradle.dart | 27 ++++++++++++++++++- 4 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 gradle/vertexai-global-config.gradle create mode 100644 packages/firebase_vertexai/firebase_vertexai/example/android/app/local-config.gradle diff --git a/gradle/vertexai-global-config.gradle b/gradle/vertexai-global-config.gradle new file mode 100644 index 000000000000..3ad80e934e78 --- /dev/null +++ b/gradle/vertexai-global-config.gradle @@ -0,0 +1,8 @@ +// For use with example app +ext { + compileSdk=35 + minSdk=23 + targetSdk=33 + javaVersion = JavaVersion.toVersion(17) + androidGradlePluginVersion = '8.2.1' +} \ No newline at end of file diff --git a/packages/firebase_vertexai/firebase_vertexai/example/android/app/build.gradle b/packages/firebase_vertexai/firebase_vertexai/example/android/app/build.gradle index b5a45dbd1ff0..bed6e811a523 100644 --- a/packages/firebase_vertexai/firebase_vertexai/example/android/app/build.gradle +++ b/packages/firebase_vertexai/firebase_vertexai/example/android/app/build.gradle @@ -7,6 +7,8 @@ plugins { id "dev.flutter.flutter-gradle-plugin" } +apply from: file("local-config.gradle") + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -28,12 +30,12 @@ if (flutterVersionName == null) { android { namespace "com.example.example" - compileSdk 35 + compileSdk project.ext.compileSdk defaultConfig { applicationId "com.example.example" - minSdk 23 - targetSdk 33 + minSdk project.ext.minSdk + targetSdk project.ext.targetSdk versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/packages/firebase_vertexai/firebase_vertexai/example/android/app/local-config.gradle b/packages/firebase_vertexai/firebase_vertexai/example/android/app/local-config.gradle new file mode 100644 index 000000000000..3ad80e934e78 --- /dev/null +++ b/packages/firebase_vertexai/firebase_vertexai/example/android/app/local-config.gradle @@ -0,0 +1,8 @@ +// For use with example app +ext { + compileSdk=35 + minSdk=23 + targetSdk=33 + javaVersion = JavaVersion.toVersion(17) + androidGradlePluginVersion = '8.2.1' +} \ No newline at end of file diff --git a/scripts/generate_versions_gradle.dart b/scripts/generate_versions_gradle.dart index 8491a85620a9..0777764f328f 100644 --- a/scripts/generate_versions_gradle.dart +++ b/scripts/generate_versions_gradle.dart @@ -39,6 +39,14 @@ void main() async { ], ); + final vertexaiConfigPath = joinAll( + [ + Directory.current.path, + 'gradle', + 'vertexai-global-config.gradle', + ], + ); + final exampleAppConfigPath = joinAll( [ Directory.current.path, @@ -66,6 +74,7 @@ void main() async { // Define files using paths final globalConfig = File(globalConfigPath); final authConfig = File(authConfigPath); + final vertexaiConfig = File(vertexaiConfigPath); final exampleAppConfig = File(exampleAppConfigPath); final perfExampleAppConfig = File(perfExampleAppConfigPath); final crashlyticsExampleAppConfig = File(crashlyticsExampleAppConfigPath); @@ -83,6 +92,12 @@ void main() async { ); } + if (!vertexaiConfig.existsSync()) { + throw Exception( + 'vertexai_config.gradle file not found in the expected location.', + ); + } + if (!exampleAppConfig.existsSync()) { throw Exception( 'example-app-settings.gradle file not found in the expected location.', @@ -104,13 +119,21 @@ void main() async { for (final package in workspace.filteredPackages.values) { switch (package.name) { case 'firebase_vertexai': + // Only has gradle in the example application. + final localConfigGradleFilePath = '${package.path}/example/android/app/local-config.gradle'; + final copiedConfig = await vertexaiConfig.copy( + localConfigGradleFilePath, + ); + // ignore: avoid_print + print('File copied to: ${copiedConfig.path}'); + final exampleAppConfigFilePath = '${package.path}/example/android/settings.gradle'; final copiedExampleAppConfig = await exampleAppConfig.copy( exampleAppConfigFilePath, ); // ignore: avoid_print print('File copied to: ${copiedExampleAppConfig.path}'); - // Only has gradle in example app. + break; case 'firebase_data_connect': // Only has gradle in the example application. @@ -160,6 +183,7 @@ void main() async { ); print('File copied to: ${copiedExampleAppConfig.path}'); // ignore: avoid_print + break; case 'firebase_performance': // Has a more unique settings.gradle for example app. @@ -176,6 +200,7 @@ void main() async { ); print('File copied to: ${copiedExampleAppConfig.path}'); // ignore: avoid_print + break; default: // For all other packages, copy the global-config.gradle file to the local-config.gradle file. From c4d4c791c9dcc33904b30cd016527f7ee00cc807 Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Fri, 9 May 2025 15:23:10 +0100 Subject: [PATCH 27/29] feat: more unification and cleanup --- gradle/auth-global-config.gradle | 7 - .../crashlytics-example-app-settings.gradle | 29 --- gradle/example-app-settings.gradle | 28 --- gradle/perf-example-app-settings.gradle | 29 --- gradle/vertexai-global-config.gradle | 8 - .../example/android/gradle.properties | 1 + .../example/android/gradle.properties | 1 + .../example/android/gradle.properties | 1 + .../example/android/gradle.properties | 1 + .../example/android/gradle.properties | 1 + .../firebase_auth/android/build.gradle | 8 +- .../firebase_auth/android/local-config.gradle | 7 - .../firebase_auth/android/settings.gradle | 4 +- .../example/android/gradle.properties | 1 + .../example/android/gradle.properties | 1 + .../example/android/app/local-config.gradle | 2 +- .../example/android/gradle.properties | 1 + .../example/android/gradle.properties | 1 + .../example/android/gradle.properties | 1 + .../example/android/gradle.properties | 1 + .../example/android/gradle.properties | 1 + .../example/android/gradle.properties | 1 + .../example/android/gradle.properties | 1 + .../example/android/gradle.properties | 1 + .../example/android/app/local-config.gradle | 8 - scripts/generate_versions_gradle.dart | 210 +++++------------- {gradle => scripts}/global-config.gradle | 0 27 files changed, 79 insertions(+), 276 deletions(-) delete mode 100644 gradle/auth-global-config.gradle delete mode 100644 gradle/crashlytics-example-app-settings.gradle delete mode 100644 gradle/example-app-settings.gradle delete mode 100644 gradle/perf-example-app-settings.gradle delete mode 100644 gradle/vertexai-global-config.gradle delete mode 100644 packages/firebase_auth/firebase_auth/android/local-config.gradle delete mode 100644 packages/firebase_vertexai/firebase_vertexai/example/android/app/local-config.gradle rename {gradle => scripts}/global-config.gradle (100%) diff --git a/gradle/auth-global-config.gradle b/gradle/auth-global-config.gradle deleted file mode 100644 index 9d6f216adcc1..000000000000 --- a/gradle/auth-global-config.gradle +++ /dev/null @@ -1,7 +0,0 @@ -ext { - compileSdk=34 - minSdk=23 - targetSdk=34 - javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = '8.2.1' -} \ No newline at end of file diff --git a/gradle/crashlytics-example-app-settings.gradle b/gradle/crashlytics-example-app-settings.gradle deleted file mode 100644 index 2d52e1ec2cbf..000000000000 --- a/gradle/crashlytics-example-app-settings.gradle +++ /dev/null @@ -1,29 +0,0 @@ -pluginManagement { - def flutterSdkPath = { - def properties = new Properties() - file("local.properties").withInputStream { properties.load(it) } - def flutterSdkPath = properties.getProperty("flutter.sdk") - assert flutterSdkPath != null, "flutter.sdk not set in local.properties" - return flutterSdkPath - }() - - includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") - - repositories { - google() - mavenCentral() - gradlePluginPortal() - } -} - -plugins { - id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.2.1" apply false - // START: FlutterFire Configuration - id "com.google.gms.google-services" version "4.3.15" apply false - id "com.google.firebase.crashlytics" version "2.8.1" apply false - // END: FlutterFire Configuration - id "org.jetbrains.kotlin.android" version "1.9.22" apply false -} - -include ":app" diff --git a/gradle/example-app-settings.gradle b/gradle/example-app-settings.gradle deleted file mode 100644 index 5f5242c6fd2f..000000000000 --- a/gradle/example-app-settings.gradle +++ /dev/null @@ -1,28 +0,0 @@ -pluginManagement { - def flutterSdkPath = { - def properties = new Properties() - file("local.properties").withInputStream { properties.load(it) } - def flutterSdkPath = properties.getProperty("flutter.sdk") - assert flutterSdkPath != null, "flutter.sdk not set in local.properties" - return flutterSdkPath - }() - - includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") - - repositories { - google() - mavenCentral() - gradlePluginPortal() - } -} - -plugins { - id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.2.1" apply false - // START: FlutterFire Configuration - id "com.google.gms.google-services" version "4.3.15" apply false - // END: FlutterFire Configuration - id "org.jetbrains.kotlin.android" version "1.9.22" apply false -} - -include ":app" diff --git a/gradle/perf-example-app-settings.gradle b/gradle/perf-example-app-settings.gradle deleted file mode 100644 index 7ba559abde51..000000000000 --- a/gradle/perf-example-app-settings.gradle +++ /dev/null @@ -1,29 +0,0 @@ -pluginManagement { - def flutterSdkPath = { - def properties = new Properties() - file("local.properties").withInputStream { properties.load(it) } - def flutterSdkPath = properties.getProperty("flutter.sdk") - assert flutterSdkPath != null, "flutter.sdk not set in local.properties" - return flutterSdkPath - }() - - includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") - - repositories { - google() - mavenCentral() - gradlePluginPortal() - } -} - -plugins { - id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.2.1" apply false - // START: FlutterFire Configuration - id "com.google.gms.google-services" version "4.3.15" apply false - id "com.google.firebase.firebase-perf" version "1.4.1" apply false - // END: FlutterFire Configuration - id "org.jetbrains.kotlin.android" version "1.9.22" apply false -} - -include ":app" diff --git a/gradle/vertexai-global-config.gradle b/gradle/vertexai-global-config.gradle deleted file mode 100644 index 3ad80e934e78..000000000000 --- a/gradle/vertexai-global-config.gradle +++ /dev/null @@ -1,8 +0,0 @@ -// For use with example app -ext { - compileSdk=35 - minSdk=23 - targetSdk=33 - javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = '8.2.1' -} \ No newline at end of file diff --git a/packages/cloud_firestore/cloud_firestore/example/android/gradle.properties b/packages/cloud_firestore/cloud_firestore/example/android/gradle.properties index 3b5b324f6e3f..cfa33c060503 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/gradle.properties +++ b/packages/cloud_firestore/cloud_firestore/example/android/gradle.properties @@ -1,3 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true +androidGradlePluginVersion=8.2.1 \ No newline at end of file diff --git a/packages/cloud_functions/cloud_functions/example/android/gradle.properties b/packages/cloud_functions/cloud_functions/example/android/gradle.properties index 3b5b324f6e3f..cfa33c060503 100644 --- a/packages/cloud_functions/cloud_functions/example/android/gradle.properties +++ b/packages/cloud_functions/cloud_functions/example/android/gradle.properties @@ -1,3 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true +androidGradlePluginVersion=8.2.1 \ No newline at end of file diff --git a/packages/firebase_analytics/firebase_analytics/example/android/gradle.properties b/packages/firebase_analytics/firebase_analytics/example/android/gradle.properties index 3b5b324f6e3f..cfa33c060503 100644 --- a/packages/firebase_analytics/firebase_analytics/example/android/gradle.properties +++ b/packages/firebase_analytics/firebase_analytics/example/android/gradle.properties @@ -1,3 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true +androidGradlePluginVersion=8.2.1 \ No newline at end of file diff --git a/packages/firebase_app_check/firebase_app_check/example/android/gradle.properties b/packages/firebase_app_check/firebase_app_check/example/android/gradle.properties index 3b5b324f6e3f..cfa33c060503 100644 --- a/packages/firebase_app_check/firebase_app_check/example/android/gradle.properties +++ b/packages/firebase_app_check/firebase_app_check/example/android/gradle.properties @@ -1,3 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true +androidGradlePluginVersion=8.2.1 \ No newline at end of file diff --git a/packages/firebase_app_installations/firebase_app_installations/example/android/gradle.properties b/packages/firebase_app_installations/firebase_app_installations/example/android/gradle.properties index 3b5b324f6e3f..cfa33c060503 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/android/gradle.properties +++ b/packages/firebase_app_installations/firebase_app_installations/example/android/gradle.properties @@ -1,3 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true +androidGradlePluginVersion=8.2.1 \ No newline at end of file diff --git a/packages/firebase_auth/firebase_auth/android/build.gradle b/packages/firebase_auth/firebase_auth/android/build.gradle index 0dda6923dcde..014212a287f3 100755 --- a/packages/firebase_auth/firebase_auth/android/build.gradle +++ b/packages/firebase_auth/firebase_auth/android/build.gradle @@ -37,16 +37,16 @@ android { namespace 'io.flutter.plugins.firebase.auth' } - compileSdkVersion project.ext.compileSdk + compileSdkVersion 34 defaultConfig { - minSdkVersion project.ext.minSdk + minSdkVersion 21 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility project.ext.javaVersion - targetCompatibility project.ext.javaVersion + sourceCompatibility JavaVersion.toVersion(17) + targetCompatibility JavaVersion.toVersion(17) } buildFeatures { diff --git a/packages/firebase_auth/firebase_auth/android/local-config.gradle b/packages/firebase_auth/firebase_auth/android/local-config.gradle deleted file mode 100644 index b8cf843dca09..000000000000 --- a/packages/firebase_auth/firebase_auth/android/local-config.gradle +++ /dev/null @@ -1,7 +0,0 @@ -ext { - compileSdk=34 - minSdk=21 - targetSdk=34 - javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = '8.2.1' -} \ No newline at end of file diff --git a/packages/firebase_auth/firebase_auth/android/settings.gradle b/packages/firebase_auth/firebase_auth/android/settings.gradle index 48dc092d29e3..95a9df58770d 100755 --- a/packages/firebase_auth/firebase_auth/android/settings.gradle +++ b/packages/firebase_auth/firebase_auth/android/settings.gradle @@ -4,7 +4,7 @@ apply from: file("local-config.gradle") pluginManagement { plugins { - id "com.android.application" version project.ext.androidGradlePluginVersion - id "com.android.library" version project.ext.androidGradlePluginVersion + id "com.android.application" version "8.2.1" + id "com.android.library" version "8.2.1" } } diff --git a/packages/firebase_core/firebase_core/example/android/gradle.properties b/packages/firebase_core/firebase_core/example/android/gradle.properties index 3b5b324f6e3f..cfa33c060503 100644 --- a/packages/firebase_core/firebase_core/example/android/gradle.properties +++ b/packages/firebase_core/firebase_core/example/android/gradle.properties @@ -1,3 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true +androidGradlePluginVersion=8.2.1 \ No newline at end of file diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle.properties b/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle.properties index 3b5b324f6e3f..cfa33c060503 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle.properties +++ b/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle.properties @@ -1,3 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true +androidGradlePluginVersion=8.2.1 \ No newline at end of file diff --git a/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle b/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle index 9d6f216adcc1..b8cf843dca09 100644 --- a/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle +++ b/packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle @@ -1,6 +1,6 @@ ext { compileSdk=34 - minSdk=23 + minSdk=21 targetSdk=34 javaVersion = JavaVersion.toVersion(17) androidGradlePluginVersion = '8.2.1' diff --git a/packages/firebase_database/firebase_database/example/android/gradle.properties b/packages/firebase_database/firebase_database/example/android/gradle.properties index 3b5b324f6e3f..cfa33c060503 100644 --- a/packages/firebase_database/firebase_database/example/android/gradle.properties +++ b/packages/firebase_database/firebase_database/example/android/gradle.properties @@ -1,3 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true +androidGradlePluginVersion=8.2.1 \ No newline at end of file diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/gradle.properties b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/gradle.properties index 3b5b324f6e3f..cfa33c060503 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/gradle.properties +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/gradle.properties @@ -1,3 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true +androidGradlePluginVersion=8.2.1 \ No newline at end of file diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/gradle.properties b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/gradle.properties index 3b5b324f6e3f..cfa33c060503 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/gradle.properties +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/gradle.properties @@ -1,3 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true +androidGradlePluginVersion=8.2.1 \ No newline at end of file diff --git a/packages/firebase_messaging/firebase_messaging/example/android/gradle.properties b/packages/firebase_messaging/firebase_messaging/example/android/gradle.properties index 3b5b324f6e3f..cfa33c060503 100644 --- a/packages/firebase_messaging/firebase_messaging/example/android/gradle.properties +++ b/packages/firebase_messaging/firebase_messaging/example/android/gradle.properties @@ -1,3 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true +androidGradlePluginVersion=8.2.1 \ No newline at end of file diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/gradle.properties b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/gradle.properties index 3b5b324f6e3f..cfa33c060503 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/gradle.properties +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/gradle.properties @@ -1,3 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true +androidGradlePluginVersion=8.2.1 \ No newline at end of file diff --git a/packages/firebase_performance/firebase_performance/example/android/gradle.properties b/packages/firebase_performance/firebase_performance/example/android/gradle.properties index 3b5b324f6e3f..cfa33c060503 100644 --- a/packages/firebase_performance/firebase_performance/example/android/gradle.properties +++ b/packages/firebase_performance/firebase_performance/example/android/gradle.properties @@ -1,3 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true +androidGradlePluginVersion=8.2.1 \ No newline at end of file diff --git a/packages/firebase_remote_config/firebase_remote_config/example/android/gradle.properties b/packages/firebase_remote_config/firebase_remote_config/example/android/gradle.properties index 3b5b324f6e3f..cfa33c060503 100644 --- a/packages/firebase_remote_config/firebase_remote_config/example/android/gradle.properties +++ b/packages/firebase_remote_config/firebase_remote_config/example/android/gradle.properties @@ -1,3 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true +androidGradlePluginVersion=8.2.1 \ No newline at end of file diff --git a/packages/firebase_storage/firebase_storage/example/android/gradle.properties b/packages/firebase_storage/firebase_storage/example/android/gradle.properties index 3b5b324f6e3f..cfa33c060503 100644 --- a/packages/firebase_storage/firebase_storage/example/android/gradle.properties +++ b/packages/firebase_storage/firebase_storage/example/android/gradle.properties @@ -1,3 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true +androidGradlePluginVersion=8.2.1 \ No newline at end of file diff --git a/packages/firebase_vertexai/firebase_vertexai/example/android/app/local-config.gradle b/packages/firebase_vertexai/firebase_vertexai/example/android/app/local-config.gradle deleted file mode 100644 index 3ad80e934e78..000000000000 --- a/packages/firebase_vertexai/firebase_vertexai/example/android/app/local-config.gradle +++ /dev/null @@ -1,8 +0,0 @@ -// For use with example app -ext { - compileSdk=35 - minSdk=23 - targetSdk=33 - javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = '8.2.1' -} \ No newline at end of file diff --git a/scripts/generate_versions_gradle.dart b/scripts/generate_versions_gradle.dart index 0777764f328f..5b6604a512af 100644 --- a/scripts/generate_versions_gradle.dart +++ b/scripts/generate_versions_gradle.dart @@ -20,64 +20,20 @@ import 'package:path/path.dart' show joinAll; // Used to generate config files from ../gradle/local-config.gradle in order to use correct java and compilation versions. // Also works on every example app in the packages. +// NOTICE: This script does not update auth or vertexai packages as they are manually updated. void main() async { final workspace = await getMelosWorkspace(); // To edit versions for all packages, edit the global-config.gradle file in FlutterFire/Gradle final globalConfigPath = joinAll( [ Directory.current.path, - 'gradle', + 'scripts', 'global-config.gradle', ], ); - final authConfigPath = joinAll( - [ - Directory.current.path, - 'gradle', - 'auth-global-config.gradle', - ], - ); - - final vertexaiConfigPath = joinAll( - [ - Directory.current.path, - 'gradle', - 'vertexai-global-config.gradle', - ], - ); - - final exampleAppConfigPath = joinAll( - [ - Directory.current.path, - 'gradle', - 'example-app-settings.gradle', - ], - ); - - final perfExampleAppConfigPath = joinAll( - [ - Directory.current.path, - 'gradle', - 'perf-example-app-settings.gradle', - ], - ); - - final crashlyticsExampleAppConfigPath = joinAll( - [ - Directory.current.path, - 'gradle', - 'crashlytics-example-app-settings.gradle', - ], - ); - // Define files using paths final globalConfig = File(globalConfigPath); - final authConfig = File(authConfigPath); - final vertexaiConfig = File(vertexaiConfigPath); - final exampleAppConfig = File(exampleAppConfigPath); - final perfExampleAppConfig = File(perfExampleAppConfigPath); - final crashlyticsExampleAppConfig = File(crashlyticsExampleAppConfigPath); // Check if the files exist if (!globalConfig.existsSync()) { @@ -86,121 +42,22 @@ void main() async { ); } - if (!authConfig.existsSync()) { - throw Exception( - 'global_config.gradle file not found in the expected location.', - ); - } - - if (!vertexaiConfig.existsSync()) { - throw Exception( - 'vertexai_config.gradle file not found in the expected location.', - ); - } - - if (!exampleAppConfig.existsSync()) { - throw Exception( - 'example-app-settings.gradle file not found in the expected location.', - ); - } - - if (!perfExampleAppConfig.existsSync()) { - throw Exception( - 'per-example-app-settings.gradle file not found in the expected location.', - ); - } - - if (!crashlyticsExampleAppConfig.existsSync()) { - throw Exception( - 'crashlytics-example-app-settings.gradle file not found in the expected location.', - ); - } - for (final package in workspace.filteredPackages.values) { switch (package.name) { case 'firebase_vertexai': - // Only has gradle in the example application. - final localConfigGradleFilePath = '${package.path}/example/android/app/local-config.gradle'; - final copiedConfig = await vertexaiConfig.copy( - localConfigGradleFilePath, - ); - // ignore: avoid_print - print('File copied to: ${copiedConfig.path}'); - - final exampleAppConfigFilePath = '${package.path}/example/android/settings.gradle'; - final copiedExampleAppConfig = await exampleAppConfig.copy( - exampleAppConfigFilePath, - ); - // ignore: avoid_print - print('File copied to: ${copiedExampleAppConfig.path}'); - + // skip firebase_vertexai as we manually update it break; case 'firebase_data_connect': // Only has gradle in the example application. final localConfigGradleFilePath = '${package.path}/example/android/app/local-config.gradle'; - final copiedConfig = await authConfig.copy( - localConfigGradleFilePath, - ); - // ignore: avoid_print - print('File copied to: ${copiedConfig.path}'); - - final exampleAppConfigFilePath = '${package.path}/example/android/settings.gradle'; - final copiedExampleAppConfig = await exampleAppConfig.copy( - exampleAppConfigFilePath, - ); - // ignore: avoid_print - print('File copied to: ${copiedExampleAppConfig.path}'); - - break; - case 'firebase_auth': - // Needs minimum compile sdk verstion to 23 specifically for this package. - final localConfigGradleFilePath = '${package.path}/android/local-config.gradle'; final copiedConfig = await globalConfig.copy( localConfigGradleFilePath, ); // ignore: avoid_print print('File copied to: ${copiedConfig.path}'); - - final exampleAppConfigFilePath = '${package.path}/example/android/settings.gradle'; - final copiedExampleAppConfig = await exampleAppConfig.copy( - exampleAppConfigFilePath, - ); - // ignore: avoid_print - print('File copied to: ${copiedExampleAppConfig.path}'); - break; - case 'firebase_crashlytics': - final localConfigGradleFilePath = '${package.path}/android/local-config.gradle'; - - final copiedConfig = await globalConfig.copy( - localConfigGradleFilePath, - ); - print('File copied to: ${copiedConfig.path}'); - - final exampleAppConfigFilePath = '${package.path}/example/android/settings.gradle'; - final copiedExampleAppConfig = await crashlyticsExampleAppConfig.copy( - exampleAppConfigFilePath, - ); - print('File copied to: ${copiedExampleAppConfig.path}'); - // ignore: avoid_print - - break; - case 'firebase_performance': - // Has a more unique settings.gradle for example app. - final localConfigGradleFilePath = '${package.path}/android/local-config.gradle'; - - final copiedConfig = await globalConfig.copy( - localConfigGradleFilePath, - ); - print('File copied to: ${copiedConfig.path}'); - - final exampleAppConfigFilePath = '${package.path}/example/android/settings.gradle'; - final copiedExampleAppConfig = await perfExampleAppConfig.copy( - exampleAppConfigFilePath, - ); - print('File copied to: ${copiedExampleAppConfig.path}'); - // ignore: avoid_print - + case 'firebase_auth': + // Skip firebase_auth as we manually update it break; default: // For all other packages, copy the global-config.gradle file to the local-config.gradle file. @@ -211,12 +68,12 @@ void main() async { ); print('File copied to: ${copiedConfig.path}'); - final exampleAppConfigFilePath = '${package.path}/example/android/settings.gradle'; - final copiedExampleAppConfig = await exampleAppConfig.copy( - exampleAppConfigFilePath, + final gradlePropertiesFilePath = '${package.path}/example/android/gradle.properties'; + extractAndWriteProperty( + globalConfig: globalConfig, + gradlePropertiesFile: File(gradlePropertiesFilePath), ); - print('File copied to: ${copiedExampleAppConfig.path}'); - // ignore: avoid_print + print('successfully wrote property to $gradlePropertiesFilePath'); } } } @@ -238,3 +95,50 @@ Future getMelosWorkspace() async { return workspace; } + +Future extractAndWriteProperty({ + required File globalConfig, + required File gradlePropertiesFile, +}) async { + + const String propertyName = 'androidGradlePluginVersion'; + if (!await globalConfig.exists()) { + print('Global config file not found: ${globalConfig.path}'); + return; + } + + final globalContent = await globalConfig.readAsString(); + + // Extract the property from the ext block + final regex = RegExp('$propertyName\\s*=\\s*[\'"]?([^\\n\'"]+)[\'"]?'); + final match = regex.firstMatch(globalContent); + + if (match == null) { + print('Property $propertyName not found in global config.'); + return; + } + + final value = match.group(1); + + final lines = await gradlePropertiesFile.exists() + ? await gradlePropertiesFile.readAsLines() + : []; + + bool updated = false; + + final updatedLines = lines.map((line) { + if (line.startsWith('$propertyName=')) { + updated = true; + return '$propertyName=$value'; + } + return line; + }).toList(); + + if (!updated) { + updatedLines.add('$propertyName=$value'); + } + + await gradlePropertiesFile.writeAsString(updatedLines.join('\n')); + + print('Wrote $propertyName=$value to ${gradlePropertiesFile.path}'); +} diff --git a/gradle/global-config.gradle b/scripts/global-config.gradle similarity index 100% rename from gradle/global-config.gradle rename to scripts/global-config.gradle From 826a49d2fc58e2bd26d639b9122004228a09efae Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Fri, 9 May 2025 15:34:38 +0100 Subject: [PATCH 28/29] chore: make settings.gradle apply properties --- .../cloud_firestore/example/android/settings.gradle | 2 +- .../cloud_functions/example/android/settings.gradle | 2 +- .../example/android/settings.gradle | 2 +- .../example/android/settings.gradle | 2 +- .../example/android/settings.gradle | 2 +- .../firebase_auth/firebase_auth/android/build.gradle | 1 - .../firebase_auth/android/settings.gradle | 2 -- .../firebase_auth/example/android/app/build.gradle | 11 ++++------- .../firebase_core/example/android/settings.gradle | 2 +- .../example/android/settings.gradle | 2 +- .../example/android/settings.gradle | 2 +- .../firebase_database/example/android/settings.gradle | 2 +- .../example/android/settings.gradle | 2 +- .../example/android/settings.gradle | 2 +- .../example/android/settings.gradle | 2 +- .../example/android/settings.gradle | 2 +- .../example/android/settings.gradle | 2 +- .../firebase_storage/example/android/settings.gradle | 2 +- .../example/android/app/build.gradle | 8 +++----- tests/android/app/build.gradle | 9 ++++----- tests/android/app/local-config.gradle | 6 ------ 21 files changed, 26 insertions(+), 41 deletions(-) delete mode 100644 tests/android/app/local-config.gradle diff --git a/packages/cloud_firestore/cloud_firestore/example/android/settings.gradle b/packages/cloud_firestore/cloud_firestore/example/android/settings.gradle index 5f5242c6fd2f..30463c1cf2f2 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/settings.gradle +++ b/packages/cloud_firestore/cloud_firestore/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.2.1" apply false + id "com.android.application" version "${androidGradlePluginVersion}" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/packages/cloud_functions/cloud_functions/example/android/settings.gradle b/packages/cloud_functions/cloud_functions/example/android/settings.gradle index 5f5242c6fd2f..30463c1cf2f2 100644 --- a/packages/cloud_functions/cloud_functions/example/android/settings.gradle +++ b/packages/cloud_functions/cloud_functions/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.2.1" apply false + id "com.android.application" version "${androidGradlePluginVersion}" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/packages/firebase_analytics/firebase_analytics/example/android/settings.gradle b/packages/firebase_analytics/firebase_analytics/example/android/settings.gradle index 5f5242c6fd2f..30463c1cf2f2 100644 --- a/packages/firebase_analytics/firebase_analytics/example/android/settings.gradle +++ b/packages/firebase_analytics/firebase_analytics/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.2.1" apply false + id "com.android.application" version "${androidGradlePluginVersion}" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/packages/firebase_app_check/firebase_app_check/example/android/settings.gradle b/packages/firebase_app_check/firebase_app_check/example/android/settings.gradle index 5f5242c6fd2f..30463c1cf2f2 100644 --- a/packages/firebase_app_check/firebase_app_check/example/android/settings.gradle +++ b/packages/firebase_app_check/firebase_app_check/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.2.1" apply false + id "com.android.application" version "${androidGradlePluginVersion}" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/packages/firebase_app_installations/firebase_app_installations/example/android/settings.gradle b/packages/firebase_app_installations/firebase_app_installations/example/android/settings.gradle index 5f5242c6fd2f..30463c1cf2f2 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/android/settings.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.2.1" apply false + id "com.android.application" version "${androidGradlePluginVersion}" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/packages/firebase_auth/firebase_auth/android/build.gradle b/packages/firebase_auth/firebase_auth/android/build.gradle index 014212a287f3..100357c00500 100755 --- a/packages/firebase_auth/firebase_auth/android/build.gradle +++ b/packages/firebase_auth/firebase_auth/android/build.gradle @@ -2,7 +2,6 @@ group 'io.flutter.plugins.firebase.auth' version '1.0-SNAPSHOT' apply plugin: 'com.android.library' -apply from: file("local-config.gradle") buildscript { repositories { diff --git a/packages/firebase_auth/firebase_auth/android/settings.gradle b/packages/firebase_auth/firebase_auth/android/settings.gradle index 95a9df58770d..cb98a9f3a247 100755 --- a/packages/firebase_auth/firebase_auth/android/settings.gradle +++ b/packages/firebase_auth/firebase_auth/android/settings.gradle @@ -1,7 +1,5 @@ rootProject.name = 'firebase_auth' -apply from: file("local-config.gradle") - pluginManagement { plugins { id "com.android.application" version "8.2.1" diff --git a/packages/firebase_auth/firebase_auth/example/android/app/build.gradle b/packages/firebase_auth/firebase_auth/example/android/app/build.gradle index b1f6468ceeea..15495e307201 100644 --- a/packages/firebase_auth/firebase_auth/example/android/app/build.gradle +++ b/packages/firebase_auth/firebase_auth/example/android/app/build.gradle @@ -7,7 +7,6 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } -apply from: file("../../../android/local-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") @@ -31,14 +30,12 @@ android { namespace = "io.flutter.plugins.firebase.auth.example" compileSdk = flutter.compileSdkVersion ndkVersion = flutter.ndkVersion - compileOptions { - sourceCompatibility = project.ext.javaVersion - targetCompatibility = project.ext.javaVersion + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = project.ext.javaVersion + jvmTarget = JavaVersion.VERSION_17 } defaultConfig { @@ -62,4 +59,4 @@ android { flutter { source = "../.." -} +} \ No newline at end of file diff --git a/packages/firebase_core/firebase_core/example/android/settings.gradle b/packages/firebase_core/firebase_core/example/android/settings.gradle index 5f5242c6fd2f..30463c1cf2f2 100644 --- a/packages/firebase_core/firebase_core/example/android/settings.gradle +++ b/packages/firebase_core/firebase_core/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.2.1" apply false + id "com.android.application" version "${androidGradlePluginVersion}" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/android/settings.gradle b/packages/firebase_crashlytics/firebase_crashlytics/example/android/settings.gradle index 2d52e1ec2cbf..abfc4f1fc971 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/android/settings.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.2.1" apply false + id "com.android.application" version "${androidGradlePluginVersion}" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false id "com.google.firebase.crashlytics" version "2.8.1" apply false diff --git a/packages/firebase_data_connect/firebase_data_connect/example/android/settings.gradle b/packages/firebase_data_connect/firebase_data_connect/example/android/settings.gradle index 5f5242c6fd2f..30463c1cf2f2 100644 --- a/packages/firebase_data_connect/firebase_data_connect/example/android/settings.gradle +++ b/packages/firebase_data_connect/firebase_data_connect/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.2.1" apply false + id "com.android.application" version "${androidGradlePluginVersion}" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/packages/firebase_database/firebase_database/example/android/settings.gradle b/packages/firebase_database/firebase_database/example/android/settings.gradle index 5f5242c6fd2f..30463c1cf2f2 100644 --- a/packages/firebase_database/firebase_database/example/android/settings.gradle +++ b/packages/firebase_database/firebase_database/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.2.1" apply false + id "com.android.application" version "${androidGradlePluginVersion}" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/settings.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/settings.gradle index 5f5242c6fd2f..30463c1cf2f2 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/settings.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.2.1" apply false + id "com.android.application" version "${androidGradlePluginVersion}" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/settings.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/settings.gradle index 5f5242c6fd2f..30463c1cf2f2 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/settings.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.2.1" apply false + id "com.android.application" version "${androidGradlePluginVersion}" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/packages/firebase_messaging/firebase_messaging/example/android/settings.gradle b/packages/firebase_messaging/firebase_messaging/example/android/settings.gradle index 5f5242c6fd2f..30463c1cf2f2 100644 --- a/packages/firebase_messaging/firebase_messaging/example/android/settings.gradle +++ b/packages/firebase_messaging/firebase_messaging/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.2.1" apply false + id "com.android.application" version "${androidGradlePluginVersion}" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/settings.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/settings.gradle index 5f5242c6fd2f..30463c1cf2f2 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/settings.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.2.1" apply false + id "com.android.application" version "${androidGradlePluginVersion}" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/packages/firebase_performance/firebase_performance/example/android/settings.gradle b/packages/firebase_performance/firebase_performance/example/android/settings.gradle index 7ba559abde51..678f1d06b76e 100644 --- a/packages/firebase_performance/firebase_performance/example/android/settings.gradle +++ b/packages/firebase_performance/firebase_performance/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.2.1" apply false + id "com.android.application" version "${androidGradlePluginVersion}" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false id "com.google.firebase.firebase-perf" version "1.4.1" apply false diff --git a/packages/firebase_storage/firebase_storage/example/android/settings.gradle b/packages/firebase_storage/firebase_storage/example/android/settings.gradle index 5f5242c6fd2f..30463c1cf2f2 100644 --- a/packages/firebase_storage/firebase_storage/example/android/settings.gradle +++ b/packages/firebase_storage/firebase_storage/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.2.1" apply false + id "com.android.application" version "${androidGradlePluginVersion}" apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/packages/firebase_vertexai/firebase_vertexai/example/android/app/build.gradle b/packages/firebase_vertexai/firebase_vertexai/example/android/app/build.gradle index bed6e811a523..b5a45dbd1ff0 100644 --- a/packages/firebase_vertexai/firebase_vertexai/example/android/app/build.gradle +++ b/packages/firebase_vertexai/firebase_vertexai/example/android/app/build.gradle @@ -7,8 +7,6 @@ plugins { id "dev.flutter.flutter-gradle-plugin" } -apply from: file("local-config.gradle") - def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -30,12 +28,12 @@ if (flutterVersionName == null) { android { namespace "com.example.example" - compileSdk project.ext.compileSdk + compileSdk 35 defaultConfig { applicationId "com.example.example" - minSdk project.ext.minSdk - targetSdk project.ext.targetSdk + minSdk 23 + targetSdk 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/tests/android/app/build.gradle b/tests/android/app/build.gradle index 8b63e93ff326..eac6780caf65 100644 --- a/tests/android/app/build.gradle +++ b/tests/android/app/build.gradle @@ -4,7 +4,6 @@ plugins { // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } -apply from: file("local-config.gradle") def localProperties = new Properties() def localPropertiesFile = rootProject.file("local.properties") @@ -26,17 +25,17 @@ if (flutterVersionName == null) { android { namespace = "io.flutter.plugins.firebase.tests" - compileSdk = targetSdk + compileSdk = 35 ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = project.ext.javaVersion - targetCompatibility = project.ext.javaVersion + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 coreLibraryDesugaringEnabled true } kotlinOptions { - jvmTarget = project.ext.javaVersion + targetCompatibility = JavaVersion.VERSION_17 } defaultConfig { diff --git a/tests/android/app/local-config.gradle b/tests/android/app/local-config.gradle deleted file mode 100644 index 1a2ef0c3bede..000000000000 --- a/tests/android/app/local-config.gradle +++ /dev/null @@ -1,6 +0,0 @@ -ext { - compileSdk=34 - minSdk=21 - targetSdk=34 - javaVersion = JavaVersion.toVersion(17) -} \ No newline at end of file From 7e7a0b1bba0ae04d7f39ef7ef5377283f042eebf Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Fri, 9 May 2025 15:43:57 +0100 Subject: [PATCH 29/29] fix: last fixes, add note to script and include data-connect --- .../firebase_auth/example/android/app/build.gradle | 2 +- .../example/android/gradle.properties | 1 + scripts/generate_versions_gradle.dart | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/firebase_auth/firebase_auth/example/android/app/build.gradle b/packages/firebase_auth/firebase_auth/example/android/app/build.gradle index 15495e307201..9103f89547dc 100644 --- a/packages/firebase_auth/firebase_auth/example/android/app/build.gradle +++ b/packages/firebase_auth/firebase_auth/example/android/app/build.gradle @@ -59,4 +59,4 @@ android { flutter { source = "../.." -} \ No newline at end of file +} diff --git a/packages/firebase_data_connect/firebase_data_connect/example/android/gradle.properties b/packages/firebase_data_connect/firebase_data_connect/example/android/gradle.properties index 3b5b324f6e3f..cfa33c060503 100644 --- a/packages/firebase_data_connect/firebase_data_connect/example/android/gradle.properties +++ b/packages/firebase_data_connect/firebase_data_connect/example/android/gradle.properties @@ -1,3 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true +androidGradlePluginVersion=8.2.1 \ No newline at end of file diff --git a/scripts/generate_versions_gradle.dart b/scripts/generate_versions_gradle.dart index 5b6604a512af..20903f01c589 100644 --- a/scripts/generate_versions_gradle.dart +++ b/scripts/generate_versions_gradle.dart @@ -21,6 +21,7 @@ import 'package:path/path.dart' show joinAll; // Used to generate config files from ../gradle/local-config.gradle in order to use correct java and compilation versions. // Also works on every example app in the packages. // NOTICE: This script does not update auth or vertexai packages as they are manually updated. +// Furthermore, this script does not update the test app. void main() async { final workspace = await getMelosWorkspace(); // To edit versions for all packages, edit the global-config.gradle file in FlutterFire/Gradle @@ -55,6 +56,13 @@ void main() async { ); // ignore: avoid_print print('File copied to: ${copiedConfig.path}'); + + final gradlePropertiesFilePath = '${package.path}/example/android/gradle.properties'; + extractAndWriteProperty( + globalConfig: globalConfig, + gradlePropertiesFile: File(gradlePropertiesFilePath), + ); + print('successfully wrote property to $gradlePropertiesFilePath'); break; case 'firebase_auth': // Skip firebase_auth as we manually update it