fix: conflicts

Author: MichaelVerdon

packages/firebase_crashlytics/firebase_crashlytics/ios/crashlytics_add_upload_symbols

@@ -35,15 +35,14 @@ end
 # Path to the Xcode project to modify
 project_path = File.join(options_dict[:project_dir], options_dict[:project_name])
 
-unless (File.exist?(project_path)) 
+unless (File.exist?(project_path))
    abort("Project at #{project_path} does not exist. Please check paths or incorporate Crashlytics upload symbols manually.\n");
 end
 
 # If this is a Flutter project, upload-symbols will use the firebase_app_id_file.json to get the app's ID. If this file doesn't exist, upload-symbols may not be
-# able to upload symbols correctly. 
+# able to upload symbols correctly.
 if(options_dict[:flutter_project])
     unless File.exist?("#{options_dict[:project_dir]}/firebase_app_id_file.json")
-        puts("Warning: firebase_app_id_file.json file does not exist. This may cause issues in upload-symbols. If this error is unexpected, try running flutterfire configure again.")
         exit(0)
     end
 end
@@ -57,9 +56,9 @@ end
 # Actually open and modify the project
 project = Xcodeproj::Project.open(project_path)
 project.targets.each do |target|
-    if (target.name == "Runner") 
+    if (target.name == "Runner")
         # We need to make sure that we're not adding more than one run script to upload-symbols (or overwriting custom upload-symbols scripts).
-        target.shell_script_build_phases().each { |phase| 
+        target.shell_script_build_phases().each { |phase|
             if (phase.shell_script.include? "FirebaseCrashlytics/upload-symbols")
                 puts("Run script to upload symbols already exists.")
                 exit(0)

packages/firebase_data_connect/firebase_data_connect/example/android/app/local-config.gradle

@@ -3,5 +3,5 @@ ext {
     minSdk=23
     targetSdk=34
     javaVersion = JavaVersion.toVersion(17)
-    androidGradlePluginVersion = '8.3.0'
+    androidGradlePluginVersion = '8.6.0'
 }

packages/firebase_data_connect/firebase_data_connect/example/android/settings.gradle

@@ -22,7 +22,7 @@ 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
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }
 
 include ":app"

packages/firebase_database/analysis_options.yaml

@@ -0,0 +1,11 @@
+# Copyright 2025 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# in the LICENSE file.
+
+include: ../../analysis_options.yaml
+
+analyzer:
+  exclude:
+    - firebase_database_platform_interface/lib/src/pigeon/messages.pigeon.dart
+    - firebase_database_platform_interface/test/pigeon/test_api.dart
+    - firebase_database_platform_interface/pigeons/messages.dart

packages/firebase_database/firebase_database/android/build.gradle

@@ -2,6 +2,7 @@ group 'io.flutter.plugins.firebase.database'
 version '1.0-SNAPSHOT'
 
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
 apply from: file("local-config.gradle")
 
 buildscript {
@@ -49,6 +50,18 @@ android {
         targetCompatibility project.ext.javaVersion
     }
 
+    kotlinOptions {
+        jvmTarget = project.ext.javaVersion
+    }
+
+    sourceSets {
+        main {
+            java {
+                srcDirs = ['src/main/kotlin']
+            }
+        }
+    }
+
     buildFeatures {
         buildConfig = true
     }

packages/firebase_database/firebase_database/android/local-config.gradle

@@ -3,5 +3,5 @@ ext {
     minSdk=23
     targetSdk=34
     javaVersion = JavaVersion.toVersion(17)
-    androidGradlePluginVersion = '8.3.0'
+    androidGradlePluginVersion = '8.6.0'
 }