firebase · Lyokone · Mar 30, 2026 · Mar 24, 2026 · Mar 24, 2026 · Mar 24, 2026
diff --git a/melos.yaml b/melos.yaml
@@ -21,7 +21,9 @@ command:
        dart run scripts/generate_dataconnect_version.dart && \
        dart run scripts/generate_versions_web.dart && \
        dart run scripts/generate_versions_spm.dart && \
-        git add packages/firebase_data_connect/firebase_data_connect/lib/src/dataconnect_version.dart && git add packages/*/*_web/lib/src/*_version.dart && git add packages/*/*/ios/*/Package.swift packages/*/*/macos/*/Package.swift
+        git add packages/firebase_data_connect/firebase_data_connect/lib/src/dataconnect_version.dart && git add packages/*/*_web/lib/src/*_version.dart && git add packages/*/*/ios/*/Package.swift packages/*/*/macos/*/Package.swift && git add packages/*/*/ios/*/Sources/*/Constants.swift
+      post: |
+        dart run scripts/generate_tag_spm_firebase_core.dart

  bootstrap:
    # It seems so that running "pub get" in parallel has some issues (like

diff --git a/packages/firebase_app_check/firebase_app_check/android/build.gradle b/packages/firebase_app_check/firebase_app_check/android/build.gradle
@@ -5,14 +5,11 @@ apply plugin: 'com.android.library'
 apply from: file("local-config.gradle")

 buildscript {
+  ext.kotlin_version = "1.8.22"
  repositories {
    google()
    mavenCentral()
  }
-
-  dependencies {
-    classpath 'com.android.tools.build:gradle:8.3.0'
-  }
 }

 rootProject.allprojects {
@@ -22,6 +19,12 @@ rootProject.allprojects {
  }
 }

+// AGP 9+ has built-in Kotlin support; older versions need the plugin explicitly.
+def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int
+if (agpMajor < 9) {
+    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?')
@@ -48,11 +51,22 @@ android {
    testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
  }

+  if (agpMajor < 9) {
+    kotlinOptions {
+      jvmTarget = project.ext.javaVersion
+    }
+  }
+
  compileOptions {
    sourceCompatibility project.ext.javaVersion
    targetCompatibility project.ext.javaVersion
  }

+  sourceSets {
+    main.java.srcDirs += "src/main/kotlin"
+    test.java.srcDirs += "src/test/kotlin"
+  }
+
  buildFeatures {
    buildConfig true
  }
@@ -67,7 +81,6 @@ android {
    implementation 'com.google.firebase:firebase-appcheck-debug'
    implementation 'com.google.firebase:firebase-appcheck-playintegrity'
    implementation 'androidx.annotation:annotation:1.7.0'
-
  }
 }


diff --git a/...oid/src/main/java/io/flutter/plugins/firebase/appcheck/FlutterFirebaseAppCheckPlugin.java b/...oid/src/main/java/io/flutter/plugins/firebase/appcheck/FlutterFirebaseAppCheckPlugin.java
diff --git a/...droid/src/main/java/io/flutter/plugins/firebase/appcheck/FlutterFirebaseAppRegistrar.java b/...droid/src/main/java/io/flutter/plugins/firebase/appcheck/FlutterFirebaseAppRegistrar.java