Firestore - new public header structure (#6197)

FirebaseFirestore.podspec

@@ -26,7 +26,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
 
   s.source_files = [
     'FirebaseCore/Sources/Private/*.h',
-    'Firestore/Source/Public/*.h',
+    'Firestore/Source/Public/FirebaseFirestore/*.h',
     'Firestore/Source/**/*.{m,mm}',
     'Firestore/Protos/nanopb/**/*.cc',
     'Firestore/core/include/**/*.{cc,mm}',
@@ -56,7 +56,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
     'Firestore/core/src/util/log_stdio.cc',
     'Firestore/core/src/util/secure_random_openssl.cc'
   ]
-  s.public_header_files = 'Firestore/Source/Public/*.h'
+  s.public_header_files = 'Firestore/Source/Public/FirebaseFirestore/*.h'
 
   s.dependency 'FirebaseCore', '~> 6.8'
 
@@ -89,7 +89,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
       'PB_FIELD_32BIT=1 PB_NO_PACKED_STRUCTS=1 PB_ENABLE_MALLOC=1',
     'HEADER_SEARCH_PATHS' =>
       '"${PODS_TARGET_SRCROOT}" ' +
-      '"${PODS_TARGET_SRCROOT}/Firestore/Source/Public" ' +
+      '"${PODS_TARGET_SRCROOT}/Firestore/Source/Public/FirebaseFirestore" ' +
       '"${PODS_ROOT}/nanopb" ' +
       '"${PODS_TARGET_SRCROOT}/Firestore/Protos/nanopb"'
   }

Firestore/Example/Tests/Util/FSTEventAccumulator.mm

@@ -19,9 +19,9 @@
 #import <XCTest/XCTest.h>
 
 #import "Firestore/Example/Tests/Util/XCTestCase+Await.h"
-#import "Firestore/Source/Public/FIRDocumentSnapshot.h"
-#import "Firestore/Source/Public/FIRQuerySnapshot.h"
-#import "Firestore/Source/Public/FIRSnapshotMetadata.h"
+#import "Firestore/Source/Public/FirebaseFirestore/FIRDocumentSnapshot.h"
+#import "Firestore/Source/Public/FirebaseFirestore/FIRQuerySnapshot.h"
+#import "Firestore/Source/Public/FirebaseFirestore/FIRSnapshotMetadata.h"
 
 #include "Firestore/core/src/util/hard_assert.h"
 

Firestore/Source/CMakeLists.txt

@@ -16,7 +16,7 @@ if(NOT APPLE)
   return()
 endif()
 
-file(GLOB headers Public/*.h)
+file(GLOB headers Public/FirebaseFirestore/*.h)
 file(GLOB sources API/*.h API/*.m API/*.mm)
 
 firebase_ios_add_framework(FirebaseFirestore ${headers} ${sources})

Firestore/core/src/util/error_apple.mm

@@ -21,7 +21,8 @@
 #include "Firestore/core/src/util/status.h"
 #include "Firestore/core/src/util/string_apple.h"
 
-// NB: This is also declared in Firestore/Source/Public/FIRFirestoreErrors.h
+// NB: This is also declared in
+// FirebaseFirestore/Firestore/Source/Public/FIRFirestoreErrors.h
 // NOLINTNEXTLINE: public constant
 FOUNDATION_EXPORT NSString* const FIRFirestoreErrorDomain =
     @"FIRFirestoreErrorDomain";

Package.swift

@@ -475,7 +475,7 @@ let package = Package(
       publicHeadersPath: "Source/Public",
       cSettings: [
         .headerSearchPath("../"),
-        .headerSearchPath("Source/Public"),
+        .headerSearchPath("Source/Public/FirebaseFirestore"),
         .headerSearchPath("Protos/nanopb"),
 
         .define("PB_FIELD_32BIT", to: "1"),

SwiftPMTests/objc-import-test/objc-header.m

@@ -18,8 +18,8 @@
 #import "FirebaseCore/FirebaseCore.h"
 #import "FirebaseCrashlytics/FirebaseCrashlytics.h"
 #import "FirebaseDatabase/FirebaseDatabase.h"
+#import "FirebaseFirestore/FirebaseFirestore.h"
 #import "FirebaseFunctions/FirebaseFunctions.h"
-//#import "FirebaseFirestore/FirebaseFirestore."
 #import "FirebaseInstallations/FirebaseInstallations.h"
 #import "FirebaseRemoteConfig/FirebaseRemoteConfig.h"
 #import "FirebaseStorage/FirebaseStorage.h"
@@ -30,8 +30,8 @@
 #import <FirebaseCore/FirebaseCore.h>
 #import <FirebaseCrashlytics/FirebaseCrashlytics.h>
 #import <FirebaseDatabase/FirebaseDatabase.h>
+#import <FirebaseFirestore/FirebaseFirestore.h>
 #import <FirebaseFunctions/FirebaseFunctions.h>
-//#import <FirebaseFirestore/FirebaseFirestore.>
 #import <FirebaseInstallations/FirebaseInstallations.h>
 #import <FirebaseRemoteConfig/FirebaseRemoteConfig.h>
 #import <FirebaseStorage/FirebaseStorage.h>

scripts/sync_project.rb

@@ -109,7 +109,7 @@ def sync_firestore(test_only)
       '"${PODS_ROOT}/../../.."',
 
       # Make public headers available as "FIRQuery.h"
-      '"${PODS_ROOT}/../../../Firestore/Source/Public"',
+      '"${PODS_ROOT}/../../../Firestore/Source/Public/FirebaseFirestore"',
 
       # Generated protobuf and nanopb output expects to search relative to the
       # output path.