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:" 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/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..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 @@ -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 + id("com.google.gms.google-services") version("4.4.4") apply false // END: FlutterFire Configuration - id("org.jetbrains.kotlin.android") version "2.2.20" apply false } include(":app") 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/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_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_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_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_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_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_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_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_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_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_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_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_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_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_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/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..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-8.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.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"