From 3f877ecd819936259a089fd0c43bcf270af7a2f0 Mon Sep 17 00:00:00 2001 From: JisoDev Date: Tue, 13 Oct 2026 18:03:08 +0200 Subject: [PATCH] feat(firebase_core): migrate to built-in Kotlin support for AGP 9+ --- .../firebase_core/android/build.gradle | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/packages/firebase_core/firebase_core/android/build.gradle b/packages/firebase_core/firebase_core/android/build.gradle index 843923b8b21d..90da6754df07 100644 --- a/packages/firebase_core/firebase_core/android/build.gradle +++ b/packages/firebase_core/firebase_core/android/build.gradle @@ -18,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 getRootProjectExtOrDefaultProperty(name) { if (!rootProject.ext.has("FlutterFire")) return project.properties[name] if (!rootProject.ext.get("FlutterFire")[name]) return project.properties[name] @@ -73,11 +63,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.JVM_17 } }