diff --git a/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Package.swift b/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Package.swift index 427e6eba2b86..9186315f1eb7 100644 --- a/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Package.swift +++ b/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Package.swift @@ -7,8 +7,8 @@ import PackageDescription -let libraryVersion = "6.4.1" -let firebaseSdkVersion: Version = "12.14.0" +let libraryVersion = "6.5.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "cloud_firestore", diff --git a/packages/cloud_firestore/cloud_firestore/macos/cloud_firestore/Package.swift b/packages/cloud_firestore/cloud_firestore/macos/cloud_firestore/Package.swift index 5bd2446dda51..c7584955d7a4 100644 --- a/packages/cloud_firestore/cloud_firestore/macos/cloud_firestore/Package.swift +++ b/packages/cloud_firestore/cloud_firestore/macos/cloud_firestore/Package.swift @@ -7,8 +7,8 @@ import PackageDescription -let libraryVersion = "6.4.1" -let firebaseSdkVersion: Version = "12.14.0" +let libraryVersion = "6.5.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "cloud_firestore", diff --git a/packages/cloud_functions/cloud_functions/ios/cloud_functions/Package.swift b/packages/cloud_functions/cloud_functions/ios/cloud_functions/Package.swift index cd030b08914f..3f8528c174c0 100644 --- a/packages/cloud_functions/cloud_functions/ios/cloud_functions/Package.swift +++ b/packages/cloud_functions/cloud_functions/ios/cloud_functions/Package.swift @@ -7,7 +7,7 @@ import PackageDescription -let firebaseSdkVersion: Version = "12.14.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "cloud_functions", diff --git a/packages/cloud_functions/cloud_functions/macos/cloud_functions/Package.swift b/packages/cloud_functions/cloud_functions/macos/cloud_functions/Package.swift index df1ccce51ab8..2c25ccde9d22 100644 --- a/packages/cloud_functions/cloud_functions/macos/cloud_functions/Package.swift +++ b/packages/cloud_functions/cloud_functions/macos/cloud_functions/Package.swift @@ -7,7 +7,7 @@ import PackageDescription -let firebaseSdkVersion: Version = "12.14.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "cloud_functions", diff --git a/packages/firebase_ai/firebase_ai/example/ios/Podfile b/packages/firebase_ai/firebase_ai/example/ios/Podfile new file mode 100644 index 000000000000..620e46eba607 --- /dev/null +++ b/packages/firebase_ai/firebase_ai/example/ios/Podfile @@ -0,0 +1,43 @@ +# Uncomment this line to define a global platform for your project +# platform :ios, '13.0' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_ios_podfile_setup + +target 'Runner' do + use_frameworks! + + flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) + end +end diff --git a/packages/firebase_ai/firebase_ai/example/macos/Podfile b/packages/firebase_ai/firebase_ai/example/macos/Podfile new file mode 100644 index 000000000000..ff5ddb3b8bdc --- /dev/null +++ b/packages/firebase_ai/firebase_ai/example/macos/Podfile @@ -0,0 +1,42 @@ +platform :osx, '10.15' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\"" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_macos_podfile_setup + +target 'Runner' do + use_frameworks! + + flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_macos_build_settings(target) + end +end diff --git a/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Package.swift b/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Package.swift index 23763dbc6049..65aee5313d06 100644 --- a/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Package.swift +++ b/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Package.swift @@ -8,7 +8,7 @@ import Foundation import PackageDescription -let firebaseSdkVersion: Version = "12.14.0" +let firebaseSdkVersion: Version = "12.15.0" // Set FIREBASE_ANALYTICS_WITHOUT_ADID=true to use FirebaseAnalyticsCore. // e.g. FIREBASE_ANALYTICS_WITHOUT_ADID=true flutter build ios diff --git a/packages/firebase_analytics/firebase_analytics/macos/firebase_analytics/Package.swift b/packages/firebase_analytics/firebase_analytics/macos/firebase_analytics/Package.swift index d547defc1ed5..c9533bf1e70f 100644 --- a/packages/firebase_analytics/firebase_analytics/macos/firebase_analytics/Package.swift +++ b/packages/firebase_analytics/firebase_analytics/macos/firebase_analytics/Package.swift @@ -7,7 +7,7 @@ import PackageDescription -let firebaseSdkVersion: Version = "12.14.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_analytics", diff --git a/packages/firebase_app_check/firebase_app_check/example/ios/Podfile b/packages/firebase_app_check/firebase_app_check/example/ios/Podfile new file mode 100644 index 000000000000..620e46eba607 --- /dev/null +++ b/packages/firebase_app_check/firebase_app_check/example/ios/Podfile @@ -0,0 +1,43 @@ +# Uncomment this line to define a global platform for your project +# platform :ios, '13.0' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_ios_podfile_setup + +target 'Runner' do + use_frameworks! + + flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) + end +end diff --git a/packages/firebase_app_check/firebase_app_check/example/macos/Podfile b/packages/firebase_app_check/firebase_app_check/example/macos/Podfile new file mode 100644 index 000000000000..ff5ddb3b8bdc --- /dev/null +++ b/packages/firebase_app_check/firebase_app_check/example/macos/Podfile @@ -0,0 +1,42 @@ +platform :osx, '10.15' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\"" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_macos_podfile_setup + +target 'Runner' do + use_frameworks! + + flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_macos_build_settings(target) + end +end diff --git a/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Package.swift b/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Package.swift index c61c10b252e1..14de1a767958 100644 --- a/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Package.swift +++ b/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Package.swift @@ -7,7 +7,7 @@ import PackageDescription -let firebaseSdkVersion: Version = "12.14.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_app_check", @@ -19,7 +19,10 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), - .package(url: "https://github.com/GoogleCloudPlatform/recaptcha-enterprise-mobile-sdk.git", from: "18.0.0"), + .package( + url: "https://github.com/GoogleCloudPlatform/recaptcha-enterprise-mobile-sdk.git", + from: "18.0.0" + ), .package(name: "firebase_core", path: "../firebase_core"), ], targets: [ diff --git a/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Sources/firebase_app_check/FirebaseAppCheckMessages.g.swift b/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Sources/firebase_app_check/FirebaseAppCheckMessages.g.swift index cc94a926d933..d8f3a100c89b 100644 --- a/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Sources/firebase_app_check/FirebaseAppCheckMessages.g.swift +++ b/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Sources/firebase_app_check/FirebaseAppCheckMessages.g.swift @@ -27,13 +27,12 @@ final class PigeonError: Error { } var localizedDescription: String { - return - "PigeonError(code: \(code), message: \(message ?? ""), details: \(details ?? "")" + "PigeonError(code: \(code), message: \(message ?? ""), details: \(details ?? "")" } } private func wrapResult(_ result: Any?) -> [Any?] { - return [result] + [result] } private func wrapError(_ error: Any) -> [Any?] { @@ -59,7 +58,7 @@ private func wrapError(_ error: Any) -> [Any?] { } private func isNullish(_ value: Any?) -> Bool { - return value is NSNull || value == nil + value is NSNull || value == nil } private func nilOrValue(_ value: Any?) -> T? { @@ -67,46 +66,52 @@ private func nilOrValue(_ value: Any?) -> T? { return value as! T? } -private class FirebaseAppCheckMessagesPigeonCodecReader: FlutterStandardReader { -} +private class FirebaseAppCheckMessagesPigeonCodecReader: FlutterStandardReader {} -private class FirebaseAppCheckMessagesPigeonCodecWriter: FlutterStandardWriter { -} +private class FirebaseAppCheckMessagesPigeonCodecWriter: FlutterStandardWriter {} private class FirebaseAppCheckMessagesPigeonCodecReaderWriter: FlutterStandardReaderWriter { override func reader(with data: Data) -> FlutterStandardReader { - return FirebaseAppCheckMessagesPigeonCodecReader(data: data) + FirebaseAppCheckMessagesPigeonCodecReader(data: data) } override func writer(with data: NSMutableData) -> FlutterStandardWriter { - return FirebaseAppCheckMessagesPigeonCodecWriter(data: data) + FirebaseAppCheckMessagesPigeonCodecWriter(data: data) } } class FirebaseAppCheckMessagesPigeonCodec: FlutterStandardMessageCodec, @unchecked Sendable { static let shared = FirebaseAppCheckMessagesPigeonCodec( - readerWriter: FirebaseAppCheckMessagesPigeonCodecReaderWriter()) + readerWriter: FirebaseAppCheckMessagesPigeonCodecReaderWriter() + ) } /// Generated protocol from Pigeon that represents a handler of messages from Flutter. protocol FirebaseAppCheckHostApi { func activate( - appName: String, androidProvider: String?, appleProvider: String?, debugToken: String?, + appName: String, androidProvider: String?, appleProvider: String?, + debugToken: String?, completion: @escaping (Result) -> Void) func getToken( - appName: String, forceRefresh: Bool, completion: @escaping (Result) -> Void) + appName: String, forceRefresh: Bool, + completion: @escaping (Result) -> Void) func setTokenAutoRefreshEnabled( appName: String, isTokenAutoRefreshEnabled: Bool, completion: @escaping (Result) -> Void) func registerTokenListener(appName: String, completion: @escaping (Result) -> Void) func getLimitedUseAppCheckToken( - appName: String, completion: @escaping (Result) -> Void) + appName: String, + completion: @escaping (Result) -> Void) } /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`. class FirebaseAppCheckHostApiSetup { - static var codec: FlutterStandardMessageCodec { FirebaseAppCheckMessagesPigeonCodec.shared } - /// Sets up an instance of `FirebaseAppCheckHostApi` to handle messages through the `binaryMessenger`. + static var codec: FlutterStandardMessageCodec { + FirebaseAppCheckMessagesPigeonCodec.shared + } + + /// Sets up an instance of `FirebaseAppCheckHostApi` to handle messages through the + /// `binaryMessenger`. static func setUp( binaryMessenger: FlutterBinaryMessenger, api: FirebaseAppCheckHostApi?, messageChannelSuffix: String = "" @@ -115,8 +120,9 @@ class FirebaseAppCheckHostApiSetup { let activateChannel = FlutterBasicMessageChannel( name: "dev.flutter.pigeon.firebase_app_check_platform_interface.FirebaseAppCheckHostApi.activate\(channelSuffix)", - binaryMessenger: binaryMessenger, codec: codec) - if let api = api { + binaryMessenger: binaryMessenger, codec: codec + ) + if let api { activateChannel.setMessageHandler { message, reply in let args = message as! [Any?] let appNameArg = args[0] as! String @@ -141,8 +147,9 @@ class FirebaseAppCheckHostApiSetup { let getTokenChannel = FlutterBasicMessageChannel( name: "dev.flutter.pigeon.firebase_app_check_platform_interface.FirebaseAppCheckHostApi.getToken\(channelSuffix)", - binaryMessenger: binaryMessenger, codec: codec) - if let api = api { + binaryMessenger: binaryMessenger, codec: codec + ) + if let api { getTokenChannel.setMessageHandler { message, reply in let args = message as! [Any?] let appNameArg = args[0] as! String @@ -162,8 +169,9 @@ class FirebaseAppCheckHostApiSetup { let setTokenAutoRefreshEnabledChannel = FlutterBasicMessageChannel( name: "dev.flutter.pigeon.firebase_app_check_platform_interface.FirebaseAppCheckHostApi.setTokenAutoRefreshEnabled\(channelSuffix)", - binaryMessenger: binaryMessenger, codec: codec) - if let api = api { + binaryMessenger: binaryMessenger, codec: codec + ) + if let api { setTokenAutoRefreshEnabledChannel.setMessageHandler { message, reply in let args = message as! [Any?] let appNameArg = args[0] as! String @@ -185,8 +193,9 @@ class FirebaseAppCheckHostApiSetup { let registerTokenListenerChannel = FlutterBasicMessageChannel( name: "dev.flutter.pigeon.firebase_app_check_platform_interface.FirebaseAppCheckHostApi.registerTokenListener\(channelSuffix)", - binaryMessenger: binaryMessenger, codec: codec) - if let api = api { + binaryMessenger: binaryMessenger, codec: codec + ) + if let api { registerTokenListenerChannel.setMessageHandler { message, reply in let args = message as! [Any?] let appNameArg = args[0] as! String @@ -205,8 +214,9 @@ class FirebaseAppCheckHostApiSetup { let getLimitedUseAppCheckTokenChannel = FlutterBasicMessageChannel( name: "dev.flutter.pigeon.firebase_app_check_platform_interface.FirebaseAppCheckHostApi.getLimitedUseAppCheckToken\(channelSuffix)", - binaryMessenger: binaryMessenger, codec: codec) - if let api = api { + binaryMessenger: binaryMessenger, codec: codec + ) + if let api { getLimitedUseAppCheckTokenChannel.setMessageHandler { message, reply in let args = message as! [Any?] let appNameArg = args[0] as! String diff --git a/packages/firebase_app_check/firebase_app_check/macos/firebase_app_check/Package.swift b/packages/firebase_app_check/firebase_app_check/macos/firebase_app_check/Package.swift index 5e18628c4123..2edc73e6569f 100644 --- a/packages/firebase_app_check/firebase_app_check/macos/firebase_app_check/Package.swift +++ b/packages/firebase_app_check/firebase_app_check/macos/firebase_app_check/Package.swift @@ -7,7 +7,7 @@ import PackageDescription -let firebaseSdkVersion: Version = "12.14.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_app_check", diff --git a/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Package.swift b/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Package.swift index 7427d6bc97d7..9227ec496045 100644 --- a/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Package.swift +++ b/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Package.swift @@ -7,7 +7,7 @@ import PackageDescription -let firebaseSdkVersion: Version = "12.14.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_app_installations", diff --git a/packages/firebase_app_installations/firebase_app_installations/macos/firebase_app_installations/Package.swift b/packages/firebase_app_installations/firebase_app_installations/macos/firebase_app_installations/Package.swift index 16b1f01b9764..2e91bb5f3819 100644 --- a/packages/firebase_app_installations/firebase_app_installations/macos/firebase_app_installations/Package.swift +++ b/packages/firebase_app_installations/firebase_app_installations/macos/firebase_app_installations/Package.swift @@ -7,7 +7,7 @@ import PackageDescription -let firebaseSdkVersion: Version = "12.14.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_app_installations", diff --git a/packages/firebase_auth/firebase_auth/ios/firebase_auth/Package.swift b/packages/firebase_auth/firebase_auth/ios/firebase_auth/Package.swift index fb20508740d9..8c5d6ca619c2 100644 --- a/packages/firebase_auth/firebase_auth/ios/firebase_auth/Package.swift +++ b/packages/firebase_auth/firebase_auth/ios/firebase_auth/Package.swift @@ -7,8 +7,8 @@ import PackageDescription -let libraryVersion = "6.5.1" -let firebaseSdkVersion: Version = "12.14.0" +let libraryVersion = "6.5.2" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_auth", diff --git a/packages/firebase_auth/firebase_auth/macos/firebase_auth/Package.swift b/packages/firebase_auth/firebase_auth/macos/firebase_auth/Package.swift index 2f0c6134c574..7e5367f65668 100644 --- a/packages/firebase_auth/firebase_auth/macos/firebase_auth/Package.swift +++ b/packages/firebase_auth/firebase_auth/macos/firebase_auth/Package.swift @@ -7,8 +7,8 @@ import PackageDescription -let libraryVersion = "6.5.1" -let firebaseSdkVersion: Version = "12.14.0" +let libraryVersion = "6.5.2" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_auth", diff --git a/packages/firebase_core/firebase_core/ios/firebase_core/Package.swift b/packages/firebase_core/firebase_core/ios/firebase_core/Package.swift index 2564661516ae..0080eea73902 100644 --- a/packages/firebase_core/firebase_core/ios/firebase_core/Package.swift +++ b/packages/firebase_core/firebase_core/ios/firebase_core/Package.swift @@ -7,8 +7,8 @@ import PackageDescription -let libraryVersionString = "4.9.0" -let firebaseSdkVersion: Version = "12.14.0" +let libraryVersionString = "4.10.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_core", diff --git a/packages/firebase_core/firebase_core/ios/firebase_core/Sources/firebase_core/FLTFirebaseCorePlugin.m b/packages/firebase_core/firebase_core/ios/firebase_core/Sources/firebase_core/FLTFirebaseCorePlugin.m index 0b713b7c9f80..192f984e59fb 100644 --- a/packages/firebase_core/firebase_core/ios/firebase_core/Sources/firebase_core/FLTFirebaseCorePlugin.m +++ b/packages/firebase_core/firebase_core/ios/firebase_core/Sources/firebase_core/FLTFirebaseCorePlugin.m @@ -93,7 +93,8 @@ - (CoreFirebaseOptions *)optionsFromFIROptions:(FIROptions *)options { pigeonOptions.iosBundleId = (id)options.bundleID ?: [NSNull null]; pigeonOptions.iosClientId = (id)options.clientID ?: [NSNull null]; pigeonOptions.appGroupId = (id)options.appGroupID ?: [NSNull null]; - pigeonOptions.recaptchaSiteKey = (id)options.recaptchaSiteKey ?: [NSNull null]; + // recaptchaSiteKey is currently only exposed by Firebase JS options. + pigeonOptions.recaptchaSiteKey = [NSNull null]; return pigeonOptions; } @@ -179,10 +180,6 @@ - (void)initializeAppAppName:(nonnull NSString *)appName options.appGroupID = initializeAppRequest.appGroupId; } - if (![initializeAppRequest.recaptchaSiteKey isEqual:[NSNull null]]) { - options.recaptchaSiteKey = initializeAppRequest.recaptchaSiteKey; - } - if (initializeAppRequest.authDomain != nil) { customAuthDomains[appNameIos] = initializeAppRequest.authDomain; } diff --git a/packages/firebase_core/firebase_core/macos/firebase_core/Package.swift b/packages/firebase_core/firebase_core/macos/firebase_core/Package.swift index 03cdee9a4167..76ca886cb995 100644 --- a/packages/firebase_core/firebase_core/macos/firebase_core/Package.swift +++ b/packages/firebase_core/firebase_core/macos/firebase_core/Package.swift @@ -7,8 +7,8 @@ import PackageDescription -let libraryVersionString = "4.9.0" -let firebaseSdkVersion: Version = "12.14.0" +let libraryVersionString = "4.10.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_core", diff --git a/packages/firebase_crashlytics/firebase_crashlytics/ios/firebase_crashlytics/Package.swift b/packages/firebase_crashlytics/firebase_crashlytics/ios/firebase_crashlytics/Package.swift index 4a0a87574f4e..52abad688be9 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/ios/firebase_crashlytics/Package.swift +++ b/packages/firebase_crashlytics/firebase_crashlytics/ios/firebase_crashlytics/Package.swift @@ -7,8 +7,8 @@ import PackageDescription -let libraryVersion = "5.2.2" -let firebaseSdkVersion: Version = "12.14.0" +let libraryVersion = "5.2.3" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_crashlytics", diff --git a/packages/firebase_crashlytics/firebase_crashlytics/macos/firebase_crashlytics/Package.swift b/packages/firebase_crashlytics/firebase_crashlytics/macos/firebase_crashlytics/Package.swift index 619e14e93216..688d2aeada02 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/macos/firebase_crashlytics/Package.swift +++ b/packages/firebase_crashlytics/firebase_crashlytics/macos/firebase_crashlytics/Package.swift @@ -7,8 +7,8 @@ import PackageDescription -let libraryVersion = "5.2.2" -let firebaseSdkVersion: Version = "12.14.0" +let libraryVersion = "5.2.3" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_crashlytics", diff --git a/packages/firebase_database/firebase_database/ios/firebase_database/Package.swift b/packages/firebase_database/firebase_database/ios/firebase_database/Package.swift index d961803fe9fa..d895419bf4cf 100644 --- a/packages/firebase_database/firebase_database/ios/firebase_database/Package.swift +++ b/packages/firebase_database/firebase_database/ios/firebase_database/Package.swift @@ -7,8 +7,8 @@ import PackageDescription -let libraryVersion = "12.4.1" -let firebaseSdkVersion: Version = "12.14.0" +let libraryVersion = "12.4.2" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_database", diff --git a/packages/firebase_database/firebase_database/macos/firebase_database/Package.swift b/packages/firebase_database/firebase_database/macos/firebase_database/Package.swift index d322efdf7030..7c49a085ea0d 100644 --- a/packages/firebase_database/firebase_database/macos/firebase_database/Package.swift +++ b/packages/firebase_database/firebase_database/macos/firebase_database/Package.swift @@ -7,8 +7,8 @@ import PackageDescription -let libraryVersion = "12.4.1" -let firebaseSdkVersion: Version = "12.14.0" +let libraryVersion = "12.4.2" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_database", diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/ios/firebase_in_app_messaging/Package.swift b/packages/firebase_in_app_messaging/firebase_in_app_messaging/ios/firebase_in_app_messaging/Package.swift index b389528c60ee..6cd63b4f83c8 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/ios/firebase_in_app_messaging/Package.swift +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/ios/firebase_in_app_messaging/Package.swift @@ -7,8 +7,8 @@ import PackageDescription -let libraryVersion = "0.9.2-2" -let firebaseSdkVersion: Version = "12.14.0" +let libraryVersion = "0.9.2-3" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_in_app_messaging", diff --git a/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Package.swift b/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Package.swift index 74d6a74e26b3..18784af00022 100644 --- a/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Package.swift +++ b/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Package.swift @@ -7,8 +7,8 @@ import PackageDescription -let libraryVersion = "16.2.2" -let firebaseSdkVersion: Version = "12.14.0" +let libraryVersion = "16.3.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_messaging", diff --git a/packages/firebase_messaging/firebase_messaging/macos/firebase_messaging/Package.swift b/packages/firebase_messaging/firebase_messaging/macos/firebase_messaging/Package.swift index 820f2875e68a..f91b6fc3ecb2 100644 --- a/packages/firebase_messaging/firebase_messaging/macos/firebase_messaging/Package.swift +++ b/packages/firebase_messaging/firebase_messaging/macos/firebase_messaging/Package.swift @@ -7,8 +7,8 @@ import PackageDescription -let libraryVersion = "16.2.2" -let firebaseSdkVersion: Version = "12.14.0" +let libraryVersion = "16.3.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_messaging", diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/ios/firebase_ml_model_downloader/Package.swift b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/ios/firebase_ml_model_downloader/Package.swift index 739d1f6494ee..269a6407d7e9 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/ios/firebase_ml_model_downloader/Package.swift +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/ios/firebase_ml_model_downloader/Package.swift @@ -7,7 +7,7 @@ import PackageDescription -let firebaseSdkVersion: Version = "12.14.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_ml_model_downloader", diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/macos/firebase_ml_model_downloader/Package.swift b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/macos/firebase_ml_model_downloader/Package.swift index cfdcb0d35386..864e62e3cbdd 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/macos/firebase_ml_model_downloader/Package.swift +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/macos/firebase_ml_model_downloader/Package.swift @@ -7,7 +7,7 @@ import PackageDescription -let firebaseSdkVersion: Version = "12.14.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_ml_model_downloader", diff --git a/packages/firebase_performance/firebase_performance/ios/firebase_performance/Package.swift b/packages/firebase_performance/firebase_performance/ios/firebase_performance/Package.swift index 9058965e7e35..dff9cf422bdd 100644 --- a/packages/firebase_performance/firebase_performance/ios/firebase_performance/Package.swift +++ b/packages/firebase_performance/firebase_performance/ios/firebase_performance/Package.swift @@ -7,8 +7,8 @@ import PackageDescription -let libraryVersion = "0.11.4-1" -let firebaseSdkVersion: Version = "12.14.0" +let libraryVersion = "0.11.4-2" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_performance", diff --git a/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Package.swift b/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Package.swift index f932cb140ee9..43a620865941 100644 --- a/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Package.swift +++ b/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Package.swift @@ -7,7 +7,7 @@ import PackageDescription -let firebaseSdkVersion: Version = "12.14.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_remote_config", diff --git a/packages/firebase_remote_config/firebase_remote_config/macos/firebase_remote_config/Package.swift b/packages/firebase_remote_config/firebase_remote_config/macos/firebase_remote_config/Package.swift index f2bb3d72b4e3..a5e6bcd78225 100644 --- a/packages/firebase_remote_config/firebase_remote_config/macos/firebase_remote_config/Package.swift +++ b/packages/firebase_remote_config/firebase_remote_config/macos/firebase_remote_config/Package.swift @@ -7,7 +7,7 @@ import PackageDescription -let firebaseSdkVersion: Version = "12.14.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_remote_config", diff --git a/packages/firebase_storage/firebase_storage/ios/firebase_storage/Package.swift b/packages/firebase_storage/firebase_storage/ios/firebase_storage/Package.swift index 149ea8699915..43f4b656a206 100644 --- a/packages/firebase_storage/firebase_storage/ios/firebase_storage/Package.swift +++ b/packages/firebase_storage/firebase_storage/ios/firebase_storage/Package.swift @@ -7,8 +7,8 @@ import PackageDescription -let libraryVersion = "13.4.1" -let firebaseSdkVersion: Version = "12.14.0" +let libraryVersion = "13.4.2" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_storage", diff --git a/packages/firebase_storage/firebase_storage/macos/firebase_storage/Package.swift b/packages/firebase_storage/firebase_storage/macos/firebase_storage/Package.swift index 581580fc09ea..aeb81c040fdc 100644 --- a/packages/firebase_storage/firebase_storage/macos/firebase_storage/Package.swift +++ b/packages/firebase_storage/firebase_storage/macos/firebase_storage/Package.swift @@ -7,8 +7,8 @@ import PackageDescription -let libraryVersion = "13.4.1" -let firebaseSdkVersion: Version = "12.14.0" +let libraryVersion = "13.4.2" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_storage",