chore: fix swift defs

MichaelVerdon · MichaelVerdon · commit d7cc12dbea07 · 2025-11-18T12:55:09.000Z
diff --git a/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Package.swift b/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Package.swift
@@ -108,6 +108,7 @@ let package = Package(
       cSettings: [
         .headerSearchPath("include/cloud_firestore/Private"),
         .headerSearchPath("include/cloud_firestore/Public"),
+        .define("SWIFT_PACKAGE"),
         .define("LIBRARY_VERSION", to: "\"\(library_version)\""),
         .define("LIBRARY_NAME", to: "\"flutter-fire-fst\""),
       ]
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,7 +10,7 @@
 #endif
 
 #import <Foundation/Foundation.h>
-#if __has_include(<firebase_core_shared/firebase_core_shared-Swift.h>)
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
 #else
 @import firebase_core;
diff --git a/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Package.swift b/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Package.swift
@@ -107,6 +107,7 @@ let package = Package(
       ],
       cSettings: [
         .headerSearchPath("include"),
+        .define("SWIFT_PACKAGE"),
         .define("LIBRARY_VERSION", to: "\"\(library_version)\""),
         .define("LIBRARY_NAME", to: "\"flutter-fire-appcheck\""),
       ]
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,7 +10,7 @@
 #endif
 
 #import <Foundation/Foundation.h>
-#if __has_include(<firebase_core_shared/firebase_core_shared-Swift.h>)
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
 #else
 @import firebase_core;
diff --git a/packages/firebase_auth/firebase_auth/ios/firebase_auth/Package.swift b/packages/firebase_auth/firebase_auth/ios/firebase_auth/Package.swift
@@ -108,6 +108,7 @@ let package = Package(
       cSettings: [
         .headerSearchPath("include/firebase_auth/Private"),
         .headerSearchPath("include/firebase_auth/Public"),
+        .define("SWIFT_PACKAGE"),
         .define("LIBRARY_VERSION", to: "\"\(library_version)\""),
         .define("LIBRARY_NAME", to: "\"flutter-fire-auth\""),
       ]
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,7 +12,7 @@
 
 #import <AuthenticationServices/AuthenticationServices.h>
 #import <Foundation/Foundation.h>
-#if __has_include(<firebase_core_shared/firebase_core_shared-Swift.h>)
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
 #else
 @import firebase_core;
diff --git a/packages/firebase_crashlytics/firebase_crashlytics/ios/firebase_crashlytics/Package.swift b/packages/firebase_crashlytics/firebase_crashlytics/ios/firebase_crashlytics/Package.swift
@@ -112,6 +112,7 @@ let package = Package(
       ],
       cSettings: [
         .headerSearchPath("include"),
+        .define("SWIFT_PACKAGE"),
         .define("LIBRARY_VERSION", to: "\"\(library_version)\""),
         .define("LIBRARY_NAME", to: "\"flutter-fire-cls\""),
       ]
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,7 +10,7 @@
 #endif
 
 #import <Foundation/Foundation.h>
-#if __has_include(<firebase_core_shared/firebase_core_shared-Swift.h>)
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
 #else
 @import firebase_core;
diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/ios/firebase_in_app_messaging/Package.swift b/packages/firebase_in_app_messaging/firebase_in_app_messaging/ios/firebase_in_app_messaging/Package.swift
@@ -113,6 +113,7 @@ let package = Package(
       ],
       cSettings: [
         .headerSearchPath("include"),
+        .define("SWIFT_PACKAGE"),
         .define("LIBRARY_VERSION", to: "\"\(library_version)\""),
         .define("LIBRARY_NAME", to: "\"flutter-fire-fiam\""),
       ]
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,7 +6,7 @@
 #import <TargetConditionals.h>
 
 #import <Foundation/Foundation.h>
-#if __has_include(<firebase_core_shared/firebase_core_shared-Swift.h>)
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
 #else
 @import firebase_core;
diff --git a/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Package.swift b/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Package.swift
@@ -112,6 +112,7 @@ let package = Package(
       ],
       cSettings: [
         .headerSearchPath("include"),
+        .define("SWIFT_PACKAGE"),
         .define("LIBRARY_VERSION", to: "\"\(library_version)\""),
         .define("LIBRARY_NAME", to: "\"flutter-fire-fcm\""),
       ]
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,7 +4,7 @@
 #import <TargetConditionals.h>
 
 #import <GoogleUtilities/GULAppDelegateSwizzler.h>
-#if __has_include(<firebase_core_shared/firebase_core_shared-Swift.h>)
+#ifdef SWIFT_PACKAGE
 @import firebase_core_shared;
 #else
 @import firebase_core;
diff --git a/packages/firebase_messaging/firebase_messaging/macos/firebase_messaging/Package.swift b/packages/firebase_messaging/firebase_messaging/macos/firebase_messaging/Package.swift
@@ -114,6 +114,7 @@ let package = Package(
       ],
       cSettings: [
         .headerSearchPath("include"),
+        .define("SWIFT_PACKAGE"),
         .define("LIBRARY_VERSION", to: "\"\(library_version)\""),
         .define("LIBRARY_NAME", to: "\"flutter-fire-fcm\""),
       ]

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,7 @@ let package = Package(`
`108`	`108`	`cSettings: [`
`109`	`109`	`.headerSearchPath("include/cloud_firestore/Private"),`
`110`	`110`	`.headerSearchPath("include/cloud_firestore/Public"),`
	`111`	`+ .define("SWIFT_PACKAGE"),`
`111`	`112`	`.define("LIBRARY_VERSION", to: "\"\(library_version)\""),`
`112`	`113`	`.define("LIBRARY_NAME", to: "\"flutter-fire-fst\""),`
`113`	`114`	`]`
Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,7 @@ let package = Package(`
`107`	`107`	`],`
`108`	`108`	`cSettings: [`
`109`	`109`	`.headerSearchPath("include"),`
	`110`	`+ .define("SWIFT_PACKAGE"),`
`110`	`111`	`.define("LIBRARY_VERSION", to: "\"\(library_version)\""),`
`111`	`112`	`.define("LIBRARY_NAME", to: "\"flutter-fire-appcheck\""),`
`112`	`113`	`]`
Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,7 @@ let package = Package(`
`112`	`112`	`],`
`113`	`113`	`cSettings: [`
`114`	`114`	`.headerSearchPath("include"),`
	`115`	`+ .define("SWIFT_PACKAGE"),`
`115`	`116`	`.define("LIBRARY_VERSION", to: "\"\(library_version)\""),`
`116`	`117`	`.define("LIBRARY_NAME", to: "\"flutter-fire-cls\""),`
`117`	`118`	`]`
Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,7 @@ let package = Package(`
`113`	`113`	`],`
`114`	`114`	`cSettings: [`
`115`	`115`	`.headerSearchPath("include"),`
	`116`	`+ .define("SWIFT_PACKAGE"),`
`116`	`117`	`.define("LIBRARY_VERSION", to: "\"\(library_version)\""),`
`117`	`118`	`.define("LIBRARY_NAME", to: "\"flutter-fire-fiam\""),`
`118`	`119`	`]`