[Database] Consolidate Database and DatabaseSwift

.github/workflows/database.yml

@@ -119,21 +119,23 @@ jobs:
 
     strategy:
       matrix:
+        podspec: [FirebaseDatabase.podspec, FirebaseDatabaseSwift.podspec --allow-warnings]
         target: [ios, tvos, macos, watchos]
     steps:
     - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
     - name: Setup Bundler
       run: scripts/setup_bundler.sh
     - name: Build and test
-      run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseDatabase.podspec --skip-tests --platforms=${{ matrix.target }}
+      run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb ${{ matrix.podspec }} --skip-tests --platforms=${{ matrix.target }}
 
   database-cron-only:
     # Don't run on private repo.
     if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
     runs-on: macos-12
     strategy:
       matrix:
+        podspec: [FirebaseDatabase.podspec, FirebaseDatabaseSwift.podspec --allow-warnings]
         target: [ios, tvos, macos]
         flags: [
           '--skip-tests --use-static-frameworks'
@@ -145,4 +147,4 @@ jobs:
     - name: Setup Bundler
       run: scripts/setup_bundler.sh
     - name: PodLibLint database Cron
-      run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseDatabase.podspec --platforms=${{ matrix.target }} ${{ matrix.flags }}
+      run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb ${{ matrix.podspec }} --platforms=${{ matrix.target }} ${{ matrix.flags }}

FirebaseDatabase.podspec

@@ -37,6 +37,7 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
     base_dir + '**/*.[mh]',
     base_dir + 'third_party/Wrap-leveldb/APLevelDB.mm',
     base_dir + 'third_party/SocketRocket/fbase64.c',
+    'FirebaseDatabase/Swift/Sources/**/*.swift',
     'FirebaseAuth/Interop/*.h',
     'FirebaseAppCheck/Interop/*.h',
     'FirebaseCore/Extension/*.h',
@@ -49,6 +50,7 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
   s.watchos.frameworks = 'CFNetwork', 'Security', 'WatchKit'
   s.dependency 'leveldb-library', '~> 1.22'
   s.dependency 'FirebaseCore', '~> 10.0'
+  s.dependency 'FirebaseSharedSwift', '~> 10.0'
   s.pod_target_xcconfig = {
     'GCC_C_LANGUAGE_STANDARD' => 'c99',
     'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"'

FirebaseDatabase/CHANGELOG.md

@@ -1,3 +1,9 @@
+# Unreleased
+- [feature] The `FirebaseDatabase` module now contains Firebase Database's
+  Swift-only APIs that were previously only available via the
+  `FirebaseDatabaseSwift` extension SDK. See the
+  `FirebaseDatabaseSwift` release note from this release for more details.
+
 # 10.0.0
 - [deprecated] Deprecated `FirebaseDatabase` on watchOS 9 and above.
   watchOS users should instead use the Database REST API directly (#19272).

FirebaseDatabaseSwift/Sources/Codable/DataSnapshot+ReadDecodable.swift → FirebaseDatabase/Swift/Sources/Codable/DataSnapshot+ReadDecodable.swift

@@ -15,7 +15,9 @@
  */
 
 import Foundation
-import FirebaseDatabase
+#if SWIFT_PACKAGE
+  @_exported import FirebaseDatabaseInternal
+#endif // SWIFT_PACKAGE
 import FirebaseSharedSwift
 
 public extension DataSnapshot {

FirebaseDatabaseSwift/Sources/Codable/DatabaseReference+WriteEncodable.swift → FirebaseDatabase/Swift/Sources/Codable/DatabaseReference+WriteEncodable.swift

@@ -15,7 +15,9 @@
  */
 
 import Foundation
-import FirebaseDatabase
+#if SWIFT_PACKAGE
+  @_exported import FirebaseDatabaseInternal
+#endif // SWIFT_PACKAGE
 import FirebaseSharedSwift
 
 public extension DatabaseReference {

FirebaseDatabaseSwift/Sources/Codable/EncoderDecoder.swift → FirebaseDatabase/Swift/Sources/Codable/EncoderDecoder.swift

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-import FirebaseDatabase
+#if SWIFT_PACKAGE
+  @_exported import FirebaseDatabaseInternal
+#endif // SWIFT_PACKAGE
 import FirebaseSharedSwift
 
 public extension Database {

FirebaseDatabaseSwift/Sources/Codable/ServerTimestamp.swift → FirebaseDatabase/Swift/Sources/Codable/ServerTimestamp.swift

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-import FirebaseDatabase
+#if SWIFT_PACKAGE
+  @_exported import FirebaseDatabaseInternal
+#endif // SWIFT_PACKAGE
 
 /// A property wrapper that marks an `Optional<Date>` field to be
 /// populated with a server timestamp. If a `Codable` object being written

FirebaseDatabase/Swift/Sources/SPMSwiftHeaderWorkaround.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.
+
+#if SWIFT_PACKAGE
+  @_exported import FirebaseDatabaseInternal
+
+  // This is a trick to force generate a `FirebaseDatabase-Swift.h`
+  // header that re-exports `FirebaseDatabaseInternal` for Objective-C
+  // clients. It is important for the below code to reference a Remote
+  // Config symbol defined in Objective-C as that will import the symbol's
+  // module (`FirebaseDatabaseInternal`) in the generated header. This
+  // allows Objective-C clients to import Remote Config's Objective-C API
+  // using `@import FirebaseDatabase;`. This API is not needed for Swift
+  // clients and is therefore unavailable in a Swift context.
+  @available(*, unavailable)
+  @objc public extension Database {
+    static var __no_op: () -> Void { {} }
+  }
+#endif // SWIFT_PACKAGE

FirebaseDatabaseSwift.podspec

@@ -28,6 +28,5 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
     'FirebaseDatabaseSwift/Sources/**/*.swift',
   ]
 
-  s.dependency 'FirebaseDatabase', '~> 10.0'
-  s.dependency 'FirebaseSharedSwift', '~> 10.0'
+  s.dependency 'FirebaseDatabase', '~> 10.16'
 end

FirebaseDatabaseSwift/CHANGELOG.md

@@ -1,3 +1,14 @@
+# Unreleased
+- [deprecated] `FirebaseDatabaseSwift` has been deprecated, and will be
+  removed in a future release. All of the public API from
+  `FirebaseDatabaseSwift` can now be accessed through the
+  `FirebaseDatabase` module. To migrate, delete imports of
+  `FirebaseDatabaseSwift` and remove the module as a dependency to your
+  project. If applicable, any APIs namespaced with
+  `FirebaseDatabaseSwift` can now be namespaced with
+  `FirebaseDatabase`. Additionally, if applicable,
+  `@testable import FirebaseDatabaseSwift` should be replaced with
+  `@testable import FirebaseDatabase`.
 # 9.0.0
 - [added] **Breaking change:** `FirebaseDatabaseSwift` has exited beta and is
   now generally available for use.

FirebaseDatabaseSwift/Sources/FirebaseDatabaseSwift.swift

@@ -0,0 +1,28 @@
+// 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("""
+The FirebaseDatabaseSwift module is deprecated and will be removed in
+the future. All of the public API from FirebaseDatabaseSwift can now be
+accessed through the FirebaseDatabase module. To migrate, delete imports
+of FirebaseDatabaseSwift and remove the module as a dependency to your
+project. If applicable, any APIs namespaced with `FirebaseDatabaseSwift`
+can now be namespaced with `FirebaseDatabase`. Additionally, if
+applicable, `@testable import FirebaseDatabaseSwift` should be replaced
+with `@testable import FirebaseDatabase`.
+""")
+
+// The `@_exported` is needed to prevent breaking clients that are using
+// types prefixed with the `FirebaseDatabase` namespace.
+@_exported import struct FirebaseDatabase.ServerTimestamp

Package.swift

@@ -555,7 +555,7 @@ let package = Package(
       ]
     ),
     .target(
-      name: "FirebaseDatabase",
+      name: "FirebaseDatabaseInternal",
       dependencies: [
         "FirebaseCore",
         "leveldb",
@@ -604,9 +604,14 @@ let package = Package(
         .headerSearchPath("../.."),
       ]
     ),
+    .target(
+      name: "FirebaseDatabase",
+      dependencies: ["FirebaseDatabaseInternal", "FirebaseSharedSwift"],
+      path: "FirebaseDatabase/Swift/Sources"
+    ),
     .target(
       name: "FirebaseDatabaseSwift",
-      dependencies: ["FirebaseDatabase", "FirebaseSharedSwift"],
+      dependencies: ["FirebaseDatabase"],
       path: "FirebaseDatabaseSwift/Sources"
     ),
     .testTarget(

ReleaseTooling/Sources/FirebaseManifest/FirebaseManifest.swift

@@ -45,7 +45,7 @@ public let shared = Manifest(
     Pod("FirebaseAuth", zip: true),
     Pod("FirebaseCrashlytics", zip: true),
     Pod("FirebaseDatabase"),
-    Pod("FirebaseDatabaseSwift", zip: true),
+    Pod("FirebaseDatabaseSwift", allowWarnings: true, zip: true),
     Pod("FirebaseDynamicLinks", platforms: ["ios"], zip: true),
     Pod("FirebaseFirestore", allowWarnings: true),
     Pod("FirebaseFirestoreSwift", zip: true),