Revert "[Firestore] Consolidate Firestore and FirestoreSwift (#11806)" (#11939)

ncooke3 · web-flow · commit 0c8d1433b84e · 2023-10-13T22:01:34.000Z
diff --git a/FirebaseFirestore.podspec b/FirebaseFirestore.podspec
@@ -51,7 +51,6 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
     'Firestore/core/include/**/*.{cc,mm}',
     'Firestore/core/src/**/*.{cc,mm}',
     'FirebaseAuth/Interop/*.h',
-    'Firestore/Swift/Source/**/*.swift',
   ]
 
   # Internal headers that aren't necessarily globally unique. Most C++ internal
@@ -90,8 +89,6 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
 
   s.dependency 'FirebaseAppCheckInterop', '~> 10.17'
   s.dependency 'FirebaseCore', '~> 10.0'
-  s.dependency 'FirebaseCoreExtension', '~> 10.0'
-  s.dependency 'FirebaseSharedSwift', '~> 10.0'
 
   abseil_version = '~> 1.20220623.0'
   s.dependency 'abseil/algorithm', abseil_version
@@ -114,7 +111,6 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
   s.library = 'c++'
   s.pod_target_xcconfig = {
     'CLANG_CXX_LANGUAGE_STANDARD' => 'c++14',
-    'CLANG_CXX_LIBRARY' => 'libc++',
     'GCC_C_LANGUAGE_STANDARD' => 'c99',
     'GCC_PREPROCESSOR_DEFINITIONS' =>
       "FIRFirestore_VERSION=#{s.version} " +
diff --git a/FirebaseFirestoreSwift.podspec b/FirebaseFirestoreSwift.podspec
@@ -31,9 +31,12 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
 
   s.requires_arc            = true
   s.source_files = [
-    'FirebaseFirestoreSwift/Sources/FirebaseFirestoreSwift.swift'
+    'Firestore/Swift/Source/**/*.swift',
   ]
 
-  s.dependency 'FirebaseFirestore', '~> 10.17'
+  s.dependency 'FirebaseCore', '~> 10.0'
+  s.dependency 'FirebaseCoreExtension', '~> 10.0'
+  s.dependency 'FirebaseFirestore', '~> 10.0'
+  s.dependency 'FirebaseSharedSwift', '~> 10.0'
 
 end
diff --git a/FirebaseFirestoreSwift/Sources/FirebaseFirestoreSwift.swift b/FirebaseFirestoreSwift/Sources/FirebaseFirestoreSwift.swift
diff --git a/Firestore/CHANGELOG.md b/Firestore/CHANGELOG.md
@@ -1,9 +1,3 @@
-# Unreleased
-- [feature] The `FirebaseFirestore` module now contains Firebase Firestore's
-  Swift-only APIs that were previously only available via the
-  `FirebaseFirestoreSwift` extension SDK. See the
-  `FirebaseFirestoreSwift` release note from this release for more details.
-
 # 10.16.0
 - [fixed] Fixed an issue where Firestore's binary SwiftPM distribution would
   not link properly when building a target for testing. This issue affected
diff --git a/Firestore/Swift/CHANGELOG.md b/Firestore/Swift/CHANGELOG.md
@@ -1,10 +1,3 @@
-# Unreleased
-- [deprecated] All of the public API from `FirebaseFirestoreSwift` can now
-  be accessed through the `FirebaseFirestore` module. Therefore,
-  `FirebaseFirestoreSwift` has been deprecated, and will be removed in a
-  future release. See https://firebase.google.com/docs/ios/swift-migration for
-  migration instructions.
-
 # 10.12.0
 - [added] Added support animations on the `@FirestoreQuery` property wrapper.
 
diff --git a/Firestore/Swift/Source/AsyncAwait/CollectionReference+AsyncAwait.swift b/Firestore/Swift/Source/AsyncAwait/CollectionReference+AsyncAwait.swift
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-#if SWIFT_PACKAGE
-  @_exported import FirebaseFirestoreInternal
-#endif // SWIFT_PACKAGE
+import FirebaseFirestore
 import Foundation
 
 #if compiler(>=5.5.2) && canImport(_Concurrency)
diff --git a/Firestore/Swift/Source/AsyncAwait/Firestore+AsyncAwait.swift b/Firestore/Swift/Source/AsyncAwait/Firestore+AsyncAwait.swift
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-#if SWIFT_PACKAGE
-  @_exported import FirebaseFirestoreInternal
-#endif // SWIFT_PACKAGE
+import FirebaseFirestore
 import Foundation
 
 #if compiler(>=5.5.2) && canImport(_Concurrency)
diff --git a/Firestore/Swift/Source/Codable/CodablePassThroughTypes.swift b/Firestore/Swift/Source/Codable/CodablePassThroughTypes.swift
@@ -16,9 +16,7 @@
 
 import Foundation
 import FirebaseSharedSwift
-#if SWIFT_PACKAGE
-  @_exported import FirebaseFirestoreInternal
-#endif // SWIFT_PACKAGE
+import FirebaseFirestore
 
 internal struct FirestorePassthroughTypes: StructureCodingPassthroughTypeResolver {
   static func isPassthroughType<T>(_ t: T) -> Bool {
diff --git a/Firestore/Swift/Source/Codable/CollectionReference+WriteEncodable.swift b/Firestore/Swift/Source/Codable/CollectionReference+WriteEncodable.swift
@@ -15,9 +15,7 @@
  */
 
 import Foundation
-#if SWIFT_PACKAGE
-  @_exported import FirebaseFirestoreInternal
-#endif // SWIFT_PACKAGE
+import FirebaseFirestore
 
 public extension CollectionReference {
   /// Encodes an instance of `Encodable` and adds a new document to this collection
diff --git a/Firestore/Swift/Source/Codable/DocumentID.swift b/Firestore/Swift/Source/Codable/DocumentID.swift
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-#if SWIFT_PACKAGE
-  @_exported import FirebaseFirestoreInternal
-#endif // SWIFT_PACKAGE
+import FirebaseFirestore
 import FirebaseSharedSwift
 @_implementationOnly import FirebaseCoreExtension
 
diff --git a/Firestore/Swift/Source/Codable/DocumentReference+Codable.swift b/Firestore/Swift/Source/Codable/DocumentReference+Codable.swift
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-#if SWIFT_PACKAGE
-  @_exported import FirebaseFirestoreInternal
-#endif // SWIFT_PACKAGE
+import FirebaseFirestore
 
 /** Mark DocumentReference to conform to Codable. */
 
diff --git a/Firestore/Swift/Source/Codable/DocumentReference+ReadDecodable.swift b/Firestore/Swift/Source/Codable/DocumentReference+ReadDecodable.swift
@@ -15,9 +15,7 @@
  */
 
 import Foundation
-#if SWIFT_PACKAGE
-  @_exported import FirebaseFirestoreInternal
-#endif // SWIFT_PACKAGE
+import FirebaseFirestore
 
 public extension DocumentReference {
   /// Fetches and decodes the document referenced by this `DocumentReference`.
diff --git a/Firestore/Swift/Source/Codable/DocumentReference+WriteEncodable.swift b/Firestore/Swift/Source/Codable/DocumentReference+WriteEncodable.swift
@@ -15,9 +15,7 @@
  */
 
 import Foundation
-#if SWIFT_PACKAGE
-  @_exported import FirebaseFirestoreInternal
-#endif // SWIFT_PACKAGE
+import FirebaseFirestore
 
 public extension DocumentReference {
   /// Encodes an instance of `Encodable` and overwrites the encoded data
diff --git a/Firestore/Swift/Source/Codable/DocumentSnapshot+ReadDecodable.swift b/Firestore/Swift/Source/Codable/DocumentSnapshot+ReadDecodable.swift
@@ -15,9 +15,7 @@
  */
 
 import Foundation
-#if SWIFT_PACKAGE
-  @_exported import FirebaseFirestoreInternal
-#endif // SWIFT_PACKAGE
+import FirebaseFirestore
 
 public extension DocumentSnapshot {
   /// Retrieves all fields in a document and converts them to an instance of
diff --git a/Firestore/Swift/Source/Codable/EncoderDecoder.swift b/Firestore/Swift/Source/Codable/EncoderDecoder.swift
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-#if SWIFT_PACKAGE
-  @_exported import FirebaseFirestoreInternal
-#endif // SWIFT_PACKAGE
+import FirebaseFirestore
 import FirebaseSharedSwift
 import Foundation
 
diff --git a/Firestore/Swift/Source/Codable/ExplicitNull.swift b/Firestore/Swift/Source/Codable/ExplicitNull.swift
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-#if SWIFT_PACKAGE
-  @_exported import FirebaseFirestoreInternal
-#endif // SWIFT_PACKAGE
+import FirebaseFirestore
 
 /// Wraps an `Optional` field in a `Codable` object such that when the field
 /// has a `nil` value it will encode to a null value in Firestore. Normally,
diff --git a/Firestore/Swift/Source/Codable/FieldValue+Encodable.swift b/Firestore/Swift/Source/Codable/FieldValue+Encodable.swift
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-#if SWIFT_PACKAGE
-  @_exported import FirebaseFirestoreInternal
-#endif // SWIFT_PACKAGE
+import FirebaseFirestore
 
 /** Extends FieldValue to conform to Encodable. */
 extension FieldValue: Encodable {
diff --git a/Firestore/Swift/Source/Codable/GeoPoint+Codable.swift b/Firestore/Swift/Source/Codable/GeoPoint+Codable.swift
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-#if SWIFT_PACKAGE
-  @_exported import FirebaseFirestoreInternal
-#endif // SWIFT_PACKAGE
+import FirebaseFirestore
 
 /**
  * A protocol describing the encodable properties of a GeoPoint.
diff --git a/Firestore/Swift/Source/Codable/ServerTimestamp.swift b/Firestore/Swift/Source/Codable/ServerTimestamp.swift
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-#if SWIFT_PACKAGE
-  @_exported import FirebaseFirestoreInternal
-#endif // SWIFT_PACKAGE
+import FirebaseFirestore
 
 /// A type that can initialize itself from a Firestore Timestamp, which makes
 /// it suitable for use with the `@ServerTimestamp` property wrapper.
diff --git a/Firestore/Swift/Source/Codable/Timestamp+Codable.swift b/Firestore/Swift/Source/Codable/Timestamp+Codable.swift
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-#if SWIFT_PACKAGE
-  @_exported import FirebaseFirestoreInternal
-#endif // SWIFT_PACKAGE
+import FirebaseFirestore
 
 /**
  * A protocol describing the encodable properties of a Timestamp.
diff --git a/Firestore/Swift/Source/Codable/TimestampDecodingStrategy.swift b/Firestore/Swift/Source/Codable/TimestampDecodingStrategy.swift
@@ -15,9 +15,7 @@
  */
 
 import Foundation
-#if SWIFT_PACKAGE
-  @_exported import FirebaseFirestoreInternal
-#endif // SWIFT_PACKAGE
+import FirebaseFirestore
 import FirebaseSharedSwift
 
 public extension FirebaseDataDecoder.DateDecodingStrategy {
diff --git a/Firestore/Swift/Source/Codable/TimestampEncodingStrategy.swift b/Firestore/Swift/Source/Codable/TimestampEncodingStrategy.swift
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-#if SWIFT_PACKAGE
-  @_exported import FirebaseFirestoreInternal
-#endif // SWIFT_PACKAGE
+import FirebaseFirestore
 import FirebaseSharedSwift
 import Foundation
 
diff --git a/Firestore/Swift/Source/Codable/Transaction+WriteEncodable.swift b/Firestore/Swift/Source/Codable/Transaction+WriteEncodable.swift
@@ -15,9 +15,7 @@
  */
 
 import Foundation
-#if SWIFT_PACKAGE
-  @_exported import FirebaseFirestoreInternal
-#endif // SWIFT_PACKAGE
+import FirebaseFirestore
 
 public extension Transaction {
   /// Encodes an instance of `Encodable` and overwrites the encoded data
diff --git a/Firestore/Swift/Source/Codable/WriteBatch+WriteEncodable.swift b/Firestore/Swift/Source/Codable/WriteBatch+WriteEncodable.swift
@@ -15,9 +15,7 @@
  */
 
 import Foundation
-#if SWIFT_PACKAGE
-  @_exported import FirebaseFirestoreInternal
-#endif // SWIFT_PACKAGE
+import FirebaseFirestore
 
 public extension WriteBatch {
   /// Encodes an instance of `Encodable` and overwrites the encoded data
diff --git a/Firestore/Swift/Source/PropertyWrapper/FirestoreQuery.swift b/Firestore/Swift/Source/PropertyWrapper/FirestoreQuery.swift
@@ -15,9 +15,7 @@
  */
 
 import SwiftUI
-#if SWIFT_PACKAGE
-  @_exported import FirebaseFirestoreInternal
-#endif // SWIFT_PACKAGE
+import FirebaseFirestore
 
 /// The strategy to use when an error occurs during mapping Firestore documents
 /// to the target type of `FirestoreQuery`.
diff --git a/Firestore/Swift/Source/PropertyWrapper/FirestoreQueryObservable.swift b/Firestore/Swift/Source/PropertyWrapper/FirestoreQueryObservable.swift
@@ -15,9 +15,7 @@
  */
 
 import SwiftUI
-#if SWIFT_PACKAGE
-  @_exported import FirebaseFirestoreInternal
-#endif // SWIFT_PACKAGE
+import FirebaseFirestore
 
 @available(iOS 14.0, macOS 11.0, macCatalyst 14.0, tvOS 14.0, watchOS 7.0, *)
 internal class FirestoreQueryObservable<T>: ObservableObject {
diff --git a/Firestore/Swift/Source/PropertyWrapper/QueryPredicate.swift b/Firestore/Swift/Source/PropertyWrapper/QueryPredicate.swift
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-#if SWIFT_PACKAGE
-  @_exported import FirebaseFirestoreInternal
-#endif // SWIFT_PACKAGE
+import FirebaseFirestore
 
 /// Query predicates that can be used to filter results fetched by `FirestoreQuery`.
 ///
diff --git a/Firestore/Swift/Source/SPMSwiftHeaderWorkaround.swift b/Firestore/Swift/Source/SPMSwiftHeaderWorkaround.swift
diff --git a/Package.swift b/Package.swift
diff --git a/ReleaseTooling/Sources/FirebaseManifest/FirebaseManifest.swift b/ReleaseTooling/Sources/FirebaseManifest/FirebaseManifest.swift
