From a2bb57cdd711065ba3aa25b68d5042ae700a27c9 Mon Sep 17 00:00:00 2001 From: Jude Kwashie Date: Mon, 8 Jun 2026 14:22:22 +0000 Subject: [PATCH 1/6] feat: Built-in Kotlin migration --- .../cloud_firestore/android/build.gradle | 2 +- .../android/local-config.gradle | 2 +- .../example/android/app/build.gradle | 13 ++++++----- .../example/android/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/settings.gradle | 1 - .../cloud_firestore/example/pubspec.yaml | 4 ++-- .../android/app/build.gradle.kts | 13 ++++++----- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../android/settings.gradle.kts | 3 +-- .../cloud_firestore/pubspec.yaml | 4 ++-- .../cloud_functions/android/build.gradle | 20 +++-------------- .../android/local-config.gradle | 2 +- .../example/android/app/build.gradle | 13 ++++++----- .../example/android/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/settings.gradle | 1 - .../cloud_functions/example/pubspec.yaml | 4 ++-- .../cloud_functions/pubspec.yaml | 4 ++-- .../firebase_ai/android/build.gradle | 16 ++------------ .../firebase_ai/android/local-config.gradle | 2 +- .../example/android/app/build.gradle.kts | 13 ++++++----- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/settings.gradle.kts | 3 +-- .../firebase_ai/example/pubspec.yaml | 4 ++-- packages/firebase_ai/firebase_ai/pubspec.yaml | 4 ++-- .../firebase_analytics/android/build.gradle | 22 ++++--------------- .../android/local-config.gradle | 2 +- .../example/android/app/build.gradle | 13 ++++++----- .../example/android/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/settings.gradle | 1 - .../firebase_analytics/example/pubspec.yaml | 4 ++-- .../firebase_analytics/pubspec.yaml | 4 ++-- .../firebase_app_check/android/build.gradle | 17 ++------------ .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../android/local-config.gradle | 2 +- .../example/android/app/build.gradle | 13 ++++++----- .../example/android/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/settings.gradle | 1 - .../firebase_app_check/example/pubspec.yaml | 4 ++-- .../firebase_app_check/pubspec.yaml | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../android/local-config.gradle | 2 +- .../example/android/app/build.gradle | 13 ++++++----- .../example/android/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/settings.gradle | 1 - .../example/pubspec.yaml | 4 ++-- .../firebase_app_installations/pubspec.yaml | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_auth/android/settings.gradle | 4 ++-- .../example/android/app/build.gradle | 12 +++++----- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/settings.gradle | 3 +-- .../firebase_auth/example/pubspec.yaml | 4 ++-- .../firebase_auth/firebase_auth/pubspec.yaml | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../firebase_core/android/local-config.gradle | 2 +- .../example/android/app/build.gradle | 13 ++++++----- .../example/android/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/settings.gradle | 1 - .../firebase_core/example/pubspec.yaml | 4 ++-- .../firebase_core/firebase_core/pubspec.yaml | 4 ++-- .../android/local-config.gradle | 2 +- .../example/android/app/build.gradle | 13 ++++++----- .../example/android/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/settings.gradle | 1 - .../firebase_crashlytics/example/pubspec.yaml | 4 ++-- .../firebase_crashlytics/pubspec.yaml | 4 ++-- .../example/android/app/build.gradle | 13 ++++++----- .../example/android/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/settings.gradle | 1 - .../example/pubspec.yaml | 4 ++-- .../firebase_data_connect/pubspec.yaml | 4 ++-- .../firebase_database/android/build.gradle | 18 +++------------ .../android/local-config.gradle | 2 +- .../example/android/app/build.gradle | 13 ++++++----- .../example/android/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/settings.gradle | 1 - .../firebase_database/example/pubspec.yaml | 4 ++-- .../firebase_database/pubspec.yaml | 4 ++-- .../android/local-config.gradle | 2 +- .../example/android/app/build.gradle | 13 ++++++----- .../example/android/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/settings.gradle | 1 - .../example/pubspec.yaml | 4 ++-- .../firebase_in_app_messaging/pubspec.yaml | 4 ++-- .../android/local-config.gradle | 2 +- .../example/android/app/build.gradle | 13 ++++++----- .../example/android/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/settings.gradle | 1 - .../firebase_messaging/example/pubspec.yaml | 4 ++-- .../firebase_messaging/pubspec.yaml | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../android/local-config.gradle | 2 +- .../example/android/app/build.gradle | 13 ++++++----- .../example/android/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/settings.gradle | 1 - .../example/pubspec.yaml | 4 ++-- .../firebase_ml_model_downloader/pubspec.yaml | 4 ++-- .../firebase_performance/android/build.gradle | 20 +++-------------- .../android/local-config.gradle | 2 +- .../example/android/app/build.gradle | 13 ++++++----- .../example/android/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/settings.gradle | 1 - .../firebase_performance/example/pubspec.yaml | 4 ++-- .../firebase_performance/pubspec.yaml | 4 ++-- .../android/build.gradle | 19 +++------------- .../android/local-config.gradle | 2 +- .../example/android/app/build.gradle | 13 ++++++----- .../example/android/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/settings.gradle | 3 +-- .../example/pubspec.yaml | 4 ++-- .../firebase_remote_config/pubspec.yaml | 4 ++-- .../firebase_storage/android/build.gradle | 22 ++++--------------- .../android/local-config.gradle | 2 +- .../example/android/app/build.gradle | 13 ++++++----- .../example/android/gradle.properties | 6 ++++- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/settings.gradle | 3 +-- .../firebase_storage/example/pubspec.yaml | 4 ++-- .../firebase_storage/pubspec.yaml | 4 ++-- 133 files changed, 283 insertions(+), 384 deletions(-) diff --git a/packages/cloud_firestore/cloud_firestore/android/build.gradle b/packages/cloud_firestore/cloud_firestore/android/build.gradle index 2c6840eb2211..f7e435fcfeec 100755 --- a/packages/cloud_firestore/cloud_firestore/android/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/android/build.gradle @@ -10,7 +10,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.3.0' + classpath 'com.android.tools.build:gradle:9.0.0' } } diff --git a/packages/cloud_firestore/cloud_firestore/android/local-config.gradle b/packages/cloud_firestore/cloud_firestore/android/local-config.gradle index 802b7e1d6482..9522ca1086b7 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=23 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = '8.3.0' + androidGradlePluginVersion = '9.0.0' } \ No newline at end of file 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 b572f8ff646f..09ae6db370cb 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle @@ -3,8 +3,7 @@ plugins { // START: FlutterFire Configuration id 'com.google.gms.google-services' // END: FlutterFire Configuration - id "kotlin-android" - // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + // The Flutter Gradle Plugin must be applied after the Android Gradle plugin. id "dev.flutter.flutter-gradle-plugin" } apply from: file("../../../android/local-config.gradle") @@ -36,10 +35,6 @@ android { sourceCompatibility = project.ext.javaVersion targetCompatibility = project.ext.javaVersion } - - kotlinOptions { - jvmTarget = "17" - } defaultConfig { applicationId = "io.flutter.plugins.firebase.firestore.example" @@ -63,3 +58,9 @@ android { flutter { source = "../.." } + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} diff --git a/packages/cloud_firestore/cloud_firestore/example/android/gradle.properties b/packages/cloud_firestore/cloud_firestore/example/android/gradle.properties index 3c0f502f334a..6286e45ecc96 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/gradle.properties +++ b/packages/cloud_firestore/cloud_firestore/example/android/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true -androidGradlePluginVersion=8.3.0 \ No newline at end of file +androidGradlePluginVersion=9.0.0 \ No newline at end of file diff --git a/packages/cloud_firestore/cloud_firestore/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/cloud_firestore/cloud_firestore/example/android/gradle/wrapper/gradle-wrapper.properties index d37405f193ec..6f13bc8900cb 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/cloud_firestore/cloud_firestore/example/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.4-bin.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip \ No newline at end of file diff --git a/packages/cloud_firestore/cloud_firestore/example/android/settings.gradle b/packages/cloud_firestore/cloud_firestore/example/android/settings.gradle index 30463c1cf2f2..3634bcdb913a 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/settings.gradle +++ b/packages/cloud_firestore/cloud_firestore/example/android/settings.gradle @@ -22,7 +22,6 @@ plugins { // 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/packages/cloud_firestore/cloud_firestore/example/pubspec.yaml b/packages/cloud_firestore/cloud_firestore/example/pubspec.yaml index 9dcba518072c..8ab8cc62cb31 100755 --- a/packages/cloud_firestore/cloud_firestore/example/pubspec.yaml +++ b/packages/cloud_firestore/cloud_firestore/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firestore plugin. resolution: workspace environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: cloud_firestore: ^6.5.0 diff --git a/packages/cloud_firestore/cloud_firestore/pipeline_example/android/app/build.gradle.kts b/packages/cloud_firestore/cloud_firestore/pipeline_example/android/app/build.gradle.kts index 9300930bc97a..7db5325c5ef4 100644 --- a/packages/cloud_firestore/cloud_firestore/pipeline_example/android/app/build.gradle.kts +++ b/packages/cloud_firestore/cloud_firestore/pipeline_example/android/app/build.gradle.kts @@ -3,8 +3,7 @@ plugins { // START: FlutterFire Configuration id("com.google.gms.google-services") // END: FlutterFire Configuration - id("kotlin-android") - // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + // The Flutter Gradle Plugin must be applied after the Android Gradle plugin. id("dev.flutter.flutter-gradle-plugin") } @@ -18,10 +17,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId = "com.example.pipeline_example" @@ -45,3 +40,9 @@ android { flutter { source = "../.." } + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} diff --git a/packages/cloud_firestore/cloud_firestore/pipeline_example/android/gradle/wrapper/gradle-wrapper.properties b/packages/cloud_firestore/cloud_firestore/pipeline_example/android/gradle/wrapper/gradle-wrapper.properties index e4ef43fb98df..1f569d227728 100644 --- a/packages/cloud_firestore/cloud_firestore/pipeline_example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/cloud_firestore/cloud_firestore/pipeline_example/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.14-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip diff --git a/packages/cloud_firestore/cloud_firestore/pipeline_example/android/settings.gradle.kts b/packages/cloud_firestore/cloud_firestore/pipeline_example/android/settings.gradle.kts index 174f408284fe..3ad1e3362f46 100644 --- a/packages/cloud_firestore/cloud_firestore/pipeline_example/android/settings.gradle.kts +++ b/packages/cloud_firestore/cloud_firestore/pipeline_example/android/settings.gradle.kts @@ -19,11 +19,10 @@ pluginManagement { plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false + id("com.android.application") version "9.0.0" 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 "2.2.20" apply false } include(":app") diff --git a/packages/cloud_firestore/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/cloud_firestore/pubspec.yaml index f5a18b6741cf..78397092fcbd 100755 --- a/packages/cloud_firestore/cloud_firestore/pubspec.yaml +++ b/packages/cloud_firestore/cloud_firestore/pubspec.yaml @@ -17,8 +17,8 @@ false_secrets: - dartpad/** environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: cloud_firestore_platform_interface: ^8.0.2 diff --git a/packages/cloud_functions/cloud_functions/android/build.gradle b/packages/cloud_functions/cloud_functions/android/build.gradle index 0e60c55e34f4..008940ef9b97 100644 --- a/packages/cloud_functions/cloud_functions/android/build.gradle +++ b/packages/cloud_functions/cloud_functions/android/build.gradle @@ -4,26 +4,14 @@ version '1.0-SNAPSHOT' apply plugin: 'com.android.library' apply from: file("local-config.gradle") -// AGP 9+ has built-in Kotlin support unless Flutter opts out via android.builtInKotlin=false. -def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int -def builtInKotlin = providers.gradleProperty("android.builtInKotlin") - .map { it.toBoolean() } - .orElse(agpMajor >= 9) - .get() -if (agpMajor < 9 || !builtInKotlin) { - apply plugin: 'kotlin-android' -} - buildscript { - ext.kotlin_version = "2.0.0" repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.1.4' - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version") + classpath 'com.android.tools.build:gradle:9.0.0' } } @@ -88,12 +76,10 @@ android { } -plugins.withId("org.jetbrains.kotlin.android") { - kotlin { +kotlin { compilerOptions { - jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) } - } } apply from: file("./user-agent.gradle") \ 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 802b7e1d6482..9522ca1086b7 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=23 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = '8.3.0' + androidGradlePluginVersion = '9.0.0' } \ No newline at end of file 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 2126e249aad0..daca489e5b2d 100644 --- a/packages/cloud_functions/cloud_functions/example/android/app/build.gradle +++ b/packages/cloud_functions/cloud_functions/example/android/app/build.gradle @@ -3,8 +3,7 @@ plugins { // START: FlutterFire Configuration id 'com.google.gms.google-services' // END: FlutterFire Configuration - id "kotlin-android" - // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + // The Flutter Gradle Plugin must be applied after the Android Gradle plugin. id "dev.flutter.flutter-gradle-plugin" } apply from: file("../../../android/local-config.gradle") @@ -37,10 +36,6 @@ android { targetCompatibility = project.ext.javaVersion } - kotlinOptions { - jvmTarget = "17" - } - defaultConfig { applicationId = "io.flutter.plugins.firebase.functions.example" // You can update the following values to match your application needs. @@ -63,3 +58,9 @@ android { flutter { source = "../.." } + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} diff --git a/packages/cloud_functions/cloud_functions/example/android/gradle.properties b/packages/cloud_functions/cloud_functions/example/android/gradle.properties index 3c0f502f334a..6286e45ecc96 100644 --- a/packages/cloud_functions/cloud_functions/example/android/gradle.properties +++ b/packages/cloud_functions/cloud_functions/example/android/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true -androidGradlePluginVersion=8.3.0 \ No newline at end of file +androidGradlePluginVersion=9.0.0 \ No newline at end of file diff --git a/packages/cloud_functions/cloud_functions/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/cloud_functions/cloud_functions/example/android/gradle/wrapper/gradle-wrapper.properties index d37405f193ec..6f13bc8900cb 100644 --- a/packages/cloud_functions/cloud_functions/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/cloud_functions/cloud_functions/example/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.4-bin.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip \ No newline at end of file diff --git a/packages/cloud_functions/cloud_functions/example/android/settings.gradle b/packages/cloud_functions/cloud_functions/example/android/settings.gradle index 30463c1cf2f2..3634bcdb913a 100644 --- a/packages/cloud_functions/cloud_functions/example/android/settings.gradle +++ b/packages/cloud_functions/cloud_functions/example/android/settings.gradle @@ -22,7 +22,6 @@ plugins { // 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/packages/cloud_functions/cloud_functions/example/pubspec.yaml b/packages/cloud_functions/cloud_functions/example/pubspec.yaml index 267ecca8fc47..b0873e966973 100644 --- a/packages/cloud_functions/cloud_functions/example/pubspec.yaml +++ b/packages/cloud_functions/cloud_functions/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the cloud_functions plugin. resolution: workspace environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: cloud_functions: ^6.3.2 diff --git a/packages/cloud_functions/cloud_functions/pubspec.yaml b/packages/cloud_functions/cloud_functions/pubspec.yaml index 01dc55e8ad0e..70b849ee5670 100644 --- a/packages/cloud_functions/cloud_functions/pubspec.yaml +++ b/packages/cloud_functions/cloud_functions/pubspec.yaml @@ -14,8 +14,8 @@ false_secrets: - example/** environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: cloud_functions_platform_interface: ^6.0.2 diff --git a/packages/firebase_ai/firebase_ai/android/build.gradle b/packages/firebase_ai/firebase_ai/android/build.gradle index 278104b4b9c2..d065600b1888 100644 --- a/packages/firebase_ai/firebase_ai/android/build.gradle +++ b/packages/firebase_ai/firebase_ai/android/build.gradle @@ -4,16 +4,6 @@ version '1.0-SNAPSHOT' apply plugin: 'com.android.library' apply from: file("local-config.gradle") -// AGP 9+ has built-in Kotlin support unless Flutter opts out via android.builtInKotlin=false. -def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int -def builtInKotlin = providers.gradleProperty("android.builtInKotlin") - .map { it.toBoolean() } - .orElse(agpMajor >= 9) - .get() -if (agpMajor < 9 || !builtInKotlin) { - apply plugin: 'kotlin-android' -} - buildscript { repositories { google() @@ -46,10 +36,8 @@ android { } } -plugins.withId("org.jetbrains.kotlin.android") { - kotlin { +kotlin { compilerOptions { - jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) } - } } diff --git a/packages/firebase_ai/firebase_ai/android/local-config.gradle b/packages/firebase_ai/firebase_ai/android/local-config.gradle index 2adcdf5c1729..731d8e7255a2 100644 --- a/packages/firebase_ai/firebase_ai/android/local-config.gradle +++ b/packages/firebase_ai/firebase_ai/android/local-config.gradle @@ -3,5 +3,5 @@ ext { minSdk=23 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = '8.3.0' + androidGradlePluginVersion = '9.0.0' } diff --git a/packages/firebase_ai/firebase_ai/example/android/app/build.gradle.kts b/packages/firebase_ai/firebase_ai/example/android/app/build.gradle.kts index 5b2cf7547615..639121d383a4 100644 --- a/packages/firebase_ai/firebase_ai/example/android/app/build.gradle.kts +++ b/packages/firebase_ai/firebase_ai/example/android/app/build.gradle.kts @@ -1,7 +1,6 @@ plugins { id("com.android.application") - id("kotlin-android") - // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + // The Flutter Gradle Plugin must be applied after the Android Gradle plugin. id("dev.flutter.flutter-gradle-plugin") } @@ -15,10 +14,6 @@ android { targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() - } - defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId = "com.example.firebase_ai_example" @@ -42,3 +37,9 @@ android { flutter { source = "../.." } + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11 + } +} diff --git a/packages/firebase_ai/firebase_ai/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_ai/firebase_ai/example/android/gradle/wrapper/gradle-wrapper.properties index ac3b47926ee5..1f569d227728 100644 --- a/packages/firebase_ai/firebase_ai/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_ai/firebase_ai/example/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.12-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip diff --git a/packages/firebase_ai/firebase_ai/example/android/settings.gradle.kts b/packages/firebase_ai/firebase_ai/example/android/settings.gradle.kts index 43394ed5e1fd..307d0aae1c10 100644 --- a/packages/firebase_ai/firebase_ai/example/android/settings.gradle.kts +++ b/packages/firebase_ai/firebase_ai/example/android/settings.gradle.kts @@ -18,8 +18,7 @@ pluginManagement { plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.9.1" apply false - id("org.jetbrains.kotlin.android") version "2.1.0" apply false + id("com.android.application") version "9.0.0" apply false } include(":app") diff --git a/packages/firebase_ai/firebase_ai/example/pubspec.yaml b/packages/firebase_ai/firebase_ai/example/pubspec.yaml index 54c54a17901a..695685fb757c 100644 --- a/packages/firebase_ai/firebase_ai/example/pubspec.yaml +++ b/packages/firebase_ai/firebase_ai/example/pubspec.yaml @@ -8,8 +8,8 @@ version: 1.0.0+1 resolution: workspace environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions diff --git a/packages/firebase_ai/firebase_ai/pubspec.yaml b/packages/firebase_ai/firebase_ai/pubspec.yaml index 7e7cb3731c59..cd89dfecad40 100644 --- a/packages/firebase_ai/firebase_ai/pubspec.yaml +++ b/packages/firebase_ai/firebase_ai/pubspec.yaml @@ -17,8 +17,8 @@ platforms: web: environment: - sdk: '^3.6.0' - flutter: ">=3.16.0" + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: firebase_app_check: ^0.4.4+2 diff --git a/packages/firebase_analytics/firebase_analytics/android/build.gradle b/packages/firebase_analytics/firebase_analytics/android/build.gradle index 189e57e43906..b356d5f57c38 100755 --- a/packages/firebase_analytics/firebase_analytics/android/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/android/build.gradle @@ -5,15 +5,13 @@ apply plugin: 'com.android.library' apply from: file("local-config.gradle") buildscript { - ext.kotlin_version = "2.0.0" repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.1.4' - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version") + classpath 'com.android.tools.build:gradle:9.0.0' } } @@ -26,16 +24,6 @@ rootProject.allprojects { apply plugin: 'com.android.library' -// AGP 9+ has built-in Kotlin support unless Flutter opts out via android.builtInKotlin=false. -def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int -def builtInKotlin = providers.gradleProperty("android.builtInKotlin") - .map { it.toBoolean() } - .orElse(agpMajor >= 9) - .get() -if (agpMajor < 9 || !builtInKotlin) { - apply plugin: 'kotlin-android' -} - 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?') @@ -88,11 +76,9 @@ android { } } -plugins.withId("org.jetbrains.kotlin.android") { - kotlin { - compilerOptions { - jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) - } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) } } diff --git a/packages/firebase_analytics/firebase_analytics/android/local-config.gradle b/packages/firebase_analytics/firebase_analytics/android/local-config.gradle index 802b7e1d6482..9522ca1086b7 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=23 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = '8.3.0' + androidGradlePluginVersion = '9.0.0' } \ No newline at end of file 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 c05ed68b6947..8d85d98e25b2 100644 --- a/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle @@ -3,8 +3,7 @@ plugins { // START: FlutterFire Configuration id 'com.google.gms.google-services' // END: FlutterFire Configuration - id "kotlin-android" - // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + // The Flutter Gradle Plugin must be applied after the Android Gradle plugin. id "dev.flutter.flutter-gradle-plugin" } apply from: file("../../../android/local-config.gradle") @@ -37,10 +36,6 @@ android { targetCompatibility = project.ext.javaVersion } - kotlinOptions { - jvmTarget = "17" - } - defaultConfig { applicationId = "io.flutter.plugins.firebase.analytics.example" // You can update the following values to match your application needs. @@ -63,3 +58,9 @@ android { flutter { source = "../.." } + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} diff --git a/packages/firebase_analytics/firebase_analytics/example/android/gradle.properties b/packages/firebase_analytics/firebase_analytics/example/android/gradle.properties index 3c0f502f334a..6286e45ecc96 100644 --- a/packages/firebase_analytics/firebase_analytics/example/android/gradle.properties +++ b/packages/firebase_analytics/firebase_analytics/example/android/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true -androidGradlePluginVersion=8.3.0 \ No newline at end of file +androidGradlePluginVersion=9.0.0 \ No newline at end of file diff --git a/packages/firebase_analytics/firebase_analytics/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_analytics/firebase_analytics/example/android/gradle/wrapper/gradle-wrapper.properties index e411586a54a8..d706aba609b5 100644 --- a/packages/firebase_analytics/firebase_analytics/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_analytics/firebase_analytics/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_analytics/firebase_analytics/example/android/settings.gradle b/packages/firebase_analytics/firebase_analytics/example/android/settings.gradle index 4fb566e9929e..3634bcdb913a 100644 --- a/packages/firebase_analytics/firebase_analytics/example/android/settings.gradle +++ b/packages/firebase_analytics/firebase_analytics/example/android/settings.gradle @@ -22,7 +22,6 @@ plugins { // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration - id "org.jetbrains.kotlin.android" version "2.1.0" apply false } include ":app" diff --git a/packages/firebase_analytics/firebase_analytics/example/pubspec.yaml b/packages/firebase_analytics/firebase_analytics/example/pubspec.yaml index 8cf3373a2454..16624645b7d9 100755 --- a/packages/firebase_analytics/firebase_analytics/example/pubspec.yaml +++ b/packages/firebase_analytics/firebase_analytics/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firebase_analytics plugin. resolution: workspace environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: firebase_analytics: ^12.4.2 diff --git a/packages/firebase_analytics/firebase_analytics/pubspec.yaml b/packages/firebase_analytics/firebase_analytics/pubspec.yaml index b9c1dbaf1d2e..48d036c9c246 100755 --- a/packages/firebase_analytics/firebase_analytics/pubspec.yaml +++ b/packages/firebase_analytics/firebase_analytics/pubspec.yaml @@ -16,8 +16,8 @@ false_secrets: - example/** environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: firebase_analytics_platform_interface: ^6.0.2 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 d4fdbc15fca9..5d943ea4ef8b 100644 --- a/packages/firebase_app_check/firebase_app_check/android/build.gradle +++ b/packages/firebase_app_check/firebase_app_check/android/build.gradle @@ -5,7 +5,6 @@ apply plugin: 'com.android.library' apply from: file("local-config.gradle") buildscript { - ext.kotlin_version = "2.0.0" repositories { google() mavenCentral() @@ -19,16 +18,6 @@ rootProject.allprojects { } } -// AGP 9+ has built-in Kotlin support unless Flutter opts out via android.builtInKotlin=false. -def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int -def builtInKotlin = providers.gradleProperty("android.builtInKotlin") - .map { it.toBoolean() } - .orElse(agpMajor >= 9) - .get() -if (agpMajor < 9 || !builtInKotlin) { - apply plugin: 'kotlin-android' -} - 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?') @@ -82,12 +71,10 @@ android { } } -plugins.withId("org.jetbrains.kotlin.android") { - kotlin { +kotlin { compilerOptions { - jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) } - } } apply from: file("./user-agent.gradle") diff --git a/packages/firebase_app_check/firebase_app_check/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_app_check/firebase_app_check/android/gradle/wrapper/gradle-wrapper.properties index e411586a54a8..d706aba609b5 100644 --- a/packages/firebase_app_check/firebase_app_check/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_app_check/firebase_app_check/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists 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 802b7e1d6482..9522ca1086b7 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=23 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = '8.3.0' + androidGradlePluginVersion = '9.0.0' } \ No newline at end of file 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 92298e7270e5..463759dd9e06 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 @@ -3,8 +3,7 @@ plugins { // START: FlutterFire Configuration id 'com.google.gms.google-services' // END: FlutterFire Configuration - id "kotlin-android" - // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + // The Flutter Gradle Plugin must be applied after the Android Gradle plugin. id "dev.flutter.flutter-gradle-plugin" } apply from: file("../../../android/local-config.gradle") @@ -37,10 +36,6 @@ android { targetCompatibility = project.ext.javaVersion } - kotlinOptions { - jvmTarget = "17" - } - defaultConfig { applicationId = "io.flutter.plugins.firebase.appcheck.example" // You can update the following values to match your application needs. @@ -63,3 +58,9 @@ android { flutter { source = "../.." } + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} 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 3c0f502f334a..6286e45ecc96 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,4 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true -androidGradlePluginVersion=8.3.0 \ No newline at end of file +androidGradlePluginVersion=9.0.0 \ No newline at end of file diff --git a/packages/firebase_app_check/firebase_app_check/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_app_check/firebase_app_check/example/android/gradle/wrapper/gradle-wrapper.properties index e411586a54a8..d706aba609b5 100644 --- a/packages/firebase_app_check/firebase_app_check/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_app_check/firebase_app_check/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists 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 30463c1cf2f2..3634bcdb913a 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 @@ -22,7 +22,6 @@ plugins { // 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/packages/firebase_app_check/firebase_app_check/example/pubspec.yaml b/packages/firebase_app_check/firebase_app_check/example/pubspec.yaml index 72614cde959d..6053a27f233b 100644 --- a/packages/firebase_app_check/firebase_app_check/example/pubspec.yaml +++ b/packages/firebase_app_check/firebase_app_check/example/pubspec.yaml @@ -7,8 +7,8 @@ version: 1.0.0+1 resolution: workspace environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: cloud_firestore: ^6.5.0 diff --git a/packages/firebase_app_check/firebase_app_check/pubspec.yaml b/packages/firebase_app_check/firebase_app_check/pubspec.yaml index 3def275e7ff9..6af3b1be8055 100644 --- a/packages/firebase_app_check/firebase_app_check/pubspec.yaml +++ b/packages/firebase_app_check/firebase_app_check/pubspec.yaml @@ -14,8 +14,8 @@ false_secrets: - example/** environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: firebase_app_check_platform_interface: ^0.4.0+2 diff --git a/packages/firebase_app_installations/firebase_app_installations/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_app_installations/firebase_app_installations/android/gradle/wrapper/gradle-wrapper.properties index e411586a54a8..d706aba609b5 100644 --- a/packages/firebase_app_installations/firebase_app_installations/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_app_installations/firebase_app_installations/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists 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 802b7e1d6482..9522ca1086b7 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=23 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = '8.3.0' + androidGradlePluginVersion = '9.0.0' } \ No newline at end of file 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 0ef5a05bbb2a..fd4e51d7761e 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 @@ -3,8 +3,7 @@ plugins { // START: FlutterFire Configuration id 'com.google.gms.google-services' // END: FlutterFire Configuration - id "kotlin-android" - // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + // The Flutter Gradle Plugin must be applied after the Android Gradle plugin. id "dev.flutter.flutter-gradle-plugin" } apply from: file("../../../android/local-config.gradle") @@ -37,10 +36,6 @@ android { targetCompatibility = project.ext.javaVersion } - kotlinOptions { - jvmTarget = "17" - } - defaultConfig { applicationId = "io.flutter.plugins.firebase.installations.example" // You can update the following values to match your application needs. @@ -63,3 +58,9 @@ android { flutter { source = "../.." } + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} 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 3c0f502f334a..6286e45ecc96 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,4 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true -androidGradlePluginVersion=8.3.0 \ No newline at end of file +androidGradlePluginVersion=9.0.0 \ No newline at end of file diff --git a/packages/firebase_app_installations/firebase_app_installations/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_app_installations/firebase_app_installations/example/android/gradle/wrapper/gradle-wrapper.properties index e411586a54a8..d706aba609b5 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_app_installations/firebase_app_installations/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists 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 30463c1cf2f2..3634bcdb913a 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 @@ -22,7 +22,6 @@ plugins { // 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/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml b/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml index 95832dbeffa3..a52a1c86c3d8 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml +++ b/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml @@ -7,8 +7,8 @@ version: 1.0.0+1 resolution: workspace environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: firebase_core: ^4.10.0 diff --git a/packages/firebase_app_installations/firebase_app_installations/pubspec.yaml b/packages/firebase_app_installations/firebase_app_installations/pubspec.yaml index 6299d7967809..db43cc313385 100644 --- a/packages/firebase_app_installations/firebase_app_installations/pubspec.yaml +++ b/packages/firebase_app_installations/firebase_app_installations/pubspec.yaml @@ -14,8 +14,8 @@ false_secrets: - example/** environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: firebase_app_installations_platform_interface: ^0.1.4+71 diff --git a/packages/firebase_auth/firebase_auth/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_auth/firebase_auth/android/gradle/wrapper/gradle-wrapper.properties index e411586a54a8..d706aba609b5 100644 --- a/packages/firebase_auth/firebase_auth/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_auth/firebase_auth/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_auth/firebase_auth/android/settings.gradle b/packages/firebase_auth/firebase_auth/android/settings.gradle index ec51773df813..c791cf836477 100755 --- a/packages/firebase_auth/firebase_auth/android/settings.gradle +++ b/packages/firebase_auth/firebase_auth/android/settings.gradle @@ -2,7 +2,7 @@ rootProject.name = 'firebase_auth' pluginManagement { plugins { - id "com.android.application" version "8.3.0" - id "com.android.library" version "8.3.0" + id "com.android.application" version "9.0.0" + id "com.android.library" version "9.0.0" } } 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 db427be91ec5..f1d5a69938c6 100644 --- a/packages/firebase_auth/firebase_auth/example/android/app/build.gradle +++ b/packages/firebase_auth/firebase_auth/example/android/app/build.gradle @@ -3,8 +3,7 @@ plugins { // START: FlutterFire Configuration id 'com.google.gms.google-services' // END: FlutterFire Configuration - id "kotlin-android" - // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + // The Flutter Gradle Plugin must be applied after the Android Gradle plugin. id "dev.flutter.flutter-gradle-plugin" } @@ -34,9 +33,6 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17 - } defaultConfig { applicationId = "io.flutter.plugins.firebase.auth.example" @@ -60,3 +56,9 @@ android { flutter { source = "../.." } + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} diff --git a/packages/firebase_auth/firebase_auth/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_auth/firebase_auth/example/android/gradle/wrapper/gradle-wrapper.properties index e411586a54a8..d706aba609b5 100644 --- a/packages/firebase_auth/firebase_auth/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_auth/firebase_auth/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_auth/firebase_auth/example/android/settings.gradle b/packages/firebase_auth/firebase_auth/example/android/settings.gradle index a4d924db8bec..79b7c45f5666 100644 --- a/packages/firebase_auth/firebase_auth/example/android/settings.gradle +++ b/packages/firebase_auth/firebase_auth/example/android/settings.gradle @@ -18,11 +18,10 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.3.0" apply false + id "com.android.application" version "9.0.0" 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/packages/firebase_auth/firebase_auth/example/pubspec.yaml b/packages/firebase_auth/firebase_auth/example/pubspec.yaml index d4945ff996a9..8671cc455bdb 100644 --- a/packages/firebase_auth/firebase_auth/example/pubspec.yaml +++ b/packages/firebase_auth/firebase_auth/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firebase_auth plugin. resolution: workspace environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: barcode_widget: ^2.0.4 diff --git a/packages/firebase_auth/firebase_auth/pubspec.yaml b/packages/firebase_auth/firebase_auth/pubspec.yaml index d559a058e9fa..a5c9c9ded9c8 100755 --- a/packages/firebase_auth/firebase_auth/pubspec.yaml +++ b/packages/firebase_auth/firebase_auth/pubspec.yaml @@ -17,8 +17,8 @@ false_secrets: - example/** environment: - sdk: '^3.6.0' - flutter: '>=3.16.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: firebase_auth_platform_interface: ^9.0.2 diff --git a/packages/firebase_core/firebase_core/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_core/firebase_core/android/gradle/wrapper/gradle-wrapper.properties index e411586a54a8..d706aba609b5 100644 --- a/packages/firebase_core/firebase_core/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_core/firebase_core/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_core/firebase_core/android/local-config.gradle b/packages/firebase_core/firebase_core/android/local-config.gradle index 802b7e1d6482..9522ca1086b7 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=23 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = '8.3.0' + androidGradlePluginVersion = '9.0.0' } \ No newline at end of file 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 d2ebd42da7b2..95ea67cab51c 100644 --- a/packages/firebase_core/firebase_core/example/android/app/build.gradle +++ b/packages/firebase_core/firebase_core/example/android/app/build.gradle @@ -3,8 +3,7 @@ plugins { // START: FlutterFire Configuration id 'com.google.gms.google-services' // END: FlutterFire Configuration - id "kotlin-android" - // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + // The Flutter Gradle Plugin must be applied after the Android Gradle plugin. id "dev.flutter.flutter-gradle-plugin" } apply from: file("../../../android/local-config.gradle") @@ -37,10 +36,6 @@ android { targetCompatibility = project.ext.javaVersion } - kotlinOptions { - jvmTarget = "17" - } - defaultConfig { applicationId = "io.flutter.plugins.firebasecoreexample" // You can update the following values to match your application needs. @@ -63,3 +58,9 @@ android { flutter { source = "../.." } + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} diff --git a/packages/firebase_core/firebase_core/example/android/gradle.properties b/packages/firebase_core/firebase_core/example/android/gradle.properties index 3c0f502f334a..6286e45ecc96 100644 --- a/packages/firebase_core/firebase_core/example/android/gradle.properties +++ b/packages/firebase_core/firebase_core/example/android/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true -androidGradlePluginVersion=8.3.0 \ No newline at end of file +androidGradlePluginVersion=9.0.0 \ No newline at end of file diff --git a/packages/firebase_core/firebase_core/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_core/firebase_core/example/android/gradle/wrapper/gradle-wrapper.properties index 4d6272d9963f..1f569d227728 100644 --- a/packages/firebase_core/firebase_core/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_core/firebase_core/example/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.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip diff --git a/packages/firebase_core/firebase_core/example/android/settings.gradle b/packages/firebase_core/firebase_core/example/android/settings.gradle index 30463c1cf2f2..3634bcdb913a 100644 --- a/packages/firebase_core/firebase_core/example/android/settings.gradle +++ b/packages/firebase_core/firebase_core/example/android/settings.gradle @@ -22,7 +22,6 @@ plugins { // 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/packages/firebase_core/firebase_core/example/pubspec.yaml b/packages/firebase_core/firebase_core/example/pubspec.yaml index a5489ddbd498..bb4660e59316 100644 --- a/packages/firebase_core/firebase_core/example/pubspec.yaml +++ b/packages/firebase_core/firebase_core/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firebase_core plugin. resolution: workspace environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: firebase_core: ^4.10.0 diff --git a/packages/firebase_core/firebase_core/pubspec.yaml b/packages/firebase_core/firebase_core/pubspec.yaml index ec426a170d59..318f8083d08e 100644 --- a/packages/firebase_core/firebase_core/pubspec.yaml +++ b/packages/firebase_core/firebase_core/pubspec.yaml @@ -13,8 +13,8 @@ false_secrets: - example/** environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: firebase_core_platform_interface: ^7.0.1 diff --git a/packages/firebase_crashlytics/firebase_crashlytics/android/local-config.gradle b/packages/firebase_crashlytics/firebase_crashlytics/android/local-config.gradle index 802b7e1d6482..9522ca1086b7 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=23 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = '8.3.0' + androidGradlePluginVersion = '9.0.0' } \ No newline at end of file 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 dbca60bd988e..5c31305ce4cc 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle @@ -4,8 +4,7 @@ plugins { id 'com.google.gms.google-services' id 'com.google.firebase.crashlytics' // END: FlutterFire Configuration - id "kotlin-android" - // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + // The Flutter Gradle Plugin must be applied after the Android Gradle plugin. id "dev.flutter.flutter-gradle-plugin" } apply from: file("../../../android/local-config.gradle") @@ -38,10 +37,6 @@ android { targetCompatibility = project.ext.javaVersion } - kotlinOptions { - jvmTarget = "17" - } - defaultConfig { applicationId = "io.flutter.plugins.firebasecrashlyticsexample" // You can update the following values to match your application needs. @@ -64,3 +59,9 @@ android { flutter { source = "../.." } + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle.properties b/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle.properties index 3c0f502f334a..6286e45ecc96 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle.properties +++ b/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true -androidGradlePluginVersion=8.3.0 \ No newline at end of file +androidGradlePluginVersion=9.0.0 \ No newline at end of file diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle/wrapper/gradle-wrapper.properties index e411586a54a8..d706aba609b5 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_crashlytics/firebase_crashlytics/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/android/settings.gradle b/packages/firebase_crashlytics/firebase_crashlytics/example/android/settings.gradle index 0c363914ab77..9edb6ef3640e 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/android/settings.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/example/android/settings.gradle @@ -23,7 +23,6 @@ plugins { 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 "2.1.21" apply false } include ":app" diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/pubspec.yaml b/packages/firebase_crashlytics/firebase_crashlytics/example/pubspec.yaml index f10713cc4179..f5fedb61011d 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/pubspec.yaml +++ b/packages/firebase_crashlytics/firebase_crashlytics/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firebase_crashlytics plugin. resolution: workspace environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: firebase_analytics: ^12.4.2 diff --git a/packages/firebase_crashlytics/firebase_crashlytics/pubspec.yaml b/packages/firebase_crashlytics/firebase_crashlytics/pubspec.yaml index bbfc54d297c2..66a5e1ecc157 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/pubspec.yaml +++ b/packages/firebase_crashlytics/firebase_crashlytics/pubspec.yaml @@ -16,8 +16,8 @@ false_secrets: - example/** environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: firebase_core: ^4.10.0 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 ac9c21031742..2ac7fc6f2a2c 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 @@ -1,7 +1,6 @@ plugins { id "com.android.application" - id "kotlin-android" - // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + // The Flutter Gradle Plugin must be applied after the Android Gradle plugin. id "dev.flutter.flutter-gradle-plugin" } apply from: file("local-config.gradle") @@ -34,10 +33,6 @@ android { targetCompatibility = project.ext.javaVersion } - kotlinOptions { - jvmTarget = "17" - } - defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId = "io.flutter.plugins.firebase.dataconnect.example" @@ -61,3 +56,9 @@ android { flutter { source = "../.." } + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} 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 3c0f502f334a..6286e45ecc96 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,4 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true -androidGradlePluginVersion=8.3.0 \ No newline at end of file +androidGradlePluginVersion=9.0.0 \ No newline at end of file diff --git a/packages/firebase_data_connect/firebase_data_connect/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_data_connect/firebase_data_connect/example/android/gradle/wrapper/gradle-wrapper.properties index 09523c0e5490..2e1113280ef1 100644 --- a/packages/firebase_data_connect/firebase_data_connect/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_data_connect/firebase_data_connect/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME 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 4fb566e9929e..3634bcdb913a 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 @@ -22,7 +22,6 @@ plugins { // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration - id "org.jetbrains.kotlin.android" version "2.1.0" apply false } include ":app" diff --git a/packages/firebase_data_connect/firebase_data_connect/example/pubspec.yaml b/packages/firebase_data_connect/firebase_data_connect/example/pubspec.yaml index 6968fe1eb773..072fd22c671b 100644 --- a/packages/firebase_data_connect/firebase_data_connect/example/pubspec.yaml +++ b/packages/firebase_data_connect/firebase_data_connect/example/pubspec.yaml @@ -7,8 +7,8 @@ version: 1.0.0+1 resolution: workspace environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: flutter: diff --git a/packages/firebase_data_connect/firebase_data_connect/pubspec.yaml b/packages/firebase_data_connect/firebase_data_connect/pubspec.yaml index 34df0b12dd1e..11dcf5f95090 100644 --- a/packages/firebase_data_connect/firebase_data_connect/pubspec.yaml +++ b/packages/firebase_data_connect/firebase_data_connect/pubspec.yaml @@ -8,8 +8,8 @@ false_secrets: - dartpad/** environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: crypto: ^3.0.6 diff --git a/packages/firebase_database/firebase_database/android/build.gradle b/packages/firebase_database/firebase_database/android/build.gradle index a0db4c898a25..06f1e36e0313 100755 --- a/packages/firebase_database/firebase_database/android/build.gradle +++ b/packages/firebase_database/firebase_database/android/build.gradle @@ -4,16 +4,6 @@ version '1.0-SNAPSHOT' apply plugin: 'com.android.library' apply from: file("local-config.gradle") -// AGP 9+ has built-in Kotlin support unless Flutter opts out via android.builtInKotlin=false. -def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int -def builtInKotlin = providers.gradleProperty("android.builtInKotlin") - .map { it.toBoolean() } - .orElse(agpMajor >= 9) - .get() -if (agpMajor < 9 || !builtInKotlin) { - apply plugin: 'kotlin-android' -} - buildscript { repositories { google() @@ -83,11 +73,9 @@ android { } } -plugins.withId("org.jetbrains.kotlin.android") { - kotlin { - compilerOptions { - jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) - } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) } } diff --git a/packages/firebase_database/firebase_database/android/local-config.gradle b/packages/firebase_database/firebase_database/android/local-config.gradle index 5550390f251b..9522ca1086b7 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=23 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = '8.6.0' + androidGradlePluginVersion = '9.0.0' } \ No newline at end of file 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 82a1991fde13..c6fdee49f65e 100644 --- a/packages/firebase_database/firebase_database/example/android/app/build.gradle +++ b/packages/firebase_database/firebase_database/example/android/app/build.gradle @@ -3,8 +3,7 @@ plugins { // START: FlutterFire Configuration id 'com.google.gms.google-services' // END: FlutterFire Configuration - id "kotlin-android" - // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + // The Flutter Gradle Plugin must be applied after the Android Gradle plugin. id "dev.flutter.flutter-gradle-plugin" } apply from: file("../../../android/local-config.gradle") @@ -37,10 +36,6 @@ android { targetCompatibility = project.ext.javaVersion } - kotlinOptions { - jvmTarget = "17" - } - defaultConfig { applicationId = "io.flutter.plugins.firebase.database.example" // You can update the following values to match your application needs. @@ -63,3 +58,9 @@ android { flutter { source = "../.." } + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} diff --git a/packages/firebase_database/firebase_database/example/android/gradle.properties b/packages/firebase_database/firebase_database/example/android/gradle.properties index 3c0f502f334a..6286e45ecc96 100644 --- a/packages/firebase_database/firebase_database/example/android/gradle.properties +++ b/packages/firebase_database/firebase_database/example/android/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true -androidGradlePluginVersion=8.3.0 \ No newline at end of file +androidGradlePluginVersion=9.0.0 \ No newline at end of file diff --git a/packages/firebase_database/firebase_database/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_database/firebase_database/example/android/gradle/wrapper/gradle-wrapper.properties index 48c0a02ca419..d706aba609b5 100644 --- a/packages/firebase_database/firebase_database/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_database/firebase_database/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_database/firebase_database/example/android/settings.gradle b/packages/firebase_database/firebase_database/example/android/settings.gradle index 4fb566e9929e..3634bcdb913a 100644 --- a/packages/firebase_database/firebase_database/example/android/settings.gradle +++ b/packages/firebase_database/firebase_database/example/android/settings.gradle @@ -22,7 +22,6 @@ plugins { // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration - id "org.jetbrains.kotlin.android" version "2.1.0" apply false } include ":app" diff --git a/packages/firebase_database/firebase_database/example/pubspec.yaml b/packages/firebase_database/firebase_database/example/pubspec.yaml index 495579667ce3..86a08a3e85cb 100755 --- a/packages/firebase_database/firebase_database/example/pubspec.yaml +++ b/packages/firebase_database/firebase_database/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firebase_database plugin. resolution: workspace environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: firebase_core: ^4.10.0 diff --git a/packages/firebase_database/firebase_database/pubspec.yaml b/packages/firebase_database/firebase_database/pubspec.yaml index d5a57955f1ff..f3d6dd7a5c58 100755 --- a/packages/firebase_database/firebase_database/pubspec.yaml +++ b/packages/firebase_database/firebase_database/pubspec.yaml @@ -14,8 +14,8 @@ false_secrets: - example/** environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: firebase_core: ^4.10.0 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 802b7e1d6482..9522ca1086b7 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=23 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = '8.3.0' + androidGradlePluginVersion = '9.0.0' } \ No newline at end of file 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 68bd6af4eacb..85b145504a0c 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 @@ -3,8 +3,7 @@ plugins { // START: FlutterFire Configuration id 'com.google.gms.google-services' // END: FlutterFire Configuration - id "kotlin-android" - // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + // The Flutter Gradle Plugin must be applied after the Android Gradle plugin. id "dev.flutter.flutter-gradle-plugin" } apply from: file("../../../android/local-config.gradle") @@ -37,10 +36,6 @@ android { targetCompatibility = project.ext.javaVersion } - kotlinOptions { - jvmTarget = "17" - } - defaultConfig { applicationId = "io.flutter.plugins.firebase.tests" // You can update the following values to match your application needs. @@ -63,3 +58,9 @@ android { flutter { source = "../.." } + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} 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 3c0f502f334a..6286e45ecc96 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,4 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true -androidGradlePluginVersion=8.3.0 \ No newline at end of file +androidGradlePluginVersion=9.0.0 \ No newline at end of file diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/gradle/wrapper/gradle-wrapper.properties index e411586a54a8..d706aba609b5 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists 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 30463c1cf2f2..3634bcdb913a 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 @@ -22,7 +22,6 @@ plugins { // 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/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/pubspec.yaml b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/pubspec.yaml index 71f63d2126f3..8655258d213d 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/pubspec.yaml +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/pubspec.yaml @@ -4,8 +4,8 @@ resolution: workspace publish_to: 'none' environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: firebase_analytics: ^12.4.2 diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/pubspec.yaml b/packages/firebase_in_app_messaging/firebase_in_app_messaging/pubspec.yaml index 88bd5d6b871d..9cc9b3c7c6e5 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/pubspec.yaml +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/pubspec.yaml @@ -14,8 +14,8 @@ false_secrets: - example/** environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: firebase_core: ^4.10.0 diff --git a/packages/firebase_messaging/firebase_messaging/android/local-config.gradle b/packages/firebase_messaging/firebase_messaging/android/local-config.gradle index 802b7e1d6482..9522ca1086b7 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=23 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = '8.3.0' + androidGradlePluginVersion = '9.0.0' } \ No newline at end of file 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 8ebdee7a1533..30215791b79f 100644 --- a/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle +++ b/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle @@ -3,8 +3,7 @@ plugins { // START: FlutterFire Configuration id 'com.google.gms.google-services' // END: FlutterFire Configuration - id "kotlin-android" - // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + // The Flutter Gradle Plugin must be applied after the Android Gradle plugin. id "dev.flutter.flutter-gradle-plugin" } apply from: file("../../../android/local-config.gradle") @@ -39,10 +38,6 @@ android { coreLibraryDesugaringEnabled true } - kotlinOptions { - jvmTarget = "17" - } - defaultConfig { applicationId = "io.flutter.plugins.firebase.messaging.example" // You can update the following values to match your application needs. @@ -69,3 +64,9 @@ dependencies { flutter { source = "../.." } + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} diff --git a/packages/firebase_messaging/firebase_messaging/example/android/gradle.properties b/packages/firebase_messaging/firebase_messaging/example/android/gradle.properties index 3c0f502f334a..6286e45ecc96 100644 --- a/packages/firebase_messaging/firebase_messaging/example/android/gradle.properties +++ b/packages/firebase_messaging/firebase_messaging/example/android/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true -androidGradlePluginVersion=8.3.0 \ No newline at end of file +androidGradlePluginVersion=9.0.0 \ No newline at end of file diff --git a/packages/firebase_messaging/firebase_messaging/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_messaging/firebase_messaging/example/android/gradle/wrapper/gradle-wrapper.properties index e411586a54a8..d706aba609b5 100644 --- a/packages/firebase_messaging/firebase_messaging/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_messaging/firebase_messaging/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_messaging/firebase_messaging/example/android/settings.gradle b/packages/firebase_messaging/firebase_messaging/example/android/settings.gradle index 30463c1cf2f2..3634bcdb913a 100644 --- a/packages/firebase_messaging/firebase_messaging/example/android/settings.gradle +++ b/packages/firebase_messaging/firebase_messaging/example/android/settings.gradle @@ -22,7 +22,6 @@ plugins { // 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/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml b/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml index d9d7fa996837..1939a3721e17 100644 --- a/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml +++ b/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firebase_messaging plugin. resolution: workspace environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: firebase_core: ^4.10.0 diff --git a/packages/firebase_messaging/firebase_messaging/pubspec.yaml b/packages/firebase_messaging/firebase_messaging/pubspec.yaml index 6837ec856e4e..e00e0dd72c25 100644 --- a/packages/firebase_messaging/firebase_messaging/pubspec.yaml +++ b/packages/firebase_messaging/firebase_messaging/pubspec.yaml @@ -14,8 +14,8 @@ false_secrets: - example/** environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: firebase_core: ^4.10.0 diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/gradle/wrapper/gradle-wrapper.properties index e411586a54a8..d706aba609b5 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists 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 802b7e1d6482..9522ca1086b7 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=23 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = '8.3.0' + androidGradlePluginVersion = '9.0.0' } \ No newline at end of file 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 68bd6af4eacb..85b145504a0c 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 @@ -3,8 +3,7 @@ plugins { // START: FlutterFire Configuration id 'com.google.gms.google-services' // END: FlutterFire Configuration - id "kotlin-android" - // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + // The Flutter Gradle Plugin must be applied after the Android Gradle plugin. id "dev.flutter.flutter-gradle-plugin" } apply from: file("../../../android/local-config.gradle") @@ -37,10 +36,6 @@ android { targetCompatibility = project.ext.javaVersion } - kotlinOptions { - jvmTarget = "17" - } - defaultConfig { applicationId = "io.flutter.plugins.firebase.tests" // You can update the following values to match your application needs. @@ -63,3 +58,9 @@ android { flutter { source = "../.." } + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} 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 3c0f502f334a..6286e45ecc96 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,4 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true -androidGradlePluginVersion=8.3.0 \ No newline at end of file +androidGradlePluginVersion=9.0.0 \ No newline at end of file diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/gradle/wrapper/gradle-wrapper.properties index e411586a54a8..d706aba609b5 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists 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 30463c1cf2f2..3634bcdb913a 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 @@ -22,7 +22,6 @@ plugins { // 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/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/pubspec.yaml b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/pubspec.yaml index 4adc9fc6d2a9..ec433a71cb58 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/pubspec.yaml +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/pubspec.yaml @@ -5,8 +5,8 @@ resolution: workspace publish_to: 'none' environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: flutter: diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/pubspec.yaml b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/pubspec.yaml index 6546173101f4..264e5071d25f 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/pubspec.yaml +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/pubspec.yaml @@ -14,8 +14,8 @@ false_secrets: - example/** environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: firebase_core: ^4.10.0 diff --git a/packages/firebase_performance/firebase_performance/android/build.gradle b/packages/firebase_performance/firebase_performance/android/build.gradle index 5f74989e1448..aa82e0664f56 100644 --- a/packages/firebase_performance/firebase_performance/android/build.gradle +++ b/packages/firebase_performance/firebase_performance/android/build.gradle @@ -4,25 +4,13 @@ version '1.0-SNAPSHOT' apply plugin: 'com.android.library' apply from: file("local-config.gradle") -// AGP 9+ has built-in Kotlin support unless Flutter opts out via android.builtInKotlin=false. -def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int -def builtInKotlin = providers.gradleProperty("android.builtInKotlin") - .map { it.toBoolean() } - .orElse(agpMajor >= 9) - .get() -if (agpMajor < 9 || !builtInKotlin) { - apply plugin: 'kotlin-android' -} - buildscript { - ext.kotlin_version = "2.0.0" repositories { google() mavenCentral() } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -85,11 +73,9 @@ android { } } -plugins.withId("org.jetbrains.kotlin.android") { - kotlin { - compilerOptions { - jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) - } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) } } diff --git a/packages/firebase_performance/firebase_performance/android/local-config.gradle b/packages/firebase_performance/firebase_performance/android/local-config.gradle index 802b7e1d6482..9522ca1086b7 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=23 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = '8.3.0' + androidGradlePluginVersion = '9.0.0' } \ No newline at end of file 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 8b3cf88dfa14..e9e8264f9ced 100644 --- a/packages/firebase_performance/firebase_performance/example/android/app/build.gradle +++ b/packages/firebase_performance/firebase_performance/example/android/app/build.gradle @@ -4,8 +4,7 @@ plugins { id 'com.google.gms.google-services' id 'com.google.firebase.firebase-perf' // END: FlutterFire Configuration - id "kotlin-android" - // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + // The Flutter Gradle Plugin must be applied after the Android Gradle plugin. id "dev.flutter.flutter-gradle-plugin" } apply from: file("../../../android/local-config.gradle") @@ -38,10 +37,6 @@ android { targetCompatibility = project.ext.javaVersion } - kotlinOptions { - jvmTarget = "17" - } - defaultConfig { applicationId = "io.flutter.plugins.firebase.tests" // You can update the following values to match your application needs. @@ -64,3 +59,9 @@ android { flutter { source = "../.." } + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} diff --git a/packages/firebase_performance/firebase_performance/example/android/gradle.properties b/packages/firebase_performance/firebase_performance/example/android/gradle.properties index 3c0f502f334a..6286e45ecc96 100644 --- a/packages/firebase_performance/firebase_performance/example/android/gradle.properties +++ b/packages/firebase_performance/firebase_performance/example/android/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true -androidGradlePluginVersion=8.3.0 \ No newline at end of file +androidGradlePluginVersion=9.0.0 \ No newline at end of file diff --git a/packages/firebase_performance/firebase_performance/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_performance/firebase_performance/example/android/gradle/wrapper/gradle-wrapper.properties index e411586a54a8..d706aba609b5 100644 --- a/packages/firebase_performance/firebase_performance/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_performance/firebase_performance/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_performance/firebase_performance/example/android/settings.gradle b/packages/firebase_performance/firebase_performance/example/android/settings.gradle index 678f1d06b76e..a0ad1f36071c 100644 --- a/packages/firebase_performance/firebase_performance/example/android/settings.gradle +++ b/packages/firebase_performance/firebase_performance/example/android/settings.gradle @@ -23,7 +23,6 @@ plugins { 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_performance/firebase_performance/example/pubspec.yaml b/packages/firebase_performance/firebase_performance/example/pubspec.yaml index 2f95bb40c267..821ddf1f4929 100644 --- a/packages/firebase_performance/firebase_performance/example/pubspec.yaml +++ b/packages/firebase_performance/firebase_performance/example/pubspec.yaml @@ -5,8 +5,8 @@ resolution: workspace publish_to: none environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: firebase_core: ^4.10.0 diff --git a/packages/firebase_performance/firebase_performance/pubspec.yaml b/packages/firebase_performance/firebase_performance/pubspec.yaml index f1efe47bbdca..e09a94e38254 100644 --- a/packages/firebase_performance/firebase_performance/pubspec.yaml +++ b/packages/firebase_performance/firebase_performance/pubspec.yaml @@ -17,8 +17,8 @@ false_secrets: - example/** environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: firebase_core: ^4.10.0 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 d2a0aa74e23c..7a796cede4e2 100644 --- a/packages/firebase_remote_config/firebase_remote_config/android/build.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/android/build.gradle @@ -5,7 +5,6 @@ apply plugin: 'com.android.library' apply from: file("local-config.gradle") buildscript { - ext.kotlin_version = "2.0.0" repositories { google() mavenCentral() @@ -19,16 +18,6 @@ rootProject.allprojects { } } -// AGP 9+ has built-in Kotlin support unless Flutter opts out via android.builtInKotlin=false. -def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int -def builtInKotlin = providers.gradleProperty("android.builtInKotlin") - .map { it.toBoolean() } - .orElse(agpMajor >= 9) - .get() -if (agpMajor < 9 || !builtInKotlin) { - apply plugin: 'kotlin-android' -} - 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?') @@ -81,11 +70,9 @@ android { } } -plugins.withId("org.jetbrains.kotlin.android") { - kotlin { - compilerOptions { - jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) - } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) } } 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 802b7e1d6482..9522ca1086b7 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=23 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = '8.3.0' + androidGradlePluginVersion = '9.0.0' } \ No newline at end of file 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 8bf1becfc625..e1f3598a913c 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 @@ -3,8 +3,7 @@ plugins { // START: FlutterFire Configuration id 'com.google.gms.google-services' // END: FlutterFire Configuration - id "kotlin-android" - // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + // The Flutter Gradle Plugin must be applied after the Android Gradle plugin. id "dev.flutter.flutter-gradle-plugin" } apply from: file("../../../android/local-config.gradle") @@ -37,10 +36,6 @@ android { targetCompatibility = project.ext.javaVersion } - kotlinOptions { - jvmTarget = "17" - } - defaultConfig { applicationId = "io.flutter.plugins.firebase.remoteconfig.example" // You can update the following values to match your application needs. @@ -63,3 +58,9 @@ android { flutter { source = "../.." } + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} 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 3c0f502f334a..6286e45ecc96 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,4 +1,4 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true -androidGradlePluginVersion=8.3.0 \ No newline at end of file +androidGradlePluginVersion=9.0.0 \ No newline at end of file diff --git a/packages/firebase_remote_config/firebase_remote_config/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_remote_config/firebase_remote_config/example/android/gradle/wrapper/gradle-wrapper.properties index e411586a54a8..d706aba609b5 100644 --- a/packages/firebase_remote_config/firebase_remote_config/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_remote_config/firebase_remote_config/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists 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 a4d924db8bec..79b7c45f5666 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,11 +18,10 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.3.0" apply false + id "com.android.application" version "9.0.0" 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/packages/firebase_remote_config/firebase_remote_config/example/pubspec.yaml b/packages/firebase_remote_config/firebase_remote_config/example/pubspec.yaml index 4587601f52c9..46ea920b46f3 100644 --- a/packages/firebase_remote_config/firebase_remote_config/example/pubspec.yaml +++ b/packages/firebase_remote_config/firebase_remote_config/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firebase_remote_config plugin. resolution: workspace environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: # The following adds the Cupertino Icons font to your application. diff --git a/packages/firebase_remote_config/firebase_remote_config/pubspec.yaml b/packages/firebase_remote_config/firebase_remote_config/pubspec.yaml index 148239b17b22..283b33110bf4 100644 --- a/packages/firebase_remote_config/firebase_remote_config/pubspec.yaml +++ b/packages/firebase_remote_config/firebase_remote_config/pubspec.yaml @@ -16,8 +16,8 @@ false_secrets: - example/** environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: firebase_core: ^4.10.0 diff --git a/packages/firebase_storage/firebase_storage/android/build.gradle b/packages/firebase_storage/firebase_storage/android/build.gradle index f041bc40275b..22f3678a6a57 100755 --- a/packages/firebase_storage/firebase_storage/android/build.gradle +++ b/packages/firebase_storage/firebase_storage/android/build.gradle @@ -5,14 +5,12 @@ apply plugin: 'com.android.library' apply from: file("local-config.gradle") buildscript { - ext.kotlin_version = "2.0.0" repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.1.4' - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version") + classpath 'com.android.tools.build:gradle:9.0.0' } } @@ -44,16 +42,6 @@ def getRootProjectExtOrCoreProperty(name, firebaseCoreProject) { return rootProject.ext.get('FlutterFire').get(name) } -// AGP 9+ has built-in Kotlin support unless Flutter opts out via android.builtInKotlin=false. -def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int -def builtInKotlin = providers.gradleProperty("android.builtInKotlin") - .map { it.toBoolean() } - .orElse(agpMajor >= 9) - .get() -if (agpMajor < 9 || !builtInKotlin) { - apply plugin: 'kotlin-android' -} - android { // Conditional for compatibility with AGP <4.2. if (project.android.hasProperty("namespace")) { @@ -93,11 +81,9 @@ android { } } -plugins.withId("org.jetbrains.kotlin.android") { - kotlin { - compilerOptions { - jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) - } +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) } } diff --git a/packages/firebase_storage/firebase_storage/android/local-config.gradle b/packages/firebase_storage/firebase_storage/android/local-config.gradle index 802b7e1d6482..9522ca1086b7 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=23 targetSdk=34 javaVersion = JavaVersion.toVersion(17) - androidGradlePluginVersion = '8.3.0' + androidGradlePluginVersion = '9.0.0' } \ No newline at end of file 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 e85ee381169d..78f4801fdf15 100644 --- a/packages/firebase_storage/firebase_storage/example/android/app/build.gradle +++ b/packages/firebase_storage/firebase_storage/example/android/app/build.gradle @@ -3,8 +3,7 @@ plugins { // START: FlutterFire Configuration id 'com.google.gms.google-services' // END: FlutterFire Configuration - id "kotlin-android" - // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + // The Flutter Gradle Plugin must be applied after the Android Gradle plugin. id "dev.flutter.flutter-gradle-plugin" } apply from: file("../../../android/local-config.gradle") @@ -37,10 +36,6 @@ android { targetCompatibility = project.ext.javaVersion } - kotlinOptions { - jvmTarget = "17" - } - defaultConfig { applicationId = "io.flutter.plugins.firebasestorageexample" // You can update the following values to match your application needs. @@ -63,3 +58,9 @@ android { flutter { source = "../.." } + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} diff --git a/packages/firebase_storage/firebase_storage/example/android/gradle.properties b/packages/firebase_storage/firebase_storage/example/android/gradle.properties index 3c0f502f334a..e17ff5312178 100644 --- a/packages/firebase_storage/firebase_storage/example/android/gradle.properties +++ b/packages/firebase_storage/firebase_storage/example/android/gradle.properties @@ -1,4 +1,8 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true -androidGradlePluginVersion=8.3.0 \ No newline at end of file +androidGradlePluginVersion=9.0.0 +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/packages/firebase_storage/firebase_storage/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_storage/firebase_storage/example/android/gradle/wrapper/gradle-wrapper.properties index e411586a54a8..d706aba609b5 100644 --- a/packages/firebase_storage/firebase_storage/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_storage/firebase_storage/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/firebase_storage/firebase_storage/example/android/settings.gradle b/packages/firebase_storage/firebase_storage/example/android/settings.gradle index 30463c1cf2f2..79b7c45f5666 100644 --- a/packages/firebase_storage/firebase_storage/example/android/settings.gradle +++ b/packages/firebase_storage/firebase_storage/example/android/settings.gradle @@ -18,11 +18,10 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "${androidGradlePluginVersion}" apply false + id "com.android.application" version "9.0.0" 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/packages/firebase_storage/firebase_storage/example/pubspec.yaml b/packages/firebase_storage/firebase_storage/example/pubspec.yaml index 93cf6b6cabf9..104d565bbcd9 100755 --- a/packages/firebase_storage/firebase_storage/example/pubspec.yaml +++ b/packages/firebase_storage/firebase_storage/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firebase_storage plugin. resolution: workspace environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: firebase_core: ^4.10.0 diff --git a/packages/firebase_storage/firebase_storage/pubspec.yaml b/packages/firebase_storage/firebase_storage/pubspec.yaml index ceffd8cb4fdf..5d5a11129246 100755 --- a/packages/firebase_storage/firebase_storage/pubspec.yaml +++ b/packages/firebase_storage/firebase_storage/pubspec.yaml @@ -16,8 +16,8 @@ false_secrets: - example/** environment: - sdk: '^3.6.0' - flutter: '>=3.27.0' + sdk: ^3.12.0 + flutter: '>=3.44.0' dependencies: firebase_core: ^4.10.0 From 6afbd4366f42aea57be6830d4a7be8161d576864 Mon Sep 17 00:00:00 2001 From: Jude Kwashie Date: Mon, 8 Jun 2026 14:36:28 +0000 Subject: [PATCH 2/6] chore: update Flutter and Dart SDK constraints across multiple packages to support lower versions --- packages/cloud_firestore/cloud_firestore/example/pubspec.yaml | 4 ++-- packages/cloud_firestore/cloud_firestore/pubspec.yaml | 4 ++-- packages/cloud_functions/cloud_functions/example/pubspec.yaml | 4 ++-- packages/cloud_functions/cloud_functions/pubspec.yaml | 4 ++-- packages/firebase_ai/firebase_ai/example/pubspec.yaml | 4 ++-- packages/firebase_ai/firebase_ai/pubspec.yaml | 4 ++-- .../firebase_analytics/example/pubspec.yaml | 4 ++-- packages/firebase_analytics/firebase_analytics/pubspec.yaml | 4 ++-- .../firebase_app_check/example/pubspec.yaml | 4 ++-- packages/firebase_app_check/firebase_app_check/pubspec.yaml | 4 ++-- .../firebase_app_installations/example/pubspec.yaml | 4 ++-- .../firebase_app_installations/pubspec.yaml | 4 ++-- packages/firebase_auth/firebase_auth/example/pubspec.yaml | 4 ++-- packages/firebase_auth/firebase_auth/pubspec.yaml | 4 ++-- packages/firebase_core/firebase_core/example/pubspec.yaml | 4 ++-- packages/firebase_core/firebase_core/pubspec.yaml | 4 ++-- .../firebase_crashlytics/example/pubspec.yaml | 4 ++-- .../firebase_crashlytics/firebase_crashlytics/pubspec.yaml | 4 ++-- .../firebase_data_connect/example/pubspec.yaml | 4 ++-- .../firebase_data_connect/firebase_data_connect/pubspec.yaml | 4 ++-- .../firebase_database/firebase_database/example/pubspec.yaml | 4 ++-- packages/firebase_database/firebase_database/pubspec.yaml | 4 ++-- .../firebase_in_app_messaging/example/pubspec.yaml | 4 ++-- .../firebase_in_app_messaging/pubspec.yaml | 4 ++-- .../firebase_messaging/example/pubspec.yaml | 4 ++-- packages/firebase_messaging/firebase_messaging/pubspec.yaml | 4 ++-- .../firebase_ml_model_downloader/example/pubspec.yaml | 4 ++-- .../firebase_ml_model_downloader/pubspec.yaml | 4 ++-- .../firebase_performance/example/pubspec.yaml | 4 ++-- .../firebase_performance/firebase_performance/pubspec.yaml | 4 ++-- .../firebase_remote_config/example/pubspec.yaml | 4 ++-- .../firebase_remote_config/pubspec.yaml | 4 ++-- .../firebase_storage/firebase_storage/example/pubspec.yaml | 4 ++-- packages/firebase_storage/firebase_storage/pubspec.yaml | 4 ++-- 34 files changed, 68 insertions(+), 68 deletions(-) diff --git a/packages/cloud_firestore/cloud_firestore/example/pubspec.yaml b/packages/cloud_firestore/cloud_firestore/example/pubspec.yaml index 8ab8cc62cb31..9dcba518072c 100755 --- a/packages/cloud_firestore/cloud_firestore/example/pubspec.yaml +++ b/packages/cloud_firestore/cloud_firestore/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firestore plugin. resolution: workspace environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: cloud_firestore: ^6.5.0 diff --git a/packages/cloud_firestore/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/cloud_firestore/pubspec.yaml index 78397092fcbd..f5a18b6741cf 100755 --- a/packages/cloud_firestore/cloud_firestore/pubspec.yaml +++ b/packages/cloud_firestore/cloud_firestore/pubspec.yaml @@ -17,8 +17,8 @@ false_secrets: - dartpad/** environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: cloud_firestore_platform_interface: ^8.0.2 diff --git a/packages/cloud_functions/cloud_functions/example/pubspec.yaml b/packages/cloud_functions/cloud_functions/example/pubspec.yaml index b0873e966973..267ecca8fc47 100644 --- a/packages/cloud_functions/cloud_functions/example/pubspec.yaml +++ b/packages/cloud_functions/cloud_functions/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the cloud_functions plugin. resolution: workspace environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: cloud_functions: ^6.3.2 diff --git a/packages/cloud_functions/cloud_functions/pubspec.yaml b/packages/cloud_functions/cloud_functions/pubspec.yaml index 70b849ee5670..01dc55e8ad0e 100644 --- a/packages/cloud_functions/cloud_functions/pubspec.yaml +++ b/packages/cloud_functions/cloud_functions/pubspec.yaml @@ -14,8 +14,8 @@ false_secrets: - example/** environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: cloud_functions_platform_interface: ^6.0.2 diff --git a/packages/firebase_ai/firebase_ai/example/pubspec.yaml b/packages/firebase_ai/firebase_ai/example/pubspec.yaml index 695685fb757c..54c54a17901a 100644 --- a/packages/firebase_ai/firebase_ai/example/pubspec.yaml +++ b/packages/firebase_ai/firebase_ai/example/pubspec.yaml @@ -8,8 +8,8 @@ version: 1.0.0+1 resolution: workspace environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions diff --git a/packages/firebase_ai/firebase_ai/pubspec.yaml b/packages/firebase_ai/firebase_ai/pubspec.yaml index cd89dfecad40..7e7cb3731c59 100644 --- a/packages/firebase_ai/firebase_ai/pubspec.yaml +++ b/packages/firebase_ai/firebase_ai/pubspec.yaml @@ -17,8 +17,8 @@ platforms: web: environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: ">=3.16.0" dependencies: firebase_app_check: ^0.4.4+2 diff --git a/packages/firebase_analytics/firebase_analytics/example/pubspec.yaml b/packages/firebase_analytics/firebase_analytics/example/pubspec.yaml index 16624645b7d9..8cf3373a2454 100755 --- a/packages/firebase_analytics/firebase_analytics/example/pubspec.yaml +++ b/packages/firebase_analytics/firebase_analytics/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firebase_analytics plugin. resolution: workspace environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: firebase_analytics: ^12.4.2 diff --git a/packages/firebase_analytics/firebase_analytics/pubspec.yaml b/packages/firebase_analytics/firebase_analytics/pubspec.yaml index 48d036c9c246..b9c1dbaf1d2e 100755 --- a/packages/firebase_analytics/firebase_analytics/pubspec.yaml +++ b/packages/firebase_analytics/firebase_analytics/pubspec.yaml @@ -16,8 +16,8 @@ false_secrets: - example/** environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: firebase_analytics_platform_interface: ^6.0.2 diff --git a/packages/firebase_app_check/firebase_app_check/example/pubspec.yaml b/packages/firebase_app_check/firebase_app_check/example/pubspec.yaml index 6053a27f233b..72614cde959d 100644 --- a/packages/firebase_app_check/firebase_app_check/example/pubspec.yaml +++ b/packages/firebase_app_check/firebase_app_check/example/pubspec.yaml @@ -7,8 +7,8 @@ version: 1.0.0+1 resolution: workspace environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: cloud_firestore: ^6.5.0 diff --git a/packages/firebase_app_check/firebase_app_check/pubspec.yaml b/packages/firebase_app_check/firebase_app_check/pubspec.yaml index 6af3b1be8055..3def275e7ff9 100644 --- a/packages/firebase_app_check/firebase_app_check/pubspec.yaml +++ b/packages/firebase_app_check/firebase_app_check/pubspec.yaml @@ -14,8 +14,8 @@ false_secrets: - example/** environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: firebase_app_check_platform_interface: ^0.4.0+2 diff --git a/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml b/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml index a52a1c86c3d8..95832dbeffa3 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml +++ b/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml @@ -7,8 +7,8 @@ version: 1.0.0+1 resolution: workspace environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: firebase_core: ^4.10.0 diff --git a/packages/firebase_app_installations/firebase_app_installations/pubspec.yaml b/packages/firebase_app_installations/firebase_app_installations/pubspec.yaml index db43cc313385..6299d7967809 100644 --- a/packages/firebase_app_installations/firebase_app_installations/pubspec.yaml +++ b/packages/firebase_app_installations/firebase_app_installations/pubspec.yaml @@ -14,8 +14,8 @@ false_secrets: - example/** environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: firebase_app_installations_platform_interface: ^0.1.4+71 diff --git a/packages/firebase_auth/firebase_auth/example/pubspec.yaml b/packages/firebase_auth/firebase_auth/example/pubspec.yaml index 8671cc455bdb..d4945ff996a9 100644 --- a/packages/firebase_auth/firebase_auth/example/pubspec.yaml +++ b/packages/firebase_auth/firebase_auth/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firebase_auth plugin. resolution: workspace environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: barcode_widget: ^2.0.4 diff --git a/packages/firebase_auth/firebase_auth/pubspec.yaml b/packages/firebase_auth/firebase_auth/pubspec.yaml index a5c9c9ded9c8..d559a058e9fa 100755 --- a/packages/firebase_auth/firebase_auth/pubspec.yaml +++ b/packages/firebase_auth/firebase_auth/pubspec.yaml @@ -17,8 +17,8 @@ false_secrets: - example/** environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.16.0' dependencies: firebase_auth_platform_interface: ^9.0.2 diff --git a/packages/firebase_core/firebase_core/example/pubspec.yaml b/packages/firebase_core/firebase_core/example/pubspec.yaml index bb4660e59316..a5489ddbd498 100644 --- a/packages/firebase_core/firebase_core/example/pubspec.yaml +++ b/packages/firebase_core/firebase_core/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firebase_core plugin. resolution: workspace environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: firebase_core: ^4.10.0 diff --git a/packages/firebase_core/firebase_core/pubspec.yaml b/packages/firebase_core/firebase_core/pubspec.yaml index 318f8083d08e..ec426a170d59 100644 --- a/packages/firebase_core/firebase_core/pubspec.yaml +++ b/packages/firebase_core/firebase_core/pubspec.yaml @@ -13,8 +13,8 @@ false_secrets: - example/** environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: firebase_core_platform_interface: ^7.0.1 diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/pubspec.yaml b/packages/firebase_crashlytics/firebase_crashlytics/example/pubspec.yaml index f5fedb61011d..f10713cc4179 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/pubspec.yaml +++ b/packages/firebase_crashlytics/firebase_crashlytics/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firebase_crashlytics plugin. resolution: workspace environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: firebase_analytics: ^12.4.2 diff --git a/packages/firebase_crashlytics/firebase_crashlytics/pubspec.yaml b/packages/firebase_crashlytics/firebase_crashlytics/pubspec.yaml index 66a5e1ecc157..bbfc54d297c2 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/pubspec.yaml +++ b/packages/firebase_crashlytics/firebase_crashlytics/pubspec.yaml @@ -16,8 +16,8 @@ false_secrets: - example/** environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: firebase_core: ^4.10.0 diff --git a/packages/firebase_data_connect/firebase_data_connect/example/pubspec.yaml b/packages/firebase_data_connect/firebase_data_connect/example/pubspec.yaml index 072fd22c671b..6968fe1eb773 100644 --- a/packages/firebase_data_connect/firebase_data_connect/example/pubspec.yaml +++ b/packages/firebase_data_connect/firebase_data_connect/example/pubspec.yaml @@ -7,8 +7,8 @@ version: 1.0.0+1 resolution: workspace environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: flutter: diff --git a/packages/firebase_data_connect/firebase_data_connect/pubspec.yaml b/packages/firebase_data_connect/firebase_data_connect/pubspec.yaml index 11dcf5f95090..34df0b12dd1e 100644 --- a/packages/firebase_data_connect/firebase_data_connect/pubspec.yaml +++ b/packages/firebase_data_connect/firebase_data_connect/pubspec.yaml @@ -8,8 +8,8 @@ false_secrets: - dartpad/** environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: crypto: ^3.0.6 diff --git a/packages/firebase_database/firebase_database/example/pubspec.yaml b/packages/firebase_database/firebase_database/example/pubspec.yaml index 86a08a3e85cb..495579667ce3 100755 --- a/packages/firebase_database/firebase_database/example/pubspec.yaml +++ b/packages/firebase_database/firebase_database/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firebase_database plugin. resolution: workspace environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: firebase_core: ^4.10.0 diff --git a/packages/firebase_database/firebase_database/pubspec.yaml b/packages/firebase_database/firebase_database/pubspec.yaml index f3d6dd7a5c58..d5a57955f1ff 100755 --- a/packages/firebase_database/firebase_database/pubspec.yaml +++ b/packages/firebase_database/firebase_database/pubspec.yaml @@ -14,8 +14,8 @@ false_secrets: - example/** environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: firebase_core: ^4.10.0 diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/pubspec.yaml b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/pubspec.yaml index 8655258d213d..71f63d2126f3 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/pubspec.yaml +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/pubspec.yaml @@ -4,8 +4,8 @@ resolution: workspace publish_to: 'none' environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: firebase_analytics: ^12.4.2 diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/pubspec.yaml b/packages/firebase_in_app_messaging/firebase_in_app_messaging/pubspec.yaml index 9cc9b3c7c6e5..88bd5d6b871d 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/pubspec.yaml +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/pubspec.yaml @@ -14,8 +14,8 @@ false_secrets: - example/** environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: firebase_core: ^4.10.0 diff --git a/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml b/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml index 1939a3721e17..d9d7fa996837 100644 --- a/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml +++ b/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firebase_messaging plugin. resolution: workspace environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: firebase_core: ^4.10.0 diff --git a/packages/firebase_messaging/firebase_messaging/pubspec.yaml b/packages/firebase_messaging/firebase_messaging/pubspec.yaml index e00e0dd72c25..6837ec856e4e 100644 --- a/packages/firebase_messaging/firebase_messaging/pubspec.yaml +++ b/packages/firebase_messaging/firebase_messaging/pubspec.yaml @@ -14,8 +14,8 @@ false_secrets: - example/** environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: firebase_core: ^4.10.0 diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/pubspec.yaml b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/pubspec.yaml index ec433a71cb58..4adc9fc6d2a9 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/pubspec.yaml +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/pubspec.yaml @@ -5,8 +5,8 @@ resolution: workspace publish_to: 'none' environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: flutter: diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/pubspec.yaml b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/pubspec.yaml index 264e5071d25f..6546173101f4 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/pubspec.yaml +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/pubspec.yaml @@ -14,8 +14,8 @@ false_secrets: - example/** environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: firebase_core: ^4.10.0 diff --git a/packages/firebase_performance/firebase_performance/example/pubspec.yaml b/packages/firebase_performance/firebase_performance/example/pubspec.yaml index 821ddf1f4929..2f95bb40c267 100644 --- a/packages/firebase_performance/firebase_performance/example/pubspec.yaml +++ b/packages/firebase_performance/firebase_performance/example/pubspec.yaml @@ -5,8 +5,8 @@ resolution: workspace publish_to: none environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: firebase_core: ^4.10.0 diff --git a/packages/firebase_performance/firebase_performance/pubspec.yaml b/packages/firebase_performance/firebase_performance/pubspec.yaml index e09a94e38254..f1efe47bbdca 100644 --- a/packages/firebase_performance/firebase_performance/pubspec.yaml +++ b/packages/firebase_performance/firebase_performance/pubspec.yaml @@ -17,8 +17,8 @@ false_secrets: - example/** environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: firebase_core: ^4.10.0 diff --git a/packages/firebase_remote_config/firebase_remote_config/example/pubspec.yaml b/packages/firebase_remote_config/firebase_remote_config/example/pubspec.yaml index 46ea920b46f3..4587601f52c9 100644 --- a/packages/firebase_remote_config/firebase_remote_config/example/pubspec.yaml +++ b/packages/firebase_remote_config/firebase_remote_config/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firebase_remote_config plugin. resolution: workspace environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: # The following adds the Cupertino Icons font to your application. diff --git a/packages/firebase_remote_config/firebase_remote_config/pubspec.yaml b/packages/firebase_remote_config/firebase_remote_config/pubspec.yaml index 283b33110bf4..148239b17b22 100644 --- a/packages/firebase_remote_config/firebase_remote_config/pubspec.yaml +++ b/packages/firebase_remote_config/firebase_remote_config/pubspec.yaml @@ -16,8 +16,8 @@ false_secrets: - example/** environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: firebase_core: ^4.10.0 diff --git a/packages/firebase_storage/firebase_storage/example/pubspec.yaml b/packages/firebase_storage/firebase_storage/example/pubspec.yaml index 104d565bbcd9..93cf6b6cabf9 100755 --- a/packages/firebase_storage/firebase_storage/example/pubspec.yaml +++ b/packages/firebase_storage/firebase_storage/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firebase_storage plugin. resolution: workspace environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: firebase_core: ^4.10.0 diff --git a/packages/firebase_storage/firebase_storage/pubspec.yaml b/packages/firebase_storage/firebase_storage/pubspec.yaml index 5d5a11129246..ceffd8cb4fdf 100755 --- a/packages/firebase_storage/firebase_storage/pubspec.yaml +++ b/packages/firebase_storage/firebase_storage/pubspec.yaml @@ -16,8 +16,8 @@ false_secrets: - example/** environment: - sdk: ^3.12.0 - flutter: '>=3.44.0' + sdk: '^3.6.0' + flutter: '>=3.27.0' dependencies: firebase_core: ^4.10.0 From c25c31dc86bd2e4152298eaa2fc722ade2c52ab3 Mon Sep 17 00:00:00 2001 From: Jude Kwashie Date: Tue, 9 Jun 2026 08:14:58 +0000 Subject: [PATCH 3/6] chore: update Google Services plugin version to 4.4.4 in settings.gradle.kts --- .../pipeline_example/android/settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cloud_firestore/cloud_firestore/pipeline_example/android/settings.gradle.kts b/packages/cloud_firestore/cloud_firestore/pipeline_example/android/settings.gradle.kts index 3ad1e3362f46..6a6f86b1ca2d 100644 --- a/packages/cloud_firestore/cloud_firestore/pipeline_example/android/settings.gradle.kts +++ b/packages/cloud_firestore/cloud_firestore/pipeline_example/android/settings.gradle.kts @@ -21,7 +21,7 @@ plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" id("com.android.application") version "9.0.0" apply false // START: FlutterFire Configuration - id("com.google.gms.google-services") version("4.3.15") apply false + id("com.google.gms.google-services") version("4.4.4") apply false // END: FlutterFire Configuration } From c9bbdab2ed1456a04cd2707a1da1ebf6e267c23b Mon Sep 17 00:00:00 2001 From: Jude Kwashie Date: Tue, 9 Jun 2026 09:32:22 +0000 Subject: [PATCH 4/6] chore: remove flutter-version specification from e2e tests pipeline configuration --- .github/workflows/e2e_tests_pipeline.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/e2e_tests_pipeline.yaml b/.github/workflows/e2e_tests_pipeline.yaml index 4b101184499d..aa59a13debe3 100644 --- a/.github/workflows/e2e_tests_pipeline.yaml +++ b/.github/workflows/e2e_tests_pipeline.yaml @@ -45,7 +45,6 @@ jobs: - uses: subosito/flutter-action@1a449444c387b1966244ae4d4f8c696479add0b2 with: channel: 'stable' - flutter-version: '3.41.9' cache: true cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:" pub-cache-key: "flutter-pub-:os:-:channel:-:version:-:arch:-:hash:" From b01d0aa43cdc987aa9734e9bf71059818da0ce54 Mon Sep 17 00:00:00 2001 From: Jude Kwashie Date: Tue, 9 Jun 2026 10:33:52 +0000 Subject: [PATCH 5/6] chore: update Android Gradle plugin to version 9.0.0 and Gradle wrapper to 9.1.0; adjust Kotlin compiler options --- tests/android/app/build.gradle | 13 +++++++------ .../gradle/wrapper/gradle-wrapper.properties | 2 +- tests/android/settings.gradle | 3 +-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/android/app/build.gradle b/tests/android/app/build.gradle index b26d90633bf5..fc3d9adc9b24 100644 --- a/tests/android/app/build.gradle +++ b/tests/android/app/build.gradle @@ -1,7 +1,6 @@ plugins { id "com.android.application" - id "kotlin-android" - // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + // The Flutter Gradle Plugin must be applied after the Android Gradle plugin. id "dev.flutter.flutter-gradle-plugin" } @@ -34,10 +33,6 @@ android { coreLibraryDesugaringEnabled true } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17 - } - defaultConfig { applicationId = "io.flutter.plugins.firebase.tests" // auth requires minSdk 23 @@ -63,3 +58,9 @@ flutter { dependencies { coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4' } + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} diff --git a/tests/android/gradle/wrapper/gradle-wrapper.properties b/tests/android/gradle/wrapper/gradle-wrapper.properties index 3c85cfe057a1..1f569d227728 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.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip diff --git a/tests/android/settings.gradle b/tests/android/settings.gradle index 4f520718dccf..ce3558625d25 100644 --- a/tests/android/settings.gradle +++ b/tests/android/settings.gradle @@ -18,8 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.6.0" apply false - id "org.jetbrains.kotlin.android" version "2.1.0" apply false + id "com.android.application" version "9.0.0" apply false } include ":app" From a3d6a50812111cef42525e79d1ae926aa1e31aa1 Mon Sep 17 00:00:00 2001 From: Jude Kwashie Date: Tue, 9 Jun 2026 11:23:03 +0000 Subject: [PATCH 6/6] chore: update Gradle wrapper distribution URL to use the all distribution instead of the bin distribution --- 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 1f569d227728..2d428bfb1672 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-9.1.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip