diff --git a/CoreOnly/Tests/FirebasePodTest/Podfile b/CoreOnly/Tests/FirebasePodTest/Podfile index 5724b18b03..f96f621967 100644 --- a/CoreOnly/Tests/FirebasePodTest/Podfile +++ b/CoreOnly/Tests/FirebasePodTest/Podfile @@ -18,6 +18,7 @@ target 'FirebasePodTest' do pod 'FirebaseDatabase', :path => '../../../' pod 'FirebaseDynamicLinks', :path => '../../../' pod 'FirebaseFirestore', :path => '../../../' + pod 'FirebaseFirestoreInternal', :path => '../../../' pod 'FirebaseFunctions', :path => '../../../' pod 'FirebaseInAppMessaging', :path => '../../../' pod 'FirebaseInstallations', :path => '../../../' diff --git a/FirebaseAnalytics.podspec b/FirebaseAnalytics.podspec index 822a18a3b5..5b65864eae 100644 --- a/FirebaseAnalytics.podspec +++ b/FirebaseAnalytics.podspec @@ -32,7 +32,7 @@ Pod::Spec.new do |s| s.dependency 'GoogleUtilities/MethodSwizzler', '~> 8.0' s.dependency 'GoogleUtilities/NSData+zlib', '~> 8.0' s.dependency 'GoogleUtilities/Network', '~> 8.0' - s.dependency 'nanopb', '>= 2.30908.0', '< 2.30911.0' + s.dependency 'nanopb', '~> 3.30910.0' s.default_subspecs = 'AdIdSupport' diff --git a/FirebaseAppCheck.podspec b/FirebaseAppCheck.podspec index e04fdfd976..ede6d186a3 100644 --- a/FirebaseAppCheck.podspec +++ b/FirebaseAppCheck.podspec @@ -47,7 +47,7 @@ Pod::Spec.new do |s| s.dependency 'AppCheckCore', '~> 11.0' s.dependency 'FirebaseAppCheckInterop', '~> 11.0' s.dependency 'FirebaseCore', '~> 11.0' - s.dependency 'PromisesObjC', '~> 2.1' + s.dependency 'PromisesObjC', '~> 2.4' s.dependency 'GoogleUtilities/Environment', '~> 8.0' s.dependency 'GoogleUtilities/UserDefaults', '~> 8.0' diff --git a/FirebaseAuth.podspec b/FirebaseAuth.podspec index 2ce91b86c0..0385659f9f 100644 --- a/FirebaseAuth.podspec +++ b/FirebaseAuth.podspec @@ -61,7 +61,7 @@ supports email and password accounts, as well as several 3rd party authenticatio s.dependency 'FirebaseCoreExtension', '~> 11.0' s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 8.0' s.dependency 'GoogleUtilities/Environment', '~> 8.0' - s.dependency 'GTMSessionFetcher/Core', '>= 2.1', '< 4.0' + s.dependency 'GTMSessionFetcher/Core', '~> 3.4' s.ios.dependency 'RecaptchaInterop', '~> 100.0' s.test_spec 'unit' do |unit_tests| unit_tests.scheme = { :code_coverage => true } diff --git a/FirebaseCrashlytics.podspec b/FirebaseCrashlytics.podspec index be080d7752..3442674c96 100644 --- a/FirebaseCrashlytics.podspec +++ b/FirebaseCrashlytics.podspec @@ -63,10 +63,10 @@ Pod::Spec.new do |s| s.dependency 'FirebaseInstallations', '~> 11.0' s.dependency 'FirebaseSessions', '~> 11.0' s.dependency 'FirebaseRemoteConfigInterop', '~> 11.0' - s.dependency 'PromisesObjC', '~> 2.1' + s.dependency 'PromisesObjC', '~> 2.4' s.dependency 'GoogleDataTransport', '~> 10.0' s.dependency 'GoogleUtilities/Environment', '~> 8.0' - s.dependency 'nanopb', '>= 2.30908.0', '< 2.30911.0' + s.dependency 'nanopb', '~> 3.30910.0' s.libraries = 'c++', 'z' s.ios.frameworks = 'Security', 'SystemConfiguration' diff --git a/FirebaseFirestoreInternal.podspec b/FirebaseFirestoreInternal.podspec index 5e9288ad6c..788a3f02bc 100644 --- a/FirebaseFirestoreInternal.podspec +++ b/FirebaseFirestoreInternal.podspec @@ -107,7 +107,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling, s.dependency 'gRPC-Core', '~> 1.62.0' s.dependency 'gRPC-C++', '~> 1.62.0' s.dependency 'leveldb-library', '~> 1.22' - s.dependency 'nanopb', '>= 2.30908.0', '< 2.30911.0' + s.dependency 'nanopb', '~> 3.30910.0' s.ios.frameworks = 'SystemConfiguration', 'UIKit' s.osx.frameworks = 'SystemConfiguration' diff --git a/FirebaseFunctions.podspec b/FirebaseFunctions.podspec index 2d069da346..6c52818757 100644 --- a/FirebaseFunctions.podspec +++ b/FirebaseFunctions.podspec @@ -41,7 +41,7 @@ Cloud Functions for Firebase. s.dependency 'FirebaseAuthInterop', '~> 11.0' s.dependency 'FirebaseMessagingInterop', '~> 11.0' s.dependency 'FirebaseSharedSwift', '~> 11.0' - s.dependency 'GTMSessionFetcher/Core', '>= 2.1', '< 4.0' + s.dependency 'GTMSessionFetcher/Core', '~> 3.4' s.test_spec 'objc' do |objc_tests| objc_tests.platforms = { diff --git a/FirebaseInAppMessaging.podspec b/FirebaseInAppMessaging.podspec index 42eaf9ecb8..19864241a2 100644 --- a/FirebaseInAppMessaging.podspec +++ b/FirebaseInAppMessaging.podspec @@ -85,7 +85,7 @@ See more product details at https://firebase.google.com/products/in-app-messagin s.dependency 'FirebaseABTesting', '~> 11.0' s.dependency 'GoogleUtilities/Environment', '~> 8.0' s.dependency 'GoogleUtilities/UserDefaults', '~> 8.0' - s.dependency 'nanopb', '>= 2.30908.0', '< 2.30911.0' + s.dependency 'nanopb', '~> 3.30910.0' s.test_spec 'unit' do |unit_tests| unit_tests.scheme = { :code_coverage => true } diff --git a/FirebaseInstallations.podspec b/FirebaseInstallations.podspec index 990dd50541..bc14b79b8d 100644 --- a/FirebaseInstallations.podspec +++ b/FirebaseInstallations.podspec @@ -46,7 +46,7 @@ Pod::Spec.new do |s| s.framework = 'Security' s.dependency 'FirebaseCore', '~> 11.0' - s.dependency 'PromisesObjC', '~> 2.1' + s.dependency 'PromisesObjC', '~> 2.4' s.dependency 'GoogleUtilities/Environment', '~> 8.0' s.dependency 'GoogleUtilities/UserDefaults', '~> 8.0' diff --git a/FirebaseMessaging.podspec b/FirebaseMessaging.podspec index 0e056c8a17..5a66bf2553 100644 --- a/FirebaseMessaging.podspec +++ b/FirebaseMessaging.podspec @@ -68,7 +68,7 @@ device, and it is completely free. s.dependency 'GoogleUtilities/Environment', '~> 8.0' s.dependency 'GoogleUtilities/UserDefaults', '~> 8.0' s.dependency 'GoogleDataTransport', '~> 10.0' - s.dependency 'nanopb', '>= 2.30908.0', '< 2.30911.0' + s.dependency 'nanopb', '~> 3.30910.0' s.test_spec 'unit' do |unit_tests| unit_tests.scheme = { :code_coverage => true } diff --git a/FirebasePerformance.podspec b/FirebasePerformance.podspec index 6bcf58249d..215d257fcb 100644 --- a/FirebasePerformance.podspec +++ b/FirebasePerformance.podspec @@ -68,7 +68,7 @@ Firebase Performance library to measure performance of Mobile and Web Apps. s.dependency 'GoogleUtilities/ISASwizzler', '~> 8.0' s.dependency 'GoogleUtilities/MethodSwizzler', '~> 8.0' s.dependency 'GoogleUtilities/UserDefaults', '~> 8.0' - s.dependency 'nanopb', '>= 2.30908.0', '< 2.30911.0' + s.dependency 'nanopb', '~> 3.30910.0' s.test_spec 'unit' do |unit_tests| unit_tests.platforms = {:ios => ios_deployment_target, :tvos => tvos_deployment_target} diff --git a/FirebaseSessions.podspec b/FirebaseSessions.podspec index 8685d6c61a..5259adf6ba 100644 --- a/FirebaseSessions.podspec +++ b/FirebaseSessions.podspec @@ -45,7 +45,7 @@ Pod::Spec.new do |s| s.dependency 'GoogleDataTransport', '~> 10.0' s.dependency 'GoogleUtilities/Environment', '~> 8.0' s.dependency 'GoogleUtilities/UserDefaults', '~> 8.0' - s.dependency 'nanopb', '>= 2.30908.0', '< 2.30911.0' + s.dependency 'nanopb', '~> 3.30910.0' s.dependency 'PromisesSwift', '~> 2.1' s.pod_target_xcconfig = { diff --git a/FirebaseStorage.podspec b/FirebaseStorage.podspec index 17729ae3d2..247fb1c905 100644 --- a/FirebaseStorage.podspec +++ b/FirebaseStorage.podspec @@ -41,7 +41,7 @@ Firebase Storage provides robust, secure file uploads and downloads from Firebas s.dependency 'FirebaseAuthInterop', '~> 11.0' s.dependency 'FirebaseCore', '~> 11.0' s.dependency 'FirebaseCoreExtension', '~> 11.0' - s.dependency 'GTMSessionFetcher/Core', '>= 2.1', '< 4.0' + s.dependency 'GTMSessionFetcher/Core', '~> 3.4' s.dependency 'GoogleUtilities/Environment', '~> 8.0' s.test_spec 'ObjCIntegration' do |objc_tests| diff --git a/GoogleAppMeasurement.podspec b/GoogleAppMeasurement.podspec index b69681f152..e9f2246e4c 100644 --- a/GoogleAppMeasurement.podspec +++ b/GoogleAppMeasurement.podspec @@ -32,7 +32,7 @@ Pod::Spec.new do |s| s.dependency 'GoogleUtilities/MethodSwizzler', '~> 8.0' s.dependency 'GoogleUtilities/NSData+zlib', '~> 8.0' s.dependency 'GoogleUtilities/Network', '~> 8.0' - s.dependency 'nanopb', '>= 2.30908.0', '< 2.30911.0' + s.dependency 'nanopb', '~> 3.30910.0' s.default_subspecs = 'AdIdSupport' diff --git a/IntegrationTesting/ClientApp/Podfile b/IntegrationTesting/ClientApp/Podfile index 754b5d96e0..5421ab1093 100644 --- a/IntegrationTesting/ClientApp/Podfile +++ b/IntegrationTesting/ClientApp/Podfile @@ -22,9 +22,11 @@ target 'ClientApp-CocoaPods' do pod 'FirebaseDatabase', :path => '../../' pod 'FirebaseDynamicLinks', :path => '../../' pod 'FirebaseFirestore', :path => '../../' + pod 'FirebaseFirestoreInternal', :path => '../../' pod 'FirebaseFunctions', :path => '../../' pod 'FirebaseInAppMessaging', :path => '../../' pod 'FirebaseMessaging', :path => '../../' + pod 'FirebaseSessions', :path => '../../' pod 'FirebasePerformance', :path => '../../' pod 'FirebaseMLModelDownloader', :path => '../../' pod 'Firebase', :path => '../../' diff --git a/Package.swift b/Package.swift index 4a7c0228d1..d40a8707f0 100644 --- a/Package.swift +++ b/Package.swift @@ -125,7 +125,7 @@ let package = Package( dependencies: [ .package( url: "https://github.com/google/promises.git", - "2.1.0" ..< "3.0.0" + "2.4.0" ..< "3.0.0" ), .package( url: "https://github.com/apple/swift-protobuf.git", @@ -134,7 +134,9 @@ let package = Package( googleAppMeasurementDependency(), .package( url: "https://github.com/google/GoogleDataTransport.git", - "9.3.0" ..< "10.0.0" + branch: "release-10.0" + // TODO: Update to 10.0.0 when ready. + // "10.0.0" ..< "11.0.0" ), .package( url: "https://github.com/google/GoogleUtilities.git", @@ -144,7 +146,7 @@ let package = Package( ), .package( url: "https://github.com/google/gtm-session-fetcher.git", - "2.1.0" ..< "4.0.0" + "3.4.1" ..< "4.0.0" ), .package( url: "https://github.com/firebase/nanopb.git", @@ -173,7 +175,10 @@ let package = Package( url: "https://github.com/google/interop-ios-for-google-sdks.git", "100.0.0" ..< "101.0.0" ), - .package(url: "https://github.com/google/app-check.git", "10.19.0" ..< "11.0.0"), + .package(url: "https://github.com/google/app-check.git", + branch: "release-11.0"), + // TODO: Update to 11.0.0 when ready. + // "11.0.0" ..< "12.0.0", ], targets: [ .target(