fix: swift integ core_shared import

MichaelVerdon · MichaelVerdon · commit 443945b0cbfd · 2025-11-12T05:51:38.000Z
diff --git a/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTDocumentSnapshotStreamHandler.m b/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTDocumentSnapshotStreamHandler.m
@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 @import FirebaseFirestore;
-#if __has_include(<firebase_core/firebase_core.h>)
-@import firebase_core;
-#else
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
+#else
+@import firebase_core;
 #endif
 
 #import "include/cloud_firestore/Private/FLTDocumentSnapshotStreamHandler.h"
diff --git a/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTFirebaseFirestorePlugin.m b/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTFirebaseFirestorePlugin.m
@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 @import FirebaseFirestore;
-#if __has_include(<firebase_core/firebase_core.h>)
-@import firebase_core;
-#else
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
+#else
+@import firebase_core;
 #endif
 @import FirebaseCore;
 
diff --git a/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTFirebaseFirestoreReader.m b/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTFirebaseFirestoreReader.m
@@ -4,10 +4,10 @@
 
 @import FirebaseFirestore;
 @import FirebaseCore;
-#if __has_include(<firebase_core/firebase_core.h>)
-@import firebase_core;
-#else
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
+#else
+@import firebase_core;
 #endif
 
 #import "include/cloud_firestore/Private/FLTFirebaseFirestoreReader.h"
diff --git a/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTFirebaseFirestoreWriter.m b/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTFirebaseFirestoreWriter.m
@@ -4,10 +4,10 @@
 
 @import FirebaseFirestore;
 @import FirebaseCore;
-#if __has_include(<firebase_core/firebase_core.h>)
-@import firebase_core;
-#else
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
+#else
+@import firebase_core;
 #endif
 
 #import "include/cloud_firestore/Private/FLTFirebaseFirestoreWriter.h"
diff --git a/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTLoadBundleStreamHandler.m b/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTLoadBundleStreamHandler.m
@@ -10,10 +10,10 @@
 //
 
 @import FirebaseFirestore;
-#if __has_include(<firebase_core/firebase_core.h>)
-@import firebase_core;
-#else
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
+#else
+@import firebase_core;
 #endif
 
 #import "include/cloud_firestore/Private/FLTLoadBundleStreamHandler.h"
diff --git a/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTQuerySnapshotStreamHandler.m b/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTQuerySnapshotStreamHandler.m
@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 @import FirebaseFirestore;
-#if __has_include(<firebase_core/firebase_core.h>)
-@import firebase_core;
-#else
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
+#else
+@import firebase_core;
 #endif
 
 #import "include/cloud_firestore/Private/FLTQuerySnapshotStreamHandler.h"
diff --git a/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTTransactionStreamHandler.m b/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTTransactionStreamHandler.m
@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 @import FirebaseFirestore;
-#if __has_include(<firebase_core/firebase_core.h>)
-@import firebase_core;
-#else
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
+#else
+@import firebase_core;
 #endif
 @import FirebaseCore;
 
diff --git a/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/include/cloud_firestore/Public/FLTFirebaseFirestorePlugin.h b/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/include/cloud_firestore/Public/FLTFirebaseFirestorePlugin.h
@@ -10,10 +10,10 @@
 #endif
 
 #import <Foundation/Foundation.h>
-#if __has_include(<firebase_core/firebase_core.h>)
-@import firebase_core;
-#else
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
+#else
+@import firebase_core;
 #endif
 #import "FirestoreMessages.g.h"
 
diff --git a/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Sources/firebase_app_check/FLTFirebaseAppCheckPlugin.m b/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Sources/firebase_app_check/FLTFirebaseAppCheckPlugin.m
@@ -6,10 +6,10 @@
 #import "FLTTokenRefreshStreamHandler.h"
 
 @import FirebaseAppCheck;
-#if __has_include(<firebase_core/firebase_core.h>)
-@import firebase_core;
-#else
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
+#else
+@import firebase_core;
 #endif
 @import FirebaseCore;
 
diff --git a/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Sources/firebase_app_check/include/FLTFirebaseAppCheckPlugin.h b/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Sources/firebase_app_check/include/FLTFirebaseAppCheckPlugin.h
@@ -10,10 +10,10 @@
 #endif
 
 #import <Foundation/Foundation.h>
-#if __has_include(<firebase_core/firebase_core.h>)
-@import firebase_core;
-#else
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
+#else
+@import firebase_core;
 #endif
 #import "FLTAppCheckProviderFactory.h"
 
diff --git a/packages/firebase_auth/firebase_auth/ios/firebase_auth/Sources/firebase_auth/FLTFirebaseAuthPlugin.m b/packages/firebase_auth/firebase_auth/ios/firebase_auth/Sources/firebase_auth/FLTFirebaseAuthPlugin.m
@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 @import FirebaseAuth;
-#if __has_include(<firebase_core/firebase_core.h>)
-@import firebase_core;
-#else
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
+#else
+@import firebase_core;
 #endif
 @import FirebaseCore;
 #import <FirebaseAuth/FirebaseAuth.h>
diff --git a/packages/firebase_auth/firebase_auth/ios/firebase_auth/Sources/firebase_auth/include/Public/FLTFirebaseAuthPlugin.h b/packages/firebase_auth/firebase_auth/ios/firebase_auth/Sources/firebase_auth/include/Public/FLTFirebaseAuthPlugin.h
@@ -12,10 +12,10 @@
 
 #import <AuthenticationServices/AuthenticationServices.h>
 #import <Foundation/Foundation.h>
-#if __has_include(<firebase_core/firebase_core.h>)
-@import firebase_core;
-#else
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
+#else
+@import firebase_core;
 #endif
 #import "firebase_auth_messages.g.h"
 
diff --git a/packages/firebase_crashlytics/firebase_crashlytics/ios/firebase_crashlytics/Sources/firebase_crashlytics/FLTFirebaseCrashlyticsPlugin.m b/packages/firebase_crashlytics/firebase_crashlytics/ios/firebase_crashlytics/Sources/firebase_crashlytics/FLTFirebaseCrashlyticsPlugin.m
@@ -7,10 +7,10 @@
 #import "include/ExceptionModel_Platform.h"
 
 @import FirebaseCrashlytics;
-#if __has_include(<firebase_core/firebase_core.h>)
-@import firebase_core;
-#else
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
+#else
+@import firebase_core;
 #endif
 @import FirebaseCore;
 
diff --git a/packages/firebase_crashlytics/firebase_crashlytics/ios/firebase_crashlytics/Sources/firebase_crashlytics/include/FLTFirebaseCrashlyticsPlugin.h b/packages/firebase_crashlytics/firebase_crashlytics/ios/firebase_crashlytics/Sources/firebase_crashlytics/include/FLTFirebaseCrashlyticsPlugin.h
@@ -10,10 +10,10 @@
 #endif
 
 #import <Foundation/Foundation.h>
-#if __has_include(<firebase_core/firebase_core.h>)
-@import firebase_core;
-#else
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
+#else
+@import firebase_core;
 #endif
 
 @interface FLTFirebaseCrashlyticsPlugin : NSObject <FlutterPlugin, FLTFirebasePlugin>
diff --git a/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabaseObserveStreamHandler.m b/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabaseObserveStreamHandler.m
@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 @import FirebaseDatabase;
-#if __has_include(<firebase_core/firebase_core.h>)
-@import firebase_core;
-#else
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
+#else
+@import firebase_core;
 #endif
 @import FirebaseCore;
 
diff --git a/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabasePlugin.m b/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabasePlugin.m
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#if __has_include(<firebase_core/firebase_core.h>)
-@import firebase_core;
-#else
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
+#else
+@import firebase_core;
 #endif
 @import FirebaseCore;
 
diff --git a/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabaseUtils.m b/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabaseUtils.m
@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 #import "FLTFirebaseDatabaseUtils.h"
-#if __has_include(<firebase_core/firebase_core.h>)
-@import firebase_core;
-#else
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
+#else
+@import firebase_core;
 #endif
 @import FirebaseCore;
 
diff --git a/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/include/FLTFirebaseDatabasePlugin.h b/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/include/FLTFirebaseDatabasePlugin.h
@@ -13,10 +13,10 @@
 #endif
 
 #import <Foundation/Foundation.h>
-#if __has_include(<firebase_core/firebase_core.h>)
-@import firebase_core;
-#else
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
+#else
+@import firebase_core;
 #endif
 
 @interface FLTFirebaseDatabasePlugin : NSObject <FlutterPlugin, FLTFirebasePlugin>
diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/ios/firebase_in_app_messaging/Sources/firebase_in_app_messaging/FirebaseInAppMessagingPlugin.m b/packages/firebase_in_app_messaging/firebase_in_app_messaging/ios/firebase_in_app_messaging/Sources/firebase_in_app_messaging/FirebaseInAppMessagingPlugin.m
@@ -5,10 +5,10 @@
 #import "FirebaseInAppMessagingPlugin.h"
 
 @import FirebaseInAppMessaging;
-#if __has_include(<firebase_core/firebase_core.h>)
-@import firebase_core;
-#else
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
+#else
+@import firebase_core;
 #endif
 
 NSString *const kFLTFirebaseInAppMessagingChannelName =
diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/ios/firebase_in_app_messaging/Sources/firebase_in_app_messaging/include/FirebaseInAppMessagingPlugin.h b/packages/firebase_in_app_messaging/firebase_in_app_messaging/ios/firebase_in_app_messaging/Sources/firebase_in_app_messaging/include/FirebaseInAppMessagingPlugin.h
@@ -6,10 +6,10 @@
 #import <TargetConditionals.h>
 
 #import <Foundation/Foundation.h>
-#if __has_include(<firebase_core/firebase_core.h>)
-@import firebase_core;
-#else
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
+#else
+@import firebase_core;
 #endif
 
 @interface FirebaseInAppMessagingPlugin : NSObject <FlutterPlugin, FLTFirebasePlugin>
diff --git a/packages/firebase_messaging/firebase_messaging/example/ios/Flutter/AppFrameworkInfo.plist b/packages/firebase_messaging/firebase_messaging/example/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>12.0</string>
+  <string>13.0</string>
 </dict>
 </plist>
diff --git a/packages/firebase_messaging/firebase_messaging/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/firebase_messaging/firebase_messaging/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -44,6 +44,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -61,11 +62,13 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
diff --git a/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Sources/firebase_messaging/FLTFirebaseMessagingPlugin.m b/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Sources/firebase_messaging/FLTFirebaseMessagingPlugin.m
@@ -4,10 +4,10 @@
 #import <TargetConditionals.h>
 
 #import <GoogleUtilities/GULAppDelegateSwizzler.h>
-#if __has_include(<firebase_core/firebase_core.h>)
-@import firebase_core;
-#else
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
+#else
+@import firebase_core;
 #endif
 @import FirebaseCore;
 #import <objc/message.h>
diff --git a/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Sources/firebase_messaging/include/FLTFirebaseMessagingPlugin.h b/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Sources/firebase_messaging/include/FLTFirebaseMessagingPlugin.h
@@ -14,10 +14,10 @@
 #import <Foundation/Foundation.h>
 #import <UserNotifications/UserNotifications.h>
 
-#if __has_include(<firebase_core/firebase_core.h>)
-@import firebase_core;
-#else
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
+#else
+@import firebase_core;
 #endif
 
 #if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
