working version of firestore and core

firebase · Oct 22, 2024 · eee275f · eee275f
1 parent d83fd50
commit eee275f
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 11 deletions.
diff --git a/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Package.swift b/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Package.swift
@@ -75,15 +75,15 @@ let package = Package(
     // .package(name:"flutterfire", path: "../../../../.."),
     // TODO - this needs a version instead
     // This isn't working
-    .package(url:"https://github.com/russellwheatley/test-flutterfire", exact: "0.0.19"),
+    .package(url:"https://github.com/russellwheatley/test-flutterfire", exact: "0.0.24"),
   ],
   targets: [
     .target(
       name: "cloud_firestore",
       dependencies: [
         .product(name: "FirebaseFirestore", package: "firebase-ios-sdk"),
         // Wrapper dependency
-        .product(name: "firebase-core-wrapper", package: "test-flutterfire")
+        .product(name: "firebase-core-shared", package: "test-flutterfire")
       ],
       resources: [
         .process("Resources"),

diff --git a/..._firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTDocumentSnapshotStreamHandler.m b/..._firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTDocumentSnapshotStreamHandler.m
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 @import FirebaseFirestore;
-#import <firebase_core/FLTFirebasePluginRegistry.h>
+#import <FLTFirebasePluginRegistry.h>
 
 #import "include/cloud_firestore/Private/FLTDocumentSnapshotStreamHandler.h"
 #import "include/cloud_firestore/Private/FLTFirebaseFirestoreUtils.h"

diff --git a/.../cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTFirebaseFirestorePlugin.m b/.../cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTFirebaseFirestorePlugin.m
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 @import FirebaseFirestore;
-#import <firebase_core/FLTFirebasePluginRegistry.h>
+#import <FLTFirebasePluginRegistry.h>
 
 #import <TargetConditionals.h>
 #import "FirebaseFirestoreInternal/FIRPersistentCacheIndexManager.h"

diff --git a/.../cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTFirebaseFirestoreReader.m b/.../cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTFirebaseFirestoreReader.m
@@ -3,8 +3,9 @@
 // found in the LICENSE file.
 
 @import FirebaseFirestore;
-#import <firebase_core/FLTFirebasePlugin.h>
+@import FirebaseCore;
 
+#import <FLTFirebasePlugin.h>
 #import "include/cloud_firestore/Private/FLTFirebaseFirestoreReader.h"
 #import "include/cloud_firestore/Private/FLTFirebaseFirestoreUtils.h"
 

diff --git a/.../cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTFirebaseFirestoreWriter.m b/.../cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTFirebaseFirestoreWriter.m
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 @import FirebaseFirestore;
-#import <firebase_core/FLTFirebasePlugin.h>
+@import FirebaseCore;
 
 #import "include/cloud_firestore/Private/FLTFirebaseFirestoreUtils.h"
 #import "include/cloud_firestore/Private/FLTFirebaseFirestoreWriter.h"

diff --git a/.../cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTLoadBundleStreamHandler.m b/.../cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTLoadBundleStreamHandler.m
@@ -10,7 +10,7 @@
 //
 
 @import FirebaseFirestore;
-#import <firebase_core/FLTFirebasePluginRegistry.h>
+#import <FLTFirebasePluginRegistry.h>
 
 #import "include/cloud_firestore/Private/FLTFirebaseFirestoreUtils.h"
 #import "include/cloud_firestore/Private/FLTLoadBundleStreamHandler.h"

diff --git a/...oud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTQuerySnapshotStreamHandler.m b/...oud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTQuerySnapshotStreamHandler.m
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 @import FirebaseFirestore;
-#import <firebase_core/FLTFirebasePluginRegistry.h>
+#import <FLTFirebasePluginRegistry.h>
 
 #import "include/cloud_firestore/Private/FLTFirebaseFirestoreUtils.h"
 #import "include/cloud_firestore/Private/FLTQuerySnapshotStreamHandler.h"

diff --git a/...d_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTSnapshotsInSyncStreamHandler.m b/...d_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTSnapshotsInSyncStreamHandler.m
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 @import FirebaseFirestore;
-#import <firebase_core/FLTFirebasePluginRegistry.h>
+#import <FLTFirebasePluginRegistry.h>
 
 #import "include/cloud_firestore/Private/FLTFirebaseFirestoreUtils.h"
 #import "include/cloud_firestore/Private/FLTSnapshotsInSyncStreamHandler.h"

diff --git a/...cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTTransactionStreamHandler.m b/...cloud_firestore/ios/cloud_firestore/Sources/cloud_firestore/FLTTransactionStreamHandler.m
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 @import FirebaseFirestore;
-#import <firebase_core/FLTFirebasePluginRegistry.h>
+#import <FLTFirebasePluginRegistry.h>
 
 #import "include/cloud_firestore/Private/FLTFirebaseFirestoreUtils.h"
 #import "include/cloud_firestore/Private/FLTTransactionStreamHandler.h"

diff --git a/...store/Sources/cloud_firestore/include/cloud_firestore/Public/FLTFirebaseFirestorePlugin.h b/...store/Sources/cloud_firestore/include/cloud_firestore/Public/FLTFirebaseFirestorePlugin.h
@@ -10,7 +10,7 @@
 #endif
 
 #import <Foundation/Foundation.h>
-#import <firebase_core/FLTFirebasePlugin.h>
+#import <FLTFirebasePlugin.h>
 #import "FirestoreMessages.g.h"
 
 @interface FLTFirebaseFirestorePlugin

diff --git a/packages/firebase_core/firebase_core/ios/firebase_core/Package.swift b/packages/firebase_core/firebase_core/ios/firebase_core/Package.swift
@@ -89,13 +89,22 @@ let package = Package(
   ],
   dependencies: [
     .package(url: "https://github.com/firebase/firebase-ios-sdk", from: firebase_sdk_version),
+    .package(url:"https://github.com/russellwheatley/test-flutterfire", exact: "0.0.24"),
   ],
   targets: [
     .target(
       name: "firebase_core",
       dependencies: [
         // No product for firebase-core so we pull in the smallest one
         .product(name: "FirebaseInstallations", package: "firebase-ios-sdk"),
+        .product(name: "firebase-core-shared", package: "test-flutterfire")
+      ],
+      exclude: [
+        // These are now pulled in as a remote dependency from FlutterFire repo
+        "FLTFirebasePlugin.m",
+        "FLTFirebasePluginRegistry.m",
+        "include/firebase_core/FLTFirebasePlugin.h",
+        "include/firebase_core/FLTFirebasePluginRegistry.h"
       ],
       resources: [
         .process("Resources"),