diff --git a/Cartfile b/Cartfile index 3566fbf..c4aa479 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,2 @@ -binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" == 8.12.1 -binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseInAppMessagingBinary.json" == 8.12.1 -binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseProtobufBinary.json" == 8.12.1 +binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" ~> 9.0.0 +binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseInAppMessagingBinary.json" ~> 9.0.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 0f4c043..c27aa7b 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,3 +1,2 @@ -binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" "8.12.1" -binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseInAppMessagingBinary.json" "8.12.1" -binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseProtobufBinary.json" "8.12.1" +binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" "9.0.0" +binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseInAppMessagingBinary.json" "9.0.0" diff --git a/Example.swiftpm/Package.resolved b/Example.swiftpm/Package.resolved index 6284e58..ef780fb 100644 --- a/Example.swiftpm/Package.resolved +++ b/Example.swiftpm/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/firebase/abseil-cpp-SwiftPM.git", "state": { "branch": null, - "revision": "fffc3c2729be5747390ad02d5100291a0d9ad26a", - "version": "0.20200225.4" + "revision": "d302de612e3d57c6f4afaf087da18fba8eac72a7", + "version": "0.20220203.1" } }, { @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/firebase/boringssl-SwiftPM.git", "state": { "branch": null, - "revision": "734a8247442fde37df4364c21f6a0085b6a36728", - "version": "0.7.2" + "revision": "79db6516894a932d0ddaff3b05b9da1e4f6c4069", + "version": "0.9.0" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/firebase/firebase-ios-sdk.git", "state": { "branch": null, - "revision": "5344857522053b5d4403ec8173ec0d23200a97ea", - "version": "8.12.1" + "revision": "cfa854c9c1073c4d1b83b20dfcb1ef7ceb85388b", + "version": "9.0.0" } }, { @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/google/GoogleAppMeasurement.git", "state": { "branch": null, - "revision": "9b2f6aca5b4685c45f9f5481f19bee8e7982c538", - "version": "8.9.1" + "revision": "6a3123fab90f3884167990bee9bb30097d99c98c", + "version": "9.0.0" } }, { @@ -51,17 +51,17 @@ "repositoryURL": "https://github.com/google/GoogleUtilities.git", "state": { "branch": null, - "revision": "b3bb0c5551fb3f80ca939829639ab5b093edd14f", - "version": "7.7.0" + "revision": "f4abe56ce62a779e64b525eb133c8fc2a84bbc1f", + "version": "7.7.1" } }, { "package": "gRPC", - "repositoryURL": "https://github.com/firebase/grpc-SwiftPM.git", + "repositoryURL": "https://github.com/grpc/grpc-ios.git", "state": { "branch": null, - "revision": "fb405dd2c7901485f7e158b24e3a0a47e4efd8b5", - "version": "1.28.4" + "revision": "abd2d5a4347efa0454606a788678a5d8ec223738", + "version": "1.44.0-grpc" } }, { @@ -69,8 +69,8 @@ "repositoryURL": "https://github.com/google/gtm-session-fetcher.git", "state": { "branch": null, - "revision": "bc6a19702ac76ac4e488b68148710eb815f9bc56", - "version": "1.7.0" + "revision": "4e9bbf2808b8fee444e84a48f5f3c12641987d3e", + "version": "1.7.2" } }, { @@ -96,8 +96,8 @@ "repositoryURL": "https://github.com/google/promises.git", "state": { "branch": null, - "revision": "611337c330350c9c1823ad6d671e7f936af5ee13", - "version": "2.0.0" + "revision": "46c1e6b5ac09d8f82c991061c659f67e573d425d", + "version": "2.1.0" } }, { @@ -105,8 +105,8 @@ "repositoryURL": "https://github.com/apple/swift-protobuf.git", "state": { "branch": null, - "revision": "7e2c5f3cbbeea68e004915e3a8961e20bd11d824", - "version": "1.18.0" + "revision": "e1499bc69b9040b29184f7f2996f7bab467c1639", + "version": "1.19.0" } } ] diff --git a/Package.resolved b/Package.resolved index 8681e3b..14d24e9 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,115 +1,113 @@ { - "object": { - "pins": [ - { - "package": "abseil", - "repositoryURL": "https://github.com/firebase/abseil-cpp-SwiftPM.git", - "state": { - "branch": null, - "revision": "fffc3c2729be5747390ad02d5100291a0d9ad26a", - "version": "0.20200225.4" - } - }, - { - "package": "BoringSSL-GRPC", - "repositoryURL": "https://github.com/firebase/boringssl-SwiftPM.git", - "state": { - "branch": null, - "revision": "734a8247442fde37df4364c21f6a0085b6a36728", - "version": "0.7.2" - } - }, - { - "package": "Firebase", - "repositoryURL": "https://github.com/firebase/firebase-ios-sdk.git", - "state": { - "branch": null, - "revision": "78f7087fd5d48eb7c36e299f330b6dddccd647b2", - "version": "8.12.1" - } - }, - { - "package": "GoogleAppMeasurement", - "repositoryURL": "https://github.com/google/GoogleAppMeasurement.git", - "state": { - "branch": null, - "revision": "6cc2991c11872510a5314bc112cc7558dd9d046a", - "version": "8.12.0" - } - }, - { - "package": "GoogleDataTransport", - "repositoryURL": "https://github.com/google/GoogleDataTransport.git", - "state": { - "branch": null, - "revision": "15ccdfd25ac55b9239b82809531ff26605e7556e", - "version": "9.1.2" - } - }, - { - "package": "GoogleUtilities", - "repositoryURL": "https://github.com/google/GoogleUtilities.git", - "state": { - "branch": null, - "revision": "b3bb0c5551fb3f80ca939829639ab5b093edd14f", - "version": "7.7.0" - } - }, - { - "package": "gRPC", - "repositoryURL": "https://github.com/firebase/grpc-SwiftPM.git", - "state": { - "branch": null, - "revision": "fb405dd2c7901485f7e158b24e3a0a47e4efd8b5", - "version": "1.28.4" - } - }, - { - "package": "GTMSessionFetcher", - "repositoryURL": "https://github.com/google/gtm-session-fetcher.git", - "state": { - "branch": null, - "revision": "91ed3d188eb95705fef3c249453b81f32dc557d1", - "version": "1.5.0" - } - }, - { - "package": "leveldb", - "repositoryURL": "https://github.com/firebase/leveldb.git", - "state": { - "branch": null, - "revision": "0706abcc6b0bd9cedfbb015ba840e4a780b5159b", - "version": "1.22.2" - } - }, - { - "package": "nanopb", - "repositoryURL": "https://github.com/firebase/nanopb.git", - "state": { - "branch": null, - "revision": "7ee9ef9f627d85cbe1b8c4f49a3ed26eed216c77", - "version": "2.30908.0" - } - }, - { - "package": "Promises", - "repositoryURL": "https://github.com/google/promises.git", - "state": { - "branch": null, - "revision": "afa9a1ace74e116848d4f743599ab83e584ff8cb", - "version": "1.2.12" - } - }, - { - "package": "SwiftProtobuf", - "repositoryURL": "https://github.com/apple/swift-protobuf.git", - "state": { - "branch": null, - "revision": "1f62db409f2c9b0223a3f68567b4a01333aae778", - "version": "1.17.0" - } + "pins" : [ + { + "identity" : "abseil-cpp-swiftpm", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/abseil-cpp-SwiftPM.git", + "state" : { + "revision" : "d302de612e3d57c6f4afaf087da18fba8eac72a7", + "version" : "0.20220203.1" } - ] - }, - "version": 1 + }, + { + "identity" : "boringssl-swiftpm", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/boringssl-SwiftPM.git", + "state" : { + "revision" : "79db6516894a932d0ddaff3b05b9da1e4f6c4069", + "version" : "0.9.0" + } + }, + { + "identity" : "firebase-ios-sdk", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/firebase-ios-sdk.git", + "state" : { + "revision" : "cfa854c9c1073c4d1b83b20dfcb1ef7ceb85388b", + "version" : "9.0.0" + } + }, + { + "identity" : "googleappmeasurement", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/GoogleAppMeasurement.git", + "state" : { + "revision" : "6a3123fab90f3884167990bee9bb30097d99c98c", + "version" : "9.0.0" + } + }, + { + "identity" : "googledatatransport", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/GoogleDataTransport.git", + "state" : { + "revision" : "15ccdfd25ac55b9239b82809531ff26605e7556e", + "version" : "9.1.2" + } + }, + { + "identity" : "googleutilities", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/GoogleUtilities.git", + "state" : { + "revision" : "f4abe56ce62a779e64b525eb133c8fc2a84bbc1f", + "version" : "7.7.1" + } + }, + { + "identity" : "grpc-ios", + "kind" : "remoteSourceControl", + "location" : "https://github.com/grpc/grpc-ios.git", + "state" : { + "revision" : "abd2d5a4347efa0454606a788678a5d8ec223738", + "version" : "1.44.0-grpc" + } + }, + { + "identity" : "gtm-session-fetcher", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/gtm-session-fetcher.git", + "state" : { + "revision" : "4e9bbf2808b8fee444e84a48f5f3c12641987d3e", + "version" : "1.7.2" + } + }, + { + "identity" : "leveldb", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/leveldb.git", + "state" : { + "revision" : "0706abcc6b0bd9cedfbb015ba840e4a780b5159b", + "version" : "1.22.2" + } + }, + { + "identity" : "nanopb", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/nanopb.git", + "state" : { + "revision" : "7ee9ef9f627d85cbe1b8c4f49a3ed26eed216c77", + "version" : "2.30908.0" + } + }, + { + "identity" : "promises", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/promises.git", + "state" : { + "revision" : "46c1e6b5ac09d8f82c991061c659f67e573d425d", + "version" : "2.1.0" + } + }, + { + "identity" : "swift-protobuf", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-protobuf.git", + "state" : { + "revision" : "e1499bc69b9040b29184f7f2996f7bab467c1639", + "version" : "1.19.0" + } + } + ], + "version" : 2 } diff --git a/Package.swift b/Package.swift index 7f029f3..a26c470 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.2 +// swift-tools-version:5.6 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription @@ -18,10 +18,7 @@ let package = Package( ) ], dependencies: [ - .package( - name: "Firebase", - url: "https://github.com/firebase/firebase-ios-sdk.git", - .upToNextMajor(from: "8.12.1") + .package(url: "https://github.com/firebase/firebase-ios-sdk", .upToNextMajor(from: .init(9, 0, 0)) ) ], targets: [ @@ -40,7 +37,7 @@ let package = Package( .target( name: "SwiftyInAppMessaging", dependencies: [ - .product(name: "FirebaseInAppMessaging-Beta", package: "Firebase") + .product(name: "FirebaseInAppMessaging-Beta", package: "firebase-ios-sdk") ]), .testTarget( name: "SwiftyInAppMessagingTests", diff --git a/README.md b/README.md index 7069eb3..7295e03 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ func application(_ application: UIApplication, didFinishLaunchWithOptions launch ## Dependencies -- Firebase iOS SDK == `8.12.1` +- Firebase iOS SDK == `9.0.0` ## Installation @@ -103,8 +103,6 @@ let package = Package( ) ``` -firebase ios sdk supports Swift Package Manager in **Beta**. If you have some issues caused in Swift Package Manager, Please check firebase issues. - ### Cocoapods Just add to your `Podfile` diff --git a/SwiftyInAppMessaging.podspec b/SwiftyInAppMessaging.podspec index 924cc84..00da86b 100644 --- a/SwiftyInAppMessaging.podspec +++ b/SwiftyInAppMessaging.podspec @@ -36,6 +36,6 @@ Pod::Spec.new do |spec| spec.static_framework = true spec.swift_version = '5.3' - spec.dependency "Firebase/InAppMessaging", "~> 8.12.1-beta" + spec.dependency "Firebase/InAppMessaging", "~> 9.0.0-beta" end