consolidate public headers into one place

wu-hui · wu-hui · commit 1eef3c2a549f · 2025-01-29T13:20:06.000-05:00
diff --git a/Firestore/core/src/api/FIRCallbackWrapper.h b/Firestore/core/src/api/FIRCallbackWrapper.h
diff --git a/Firestore/core/src/api/FIRCallbackWrapper.mm b/Firestore/core/src/api/FIRCallbackWrapper.mm
@@ -20,8 +20,8 @@
 #include <utility>
 #include <vector>
 
-#include "Firestore/core/interfaceForSwift/api/pipeline.h"
-#include "Firestore/core/interfaceForSwift/api/pipeline_result.h"
+#include "Firestore/core/src/api/pipeline.h"
+#include "Firestore/core/src/api/pipeline_result.h"
 #include "Firestore/core/src/core/event_listener.h"
 #include "Firestore/core/src/util/error_apple.h"
 #include "Firestore/core/src/util/statusor.h"
diff --git a/Firestore/core/src/api/FirebaseFirestoreCpp.h b/Firestore/core/src/api/FirebaseFirestoreCpp.h
@@ -17,11 +17,12 @@
 #ifndef FIRESTORE_CORE_INTERFACEFORSWIFT_API_FIREBASEFIRESTORECPP_H_
 #define FIRESTORE_CORE_INTERFACEFORSWIFT_API_FIREBASEFIRESTORECPP_H_
 
-#import "Firestore/core/interfaceForSwift/api/collection_stage.h"
-#import "Firestore/core/interfaceForSwift/api/firestore_pipeline.h"
-#import "Firestore/core/interfaceForSwift/api/pipeline.h"
-#import "Firestore/core/interfaceForSwift/api/pipeline_result.h"
-#import "Firestore/core/interfaceForSwift/api/pipeline_source.h"
-#import "Firestore/core/interfaceForSwift/api/stage.h"
+#import "Firestore/core/src/api/FIRCallbackWrapper.h"
+#import "Firestore/core/src/api/collection_stage.h"
+#import "Firestore/core/src/api/firestore_pipeline.h"
+#import "Firestore/core/src/api/pipeline.h"
+#import "Firestore/core/src/api/pipeline_result.h"
+#import "Firestore/core/src/api/pipeline_source.h"
+#import "Firestore/core/src/api/stage.h"
 
 #endif  // FIRESTORE_CORE_INTERFACEFORSWIFT_API_FIREBASEFIRESTORECPP_H_
diff --git a/Firestore/core/src/api/collection_stage.cc b/Firestore/core/src/api/collection_stage.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "Firestore/core/interfaceForSwift/api/collection_stage.h"
+#include "Firestore/core/src/api/collection_stage.h"
 #include <iostream>
 
 namespace firebase {
diff --git a/Firestore/core/src/api/collection_stage.h b/Firestore/core/src/api/collection_stage.h
@@ -16,7 +16,7 @@
 #define FIRESTORE_CORE_INTERFACEFORSWIFT_API_COLLECTION_STAGE_H_
 
 #include <string>
-#include "Firestore/core/interfaceForSwift/api/stage.h"
+#include "Firestore/core/src/api/stage.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/Firestore/core/src/api/firestore.h b/Firestore/core/src/api/firestore.h
@@ -21,9 +21,9 @@
 #include <mutex>  // NOLINT(build/c++11)
 #include <string>
 
-#include "Firestore/core/interfaceForSwift/api/pipeline_source.h"
 #include "Firestore/core/src/api/api_fwd.h"
 #include "Firestore/core/src/api/load_bundle_task.h"
+#include "Firestore/core/src/api/pipeline_source.h"
 #include "Firestore/core/src/api/settings.h"
 #include "Firestore/core/src/core/core_fwd.h"
 #include "Firestore/core/src/credentials/credentials_fwd.h"
diff --git a/Firestore/core/src/api/firestore_pipeline.cc b/Firestore/core/src/api/firestore_pipeline.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "Firestore/core/interfaceForSwift/api/firestore_pipeline.h"
+#include "Firestore/core/src/api/firestore_pipeline.h"
 
 #include <memory>
 
diff --git a/Firestore/core/src/api/firestore_pipeline.h b/Firestore/core/src/api/firestore_pipeline.h
@@ -17,7 +17,7 @@
 
 #include <memory>
 
-#include "Firestore/core/interfaceForSwift/api/pipeline_source.h"
+#include "Firestore/core/src/api/pipeline_source.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/Firestore/core/src/api/pipeline.cc b/Firestore/core/src/api/pipeline.cc
@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "Firestore/core/interfaceForSwift/api/pipeline.h"
+#include "Firestore/core/src/api/pipeline.h"
 
 #include <future>  // NOLINT(build/c++11)
 #include <memory>
 
 #include "Firestore/core/include/firebase/firestore/timestamp.h"
-#include "Firestore/core/interfaceForSwift/api/pipeline_result.h"
 #include "Firestore/core/src/api/firestore.h"
 #include "Firestore/core/src/api/listener_registration.h"
+#include "Firestore/core/src/api/pipeline_result.h"
 #include "Firestore/core/src/api/source.h"
 #include "Firestore/core/src/core/event_listener.h"
 #include "Firestore/core/src/core/listen_options.h"
diff --git a/Firestore/core/src/api/pipeline.h b/Firestore/core/src/api/pipeline.h
@@ -18,8 +18,8 @@
 #include <functional>
 #include <memory>
 #include <vector>
-#include "Firestore/core/interfaceForSwift/api/pipeline_result.h"
-#include "Firestore/core/interfaceForSwift/api/stage.h"
+#include "Firestore/core/src/api/pipeline_result.h"
+#include "Firestore/core/src/api/stage.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/Firestore/core/src/api/pipeline_result.cc b/Firestore/core/src/api/pipeline_result.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "Firestore/core/interfaceForSwift/api/pipeline_result.h"
+#include "Firestore/core/src/api/pipeline_result.h"
 #include "Firestore/core/include/firebase/firestore/timestamp.h"
 
 namespace firebase {
diff --git a/Firestore/core/src/api/pipeline_result.h b/Firestore/core/src/api/pipeline_result.h
diff --git a/Firestore/core/src/api/pipeline_source.cc b/Firestore/core/src/api/pipeline_source.cc
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "Firestore/core/interfaceForSwift/api/pipeline_source.h"
+#include "Firestore/core/src/api/pipeline_source.h"
 
 #include <string>
 
-#include "Firestore/core/interfaceForSwift/api/collection_stage.h"
+#include "Firestore/core/src/api/collection_stage.h"
 #include "Firestore/core/src/api/document_reference.h"
 #include "Firestore/core/src/api/firestore.h"
 
diff --git a/Firestore/core/src/api/pipeline_source.h b/Firestore/core/src/api/pipeline_source.h
@@ -19,7 +19,7 @@
 #include <string>
 #include <vector>
 
-#include "Firestore/core/interfaceForSwift/api/pipeline.h"
+#include "Firestore/core/src/api/pipeline.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/Firestore/core/src/api/stage.cc b/Firestore/core/src/api/stage.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "Firestore/core/interfaceForSwift/api/stage.h"
+#include "Firestore/core/src/api/stage.h"
 
 namespace firebase {
 namespace firestore {
diff --git a/Firestore/core/src/api/stage.h b/Firestore/core/src/api/stage.h
diff --git a/Package.swift b/Package.swift
@@ -1353,19 +1353,16 @@ func abseilDependency() -> Package.Dependency {
   if ProcessInfo.processInfo.environment["FIREBASE_SOURCE_FIRESTORE"] != nil {
     packageInfo = (
       "https://github.com/firebase/abseil-cpp-SwiftPM.git",
-      "0.20240722.0" ..< "0.20240723.0"
+      "0.20240722.2" ..< "0.20240723.0"
     )
-    // return .package(url: packageInfo.url, packageInfo.range)
-    return .package(name: "abseil-cpp-SwiftPM",
-                    path: "/Users/wuandy/projects/abseil-cpp-SwiftPM")
   } else {
     packageInfo = (
       "https://github.com/google/abseil-cpp-binary.git",
       "1.2024011602.0" ..< "1.2024011700.0"
     )
-    return .package(url: packageInfo.url, packageInfo.range)
   }
 
+  return .package(url: packageInfo.url, packageInfo.range)
 }
 
 func grpcDependency() -> Package.Dependency {
@@ -1479,7 +1476,6 @@ func firestoreTargets() -> [Target] {
           "core/CMakeLists.txt",
           "core/src/util/config_detected.h.in",
           "core/test/",
-          "core/interfaceForSwift/",
           "fuzzing/",
           "test.sh",
           // Swift PM doesn't recognize hpp files, so we're relying on search paths
@@ -1497,7 +1493,7 @@ func firestoreTargets() -> [Target] {
           "core/include/",
           "core/src",
         ],
-        publicHeadersPath: "core/interfaceForSwift",
+        publicHeadersPath: "core/src/api",
         cSettings: [
           .headerSearchPath("../"),
           .headerSearchPath("Protos/nanopb"),
