[Firestore] Consolidate Firestore and FirestoreSwift (#11806)

Author: ncooke3

FirebaseFirestore.podspec

@@ -51,6 +51,7 @@ 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
@@ -89,6 +90,8 @@ 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
@@ -111,6 +114,7 @@ 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} " +

FirebaseFirestoreSwift.podspec

@@ -31,12 +31,9 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
 
   s.requires_arc            = true
   s.source_files = [
-    'Firestore/Swift/Source/**/*.swift',
+    'FirebaseFirestoreSwift/Sources/FirebaseFirestoreSwift.swift'
   ]
 
-  s.dependency 'FirebaseCore', '~> 10.0'
-  s.dependency 'FirebaseCoreExtension', '~> 10.0'
-  s.dependency 'FirebaseFirestore', '~> 10.0'
-  s.dependency 'FirebaseSharedSwift', '~> 10.0'
+  s.dependency 'FirebaseFirestore', '~> 10.17'
 
 end

FirebaseFirestoreSwift/Sources/FirebaseFirestoreSwift.swift

@@ -0,0 +1,30 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#warning(
+  "All of the public API from `FirebaseFirestoreSwift` can now be accessed through the `FirebaseFirestore` module. Therefore, the `FirebaseFirestoreSwift` module is deprecated and will be removed in the future. See https://firebase.google.com/docs/ios/swift-migration for migration instructions."
+)
+
+// The `@_exported` is needed to prevent breaking clients that are using
+// types prefixed with the `FirebaseFirestoreSwift` namespace.
+@_exported import enum FirebaseFirestore.DecodingFailureStrategy
+@_exported import struct FirebaseFirestore.DocumentID
+@_exported import protocol FirebaseFirestore.DocumentIDWrappable
+@_exported import struct FirebaseFirestore.ExplicitNull
+@_exported import enum FirebaseFirestore.FirestoreDecodingError
+@_exported import enum FirebaseFirestore.FirestoreEncodingError
+@_exported import struct FirebaseFirestore.FirestoreQuery
+@_exported import enum FirebaseFirestore.QueryPredicate
+@_exported import struct FirebaseFirestore.ServerTimestamp
+@_exported import protocol FirebaseFirestore.ServerTimestampWrappable

Firestore/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 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

Firestore/Swift/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 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.
 

Firestore/Swift/Source/AsyncAwait/CollectionReference+AsyncAwait.swift

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-import FirebaseFirestore
+#if SWIFT_PACKAGE
+  @_exported import FirebaseFirestoreInternal
+#endif // SWIFT_PACKAGE
 import Foundation
 
 #if compiler(>=5.5.2) && canImport(_Concurrency)

Firestore/Swift/Source/AsyncAwait/Firestore+AsyncAwait.swift

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-import FirebaseFirestore
+#if SWIFT_PACKAGE
+  @_exported import FirebaseFirestoreInternal
+#endif // SWIFT_PACKAGE
 import Foundation
 
 #if compiler(>=5.5.2) && canImport(_Concurrency)

Firestore/Swift/Source/Codable/CodablePassThroughTypes.swift

@@ -16,7 +16,9 @@
 
 import Foundation
 import FirebaseSharedSwift
-import FirebaseFirestore
+#if SWIFT_PACKAGE
+  @_exported import FirebaseFirestoreInternal
+#endif // SWIFT_PACKAGE
 
 internal struct FirestorePassthroughTypes: StructureCodingPassthroughTypeResolver {
   static func isPassthroughType<T>(_ t: T) -> Bool {

Firestore/Swift/Source/Codable/CollectionReference+WriteEncodable.swift

@@ -15,7 +15,9 @@
  */
 
 import Foundation
-import FirebaseFirestore
+#if SWIFT_PACKAGE
+  @_exported import FirebaseFirestoreInternal
+#endif // SWIFT_PACKAGE
 
 public extension CollectionReference {
   /// Encodes an instance of `Encodable` and adds a new document to this collection

Firestore/Swift/Source/Codable/DocumentID.swift

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-import FirebaseFirestore
+#if SWIFT_PACKAGE
+  @_exported import FirebaseFirestoreInternal
+#endif // SWIFT_PACKAGE
 import FirebaseSharedSwift
 @_implementationOnly import FirebaseCoreExtension