feat(android): Built-in Kotlin migration

.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:"

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'
     }
 }
 

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'
 }

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
+    }
+}

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
+androidGradlePluginVersion=9.0.0

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
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip

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"

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
+    }
+}

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

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")

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")

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'
 }

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
+    }
+}

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
+androidGradlePluginVersion=9.0.0

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
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip

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"

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())
     }
-  }
 }

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'
 }

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
+    }
+}

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

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")

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())
     }
 }
 

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'
 }