diff --git a/FirebaseDatabaseSwift/Tests/Codable/ServerValueCodingTests.swift b/FirebaseDatabase/Tests/Unit/Swift/Codable/ServerValueCodingTests.swift similarity index 99% rename from FirebaseDatabaseSwift/Tests/Codable/ServerValueCodingTests.swift rename to FirebaseDatabase/Tests/Unit/Swift/Codable/ServerValueCodingTests.swift index 6593011e41..e9b92a539f 100644 --- a/FirebaseDatabaseSwift/Tests/Codable/ServerValueCodingTests.swift +++ b/FirebaseDatabase/Tests/Unit/Swift/Codable/ServerValueCodingTests.swift @@ -15,7 +15,6 @@ */ import FirebaseDatabase -import FirebaseDatabaseSwift import Foundation import XCTest diff --git a/FirebaseDatabaseSwift.podspec b/FirebaseDatabaseSwift.podspec deleted file mode 100644 index 1701905ec6..0000000000 --- a/FirebaseDatabaseSwift.podspec +++ /dev/null @@ -1,32 +0,0 @@ -Pod::Spec.new do |s| - s.name = 'FirebaseDatabaseSwift' - s.version = '10.19.0' - s.summary = 'Swift Extensions for Firebase Realtime Database' - - s.description = <<-DESC -Simplify your iOS development, grow your user base, and monetize more effectively with Firebase. - DESC - - s.homepage = 'https://developers.google.com/' - s.license = { :type => 'Apache-2.0', :file => 'LICENSE' } - s.authors = 'Google, Inc.' - - s.source = { - :git => 'https://github.com/Firebase/firebase-ios-sdk.git', - :tag => 'CocoaPods-' + s.version.to_s - } - - s.swift_version = '5.9' - s.ios.deployment_target = '13.0' - s.osx.deployment_target = '10.15' - s.tvos.deployment_target = '13.0' - - s.cocoapods_version = '>= 1.12.0' - s.prefix_header_file = false - - s.source_files = [ - 'FirebaseDatabaseSwift/Sources/**/*.swift', - ] - - s.dependency 'FirebaseDatabase', '~> 10.17' -end diff --git a/FirebaseDatabaseSwift/CHANGELOG.md b/FirebaseDatabaseSwift/CHANGELOG.md deleted file mode 100644 index a8eab8e34a..0000000000 --- a/FirebaseDatabaseSwift/CHANGELOG.md +++ /dev/null @@ -1,20 +0,0 @@ -# 10.17.0 -- [deprecated] All of the public API from `FirebaseDatabaseSwift` can now - be accessed through the `FirebaseDatabase` module. Therefore, - `FirebaseDatabaseSwift` has been deprecated, and will be removed in a - future release. See https://firebase.google.com/docs/ios/swift-migration for - migration instructions. - -# 9.0.0 -- [added] **Breaking change:** `FirebaseDatabaseSwift` has exited beta and is - now generally available for use. - -# 8.11.0-beta -- Refactored Codable implementation to share common source with Firebase Functions. This should be - generally transparent with the exception of custom decoder use cases which may need to be updated. (#8854) - -# 8.1.0-beta -- Initial public beta release for Swift Package Manager. - -# 8.0.0-beta -- Initial public beta release for CocoaPods. diff --git a/FirebaseDatabaseSwift/Sources/FirebaseDatabaseSwift.swift b/FirebaseDatabaseSwift/Sources/FirebaseDatabaseSwift.swift deleted file mode 100644 index d1a4125ddd..0000000000 --- a/FirebaseDatabaseSwift/Sources/FirebaseDatabaseSwift.swift +++ /dev/null @@ -1,21 +0,0 @@ -// 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 `FirebaseDatabaseSwift` can now be accessed through the `FirebaseDatabase` module. Therefore, the `FirebaseDatabaseSwift` 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 `FirebaseDatabase` namespace. -@_exported import struct FirebaseDatabase.ServerTimestamp diff --git a/IntegrationTesting/ClientApp/ClientApp.xcodeproj/project.pbxproj b/IntegrationTesting/ClientApp/ClientApp.xcodeproj/project.pbxproj index 6b2732ae37..c910cdfa0f 100644 --- a/IntegrationTesting/ClientApp/ClientApp.xcodeproj/project.pbxproj +++ b/IntegrationTesting/ClientApp/ClientApp.xcodeproj/project.pbxproj @@ -35,7 +35,6 @@ EA7DF58D29EF3326005664A7 /* FirebaseAppDistribution-Beta in Frameworks */ = {isa = PBXBuildFile; platformFilter = ios; productRef = EA7DF58C29EF3326005664A7 /* FirebaseAppDistribution-Beta */; }; EA7DF59329EF3326005664A7 /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = EA7DF59229EF3326005664A7 /* FirebaseCrashlytics */; }; EA7DF59529EF3326005664A7 /* FirebaseDatabase in Frameworks */ = {isa = PBXBuildFile; productRef = EA7DF59429EF3326005664A7 /* FirebaseDatabase */; }; - EA7DF59729EF3326005664A7 /* FirebaseDatabaseSwift in Frameworks */ = {isa = PBXBuildFile; productRef = EA7DF59629EF3326005664A7 /* FirebaseDatabaseSwift */; }; EA7DF59929EF3326005664A7 /* FirebaseDynamicLinks in Frameworks */ = {isa = PBXBuildFile; platformFilter = ios; productRef = EA7DF59829EF3326005664A7 /* FirebaseDynamicLinks */; }; EA7DF59B29EF3326005664A7 /* FirebaseFirestore in Frameworks */ = {isa = PBXBuildFile; productRef = EA7DF59A29EF3326005664A7 /* FirebaseFirestore */; }; EA7DF59D29EF3326005664A7 /* FirebaseFirestoreCombine-Community in Frameworks */ = {isa = PBXBuildFile; productRef = EA7DF59C29EF3326005664A7 /* FirebaseFirestoreCombine-Community */; }; @@ -108,7 +107,6 @@ EA7DF5B329EF3328005664A7 /* FirebaseRemoteConfigSwift in Frameworks */, EA7DF59329EF3326005664A7 /* FirebaseCrashlytics in Frameworks */, EA7DF5A529EF3327005664A7 /* FirebaseInAppMessaging-Beta in Frameworks */, - EA7DF59729EF3326005664A7 /* FirebaseDatabaseSwift in Frameworks */, EA7DF5B729EF3328005664A7 /* FirebaseStorageCombine-Community in Frameworks */, EA7DF5B129EF3328005664A7 /* FirebaseRemoteConfig in Frameworks */, EA7DF5A129EF3327005664A7 /* FirebaseFunctions in Frameworks */, @@ -313,7 +311,6 @@ EA7DF58C29EF3326005664A7 /* FirebaseAppDistribution-Beta */, EA7DF59229EF3326005664A7 /* FirebaseCrashlytics */, EA7DF59429EF3326005664A7 /* FirebaseDatabase */, - EA7DF59629EF3326005664A7 /* FirebaseDatabaseSwift */, EA7DF59829EF3326005664A7 /* FirebaseDynamicLinks */, EA7DF59A29EF3326005664A7 /* FirebaseFirestore */, EA7DF59C29EF3326005664A7 /* FirebaseFirestoreCombine-Community */, @@ -1046,10 +1043,6 @@ isa = XCSwiftPackageProductDependency; productName = FirebaseDatabase; }; - EA7DF59629EF3326005664A7 /* FirebaseDatabaseSwift */ = { - isa = XCSwiftPackageProductDependency; - productName = FirebaseDatabaseSwift; - }; EA7DF59829EF3326005664A7 /* FirebaseDynamicLinks */ = { isa = XCSwiftPackageProductDependency; productName = FirebaseDynamicLinks; diff --git a/IntegrationTesting/ClientApp/Podfile b/IntegrationTesting/ClientApp/Podfile index 29810fab6a..17ed36b129 100644 --- a/IntegrationTesting/ClientApp/Podfile +++ b/IntegrationTesting/ClientApp/Podfile @@ -21,7 +21,6 @@ target 'ClientApp-CocoaPods' do pod 'FirebaseAppDistribution', :path => '../../' pod 'FirebaseCrashlytics', :path => '../../' pod 'FirebaseDatabase', :path => '../../' - pod 'FirebaseDatabaseSwift', :path => '../../' pod 'FirebaseDynamicLinks', :path => '../../' pod 'FirebaseFirestore', :path => '../../' pod 'FirebaseFunctions', :path => '../../' diff --git a/IntegrationTesting/ClientApp/Shared-iOS12+/swift-import-test.swift b/IntegrationTesting/ClientApp/Shared-iOS12+/swift-import-test.swift index 35eacac276..6265ab9db0 100644 --- a/IntegrationTesting/ClientApp/Shared-iOS12+/swift-import-test.swift +++ b/IntegrationTesting/ClientApp/Shared-iOS12+/swift-import-test.swift @@ -28,7 +28,6 @@ import FirebaseAppCheck import FirebaseCore import FirebaseCrashlytics import FirebaseDatabase -import FirebaseDatabaseSwift #if os(iOS) && !targetEnvironment(macCatalyst) import FirebaseDynamicLinks #endif diff --git a/Package.swift b/Package.swift index a220a67d18..e0a352ad5c 100644 --- a/Package.swift +++ b/Package.swift @@ -77,10 +77,6 @@ let package = Package( name: "FirebaseDatabase", targets: ["FirebaseDatabase"] ), - .library( - name: "FirebaseDatabaseSwift", - targets: ["FirebaseDatabaseSwift"] - ), .library( name: "FirebaseDynamicLinks", targets: ["FirebaseDynamicLinksTarget"] @@ -639,16 +635,6 @@ let package = Package( dependencies: ["FirebaseDatabaseInternal", "FirebaseSharedSwift"], path: "FirebaseDatabase/Swift/Sources" ), - .target( - name: "FirebaseDatabaseSwift", - dependencies: ["FirebaseDatabase"], - path: "FirebaseDatabaseSwift/Sources" - ), - .testTarget( - name: "FirebaseDatabaseSwiftTests", - dependencies: ["FirebaseDatabase", "FirebaseDatabaseSwift"], - path: "FirebaseDatabaseSwift/Tests/" - ), .target( name: "FirebaseSharedSwift", path: "FirebaseSharedSwift/Sources", diff --git a/scripts/api_diff_report/icore_module.py b/scripts/api_diff_report/icore_module.py index 3c782b23e2..e489db5c44 100644 --- a/scripts/api_diff_report/icore_module.py +++ b/scripts/api_diff_report/icore_module.py @@ -31,7 +31,6 @@ MODULE_LIST = [ 'FirebaseCore', 'FirebaseCrashlytics', 'FirebaseDatabase', - 'FirebaseDatabaseSwift', 'FirebaseDynamicLinks', 'FirebaseFirestore', 'FirebaseFirestoreSwift',