fix: ios firestore refs

Author: MichaelVerdon

Package.swift

@@ -36,11 +36,7 @@ let package = Package(
       dependencies: [
         .product(name: "FirebaseInstallations", package: "firebase-ios-sdk"),
       ],
-      path: "packages/firebase_core/firebase_core/ios/firebase_core/Sources/firebase_core",
-      swiftSettings: [
-        .define("LIBRARY_VERSION", to: firebase_core_version),
-        .define("LIBRARY_NAME", to: "flutter-fire-core"),
-      ]
+      path: "packages/firebase_core/firebase_core/ios/firebase_core/Sources/firebase_core"
     ),
   ]
 )

packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTDocumentSnapshotStreamHandler.m

@@ -47,7 +47,7 @@ - (FlutterError *_Nullable)onListenWithArguments:(id _Nullable)arguments
         events([FLTFirebasePluginHelper createFlutterErrorWithCode:code
                                                            message:message
                                                    optionalDetails:details
-                                                andOptionalNSError:error]);
+                                                    andOptionalError:error]);
       });
     } else {
       dispatch_async(dispatch_get_main_queue(), ^{

packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTFirebaseFirestoreWriter.m

@@ -4,6 +4,7 @@
 
 @import FirebaseFirestore;
 @import FirebaseCore;
+@import firebase_core;
 
 #import "include/cloud_firestore/Private/FLTFirebaseFirestoreWriter.h"
 #import "include/cloud_firestore/Private/FLTFirebaseFirestoreUtils.h"
@@ -39,7 +40,8 @@ - (void)writeValue:(id)value {
   } else if ([value isKindOfClass:[FIRDocumentReference class]]) {
     FIRDocumentReference *document = value;
     NSString *documentPath = [document path];
-    NSString *appName = [FLTFirebasePlugin firebaseAppNameFromIosName:document.firestore.app.name];
+    NSString *appName =
+        [FLTFirebasePluginHelper firebaseAppNameFromIosName:document.firestore.app.name];
     [self writeByte:FirestoreDataTypeDocumentReference];
     [self writeValue:appName];
     [self writeValue:documentPath];

packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTLoadBundleStreamHandler.m

@@ -51,7 +51,7 @@ - (FlutterError *_Nullable)onListenWithArguments:(id _Nullable)arguments
             events([FLTFirebasePluginHelper createFlutterErrorWithCode:code
                                                                message:message
                                                        optionalDetails:details
-                                                    andOptionalNSError:error]);
+                                                        andOptionalError:error]);
           });
         }
       }];

packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTQuerySnapshotStreamHandler.m

@@ -57,7 +57,7 @@ - (FlutterError *_Nullable)onListenWithArguments:(id _Nullable)arguments
         events([FLTFirebasePluginHelper createFlutterErrorWithCode:code
                                                            message:message
                                                    optionalDetails:details
-                                                andOptionalNSError:error]);
+                                                    andOptionalError:error]);
       });
     } else {
       dispatch_async(dispatch_get_main_queue(), ^{

packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTTransactionStreamHandler.m

@@ -4,6 +4,7 @@
 
 @import FirebaseFirestore;
 @import firebase_core;
+@import FirebaseCore;
 
 #import "include/cloud_firestore/Private/FLTFirebaseFirestoreUtils.h"
 #import "include/cloud_firestore/Private/FLTTransactionStreamHandler.h"
@@ -51,8 +52,9 @@ - (FlutterError *_Nullable)onListenWithArguments:(id _Nullable)arguments
     strongSelf.started(transaction);
 
     dispatch_async(dispatch_get_main_queue(), ^{
-      events(
-          @{@"appName" : [FLTFirebasePlugin firebaseAppNameFromIosName:self.firestore.app.name]});
+      events(@{
+        @"appName" : [FLTFirebasePluginHelper firebaseAppNameFromIosName:self.firestore.app.name]
+      });
     });
 
     long timedOut = dispatch_semaphore_wait(

packages/firebase_core/firebase_core/ios/firebase_core/Package.swift

@@ -100,10 +100,6 @@ let package = Package(
       ],
       resources: [
         .process("Resources"),
-      ],
-      swiftSettings: [
-        .define("LIBRARY_VERSION", to: library_version_string),
-        .define("LIBRARY_NAME", to: "flutter-fire-core"),
       ]
     ),
   ]

packages/firebase_core/firebase_core/macos/firebase_core/Package.swift

@@ -102,10 +102,6 @@ let package = Package(
       ],
       resources: [
         .process("Resources"),
-      ],
-      swiftSettings: [
-        .define("LIBRARY_VERSION", to: library_version_string),
-        .define("LIBRARY_NAME", to: "flutter-fire-core"),
       ]
     ),
   ]