From 4c36647edf4f0392a10dfd881d9cb705c72f77dc Mon Sep 17 00:00:00 2001 From: Guillaume Bernos Date: Wed, 17 Jun 2026 09:53:43 +0200 Subject: [PATCH 1/2] chore: format --- .../ios/cloud_firestore/Package.swift | 8 +- .../macos/cloud_firestore/Package.swift | 8 +- .../ios/cloud_functions/Package.swift | 8 +- .../CloudFunctionsMessages.g.swift | 15 +- .../FirebaseFunctionsPlugin.swift | 25 +-- .../FunctionsStreamHandler.swift | 13 +- .../macos/cloud_functions/Package.swift | 8 +- .../firebase_ai/ios/firebase_ai/Package.swift | 8 +- .../macos/firebase_ai/Package.swift | 8 +- .../ios/firebase_analytics/Package.swift | 8 +- .../FirebaseAnalyticsMessages.g.swift | 55 +++-- .../FirebaseAnalyticsPlugin.swift | 68 +++---- .../macos/firebase_analytics/Package.swift | 8 +- .../ios/firebase_app_check/Package.swift | 13 +- .../FirebaseAppCheckMessages.g.swift | 88 ++++---- .../FirebaseAppCheckPlugin.swift | 71 +++---- .../macos/firebase_app_check/Package.swift | 8 +- .../firebase_app_installations/Package.swift | 8 +- .../FirebaseInstallationsPlugin.swift | 42 ++-- .../IdChangedStreamHandler.swift | 6 +- .../firebase_app_installations/Package.swift | 8 +- .../ios/firebase_auth/Package.swift | 8 +- .../macos/firebase_auth/Package.swift | 8 +- .../ios/firebase_core/Package.swift | 12 +- .../macos/firebase_core/Package.swift | 12 +- .../ios/firebase_crashlytics/Package.swift | 8 +- .../macos/firebase_crashlytics/Package.swift | 8 +- .../ios/firebase_database/Package.swift | 8 +- ...FirebaseDatabaseObserveStreamHandler.swift | 7 +- .../FLTFirebaseDatabasePlugin.swift | 157 +++++---------- .../FLTFirebaseDatabaseUtils.swift | 27 +-- .../FirebaseDatabaseMessages.g.swift | 190 ++++++++---------- .../macos/firebase_database/Package.swift | 8 +- .../firebase_in_app_messaging/Package.swift | 8 +- .../FlutterFirebaseMessagingPlugin.java | 12 +- .../ios/firebase_messaging/Package.swift | 8 +- .../macos/firebase_messaging/Package.swift | 8 +- .../Package.swift | 8 +- .../FirebaseModelDownloaderPlugin.swift | 14 +- .../Package.swift | 8 +- .../ios/firebase_performance/Package.swift | 8 +- .../FirebasePerformanceMessages.g.swift | 38 ++-- .../FirebasePerformancePlugin.swift | 27 +-- .../ios/firebase_remote_config/Package.swift | 8 +- .../FirebaseRemoteConfigMessages.g.swift | 39 ++-- .../FirebaseRemoteConfigPlugin.swift | 36 ++-- .../FirebaseRemoteConfigUtils.swift | 5 +- .../firebase_remote_config/Package.swift | 8 +- .../ios/firebase_storage/Package.swift | 8 +- .../FLTFirebaseStoragePlugin.swift | 146 +++++--------- .../FirebaseStorageMessages.g.swift | 155 ++++++-------- .../TaskStateChannelStreamHandler.swift | 17 +- .../macos/firebase_storage/Package.swift | 8 +- 53 files changed, 627 insertions(+), 879 deletions(-) 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..1c58698320e7 100644 --- a/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Package.swift +++ b/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Package.swift @@ -13,10 +13,10 @@ let firebaseSdkVersion: Version = "12.14.0" let package = Package( name: "cloud_firestore", platforms: [ - .iOS("15.0") + .iOS("15.0"), ], products: [ - .library(name: "cloud-firestore", targets: ["cloud_firestore"]) + .library(name: "cloud-firestore", targets: ["cloud_firestore"]), ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,7 +30,7 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources") + .process("Resources"), ], cSettings: [ .headerSearchPath("include/cloud_firestore/Private"), @@ -38,6 +38,6 @@ let package = Package( .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-fst\""), ] - ) + ), ] ) 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..de5ef20cb2d8 100644 --- a/packages/cloud_firestore/cloud_firestore/macos/cloud_firestore/Package.swift +++ b/packages/cloud_firestore/cloud_firestore/macos/cloud_firestore/Package.swift @@ -13,10 +13,10 @@ let firebaseSdkVersion: Version = "12.14.0" let package = Package( name: "cloud_firestore", platforms: [ - .macOS("10.15") + .macOS("10.15"), ], products: [ - .library(name: "cloud-firestore", targets: ["cloud_firestore"]) + .library(name: "cloud-firestore", targets: ["cloud_firestore"]), ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,7 +30,7 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources") + .process("Resources"), ], cSettings: [ .headerSearchPath("include/cloud_firestore/Private"), @@ -38,6 +38,6 @@ let package = Package( .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-fst\""), ] - ) + ), ] ) 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..d23cef4787af 100644 --- a/packages/cloud_functions/cloud_functions/ios/cloud_functions/Package.swift +++ b/packages/cloud_functions/cloud_functions/ios/cloud_functions/Package.swift @@ -12,10 +12,10 @@ let firebaseSdkVersion: Version = "12.14.0" let package = Package( name: "cloud_functions", platforms: [ - .iOS("15.0") + .iOS("15.0"), ], products: [ - .library(name: "cloud-functions", targets: ["cloud_functions"]) + .library(name: "cloud-functions", targets: ["cloud_functions"]), ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -29,8 +29,8 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources") + .process("Resources"), ] - ) + ), ] ) diff --git a/packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/CloudFunctionsMessages.g.swift b/packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/CloudFunctionsMessages.g.swift index 86ba0c92f137..19b6fc229d6d 100644 --- a/packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/CloudFunctionsMessages.g.swift +++ b/packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/CloudFunctionsMessages.g.swift @@ -88,9 +88,8 @@ class CloudFunctionsMessagesPigeonCodec: FlutterStandardMessageCodec, @unchecked /// Generated protocol from Pigeon that represents a handler of messages from Flutter. protocol CloudFunctionsHostApi { func call(arguments: [String: Any?], completion: @escaping (Result) -> Void) - func registerEventChannel( - arguments: [String: Any], - completion: @escaping (Result) -> Void) + func registerEventChannel(arguments: [String: Any], + completion: @escaping (Result) -> Void) } /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`. @@ -101,14 +100,12 @@ class CloudFunctionsHostApiSetup { /// Sets up an instance of `CloudFunctionsHostApi` to handle messages through the /// `binaryMessenger`. - static func setUp( - binaryMessenger: FlutterBinaryMessenger, api: CloudFunctionsHostApi?, - messageChannelSuffix: String = "" - ) { + static func setUp(binaryMessenger: FlutterBinaryMessenger, api: CloudFunctionsHostApi?, + messageChannelSuffix: String = "") { let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" let callChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.cloud_functions_platform_interface.CloudFunctionsHostApi.call\(channelSuffix)", + "dev.flutter.pigeon.cloud_functions_platform_interface.CloudFunctionsHostApi.call\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -130,7 +127,7 @@ class CloudFunctionsHostApiSetup { } let registerEventChannelChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.cloud_functions_platform_interface.CloudFunctionsHostApi.registerEventChannel\(channelSuffix)", + "dev.flutter.pigeon.cloud_functions_platform_interface.CloudFunctionsHostApi.registerEventChannel\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) diff --git a/packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/FirebaseFunctionsPlugin.swift b/packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/FirebaseFunctionsPlugin.swift index c5026ca8578b..18941ed8c2b5 100644 --- a/packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/FirebaseFunctionsPlugin.swift +++ b/packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/FirebaseFunctionsPlugin.swift @@ -21,8 +21,7 @@ extension FlutterError: Error {} let kFLTFirebaseFunctionsChannelName = "plugins.flutter.io/firebase_functions" public class FirebaseFunctionsPlugin: NSObject, FLTFirebasePluginProtocol, FlutterPlugin, - CloudFunctionsHostApi -{ + CloudFunctionsHostApi { func call(arguments: [String: Any?], completion: @escaping (Result) -> Void) { httpsFunctionCall(arguments: arguments) { result, error in if let error { @@ -33,10 +32,8 @@ public class FirebaseFunctionsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt } } - func registerEventChannel( - arguments: [String: Any], - completion: @escaping (Result) -> Void - ) { + func registerEventChannel(arguments: [String: Any], + completion: @escaping (Result) -> Void) { let eventChannelId = arguments["eventChannelId"]! let eventChannelName = "\(kFLTFirebaseFunctionsChannelName)/\(eventChannelId)" let eventChannel = FlutterEventChannel(name: eventChannelName, binaryMessenger: binaryMessenger) @@ -84,10 +81,8 @@ public class FirebaseFunctionsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt CloudFunctionsHostApiSetup.setUp(binaryMessenger: binaryMessenger, api: instance) } - private func httpsFunctionCall( - arguments: [String: Any], - completion: @escaping (Any?, FlutterError?) -> Void - ) { + private func httpsFunctionCall(arguments: [String: Any], + completion: @escaping (Any?, FlutterError?) -> Void) { let appName = arguments["appName"] as? String ?? "" let functionName = arguments["functionName"] as? String let functionUri = arguments["functionUri"] as? String @@ -102,10 +97,9 @@ public class FirebaseFunctionsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt let functions = Functions.functions(app: app, region: region ?? "") if let origin, !origin.isEmpty, - let url = URL(string: origin), - let host = url.host, - let port = url.port - { + let url = URL(string: origin), + let host = url.host, + let port = url.port { functions.useEmulator(withHost: host, port: port) } @@ -116,8 +110,7 @@ public class FirebaseFunctionsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt if let functionName, !functionName.isEmpty { function = functions.httpsCallable(functionName, options: options) } else if let functionUri, !functionUri.isEmpty, - let url = URL(string: functionUri) - { + let url = URL(string: functionUri) { function = functions.httpsCallable(url, options: options) } else { completion( diff --git a/packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/FunctionsStreamHandler.swift b/packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/FunctionsStreamHandler.swift index 7d2ce08e76cc..6b238cbd7c4f 100644 --- a/packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/FunctionsStreamHandler.swift +++ b/packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/FunctionsStreamHandler.swift @@ -19,10 +19,8 @@ class FunctionsStreamHandler: NSObject, FlutterStreamHandler { super.init() } - func onListen( - withArguments arguments: Any?, - eventSink events: @escaping FlutterEventSink - ) -> FlutterError? { + func onListen(withArguments arguments: Any?, + eventSink events: @escaping FlutterEventSink) -> FlutterError? { streamTask = Task { await httpsStreamCall(arguments: arguments, events: events) } @@ -55,10 +53,9 @@ class FunctionsStreamHandler: NSObject, FlutterStreamHandler { let limitedUseAppCheckToken = arguments["limitedUseAppCheckToken"] as? Bool ?? false if let origin, - let url = URL(string: origin), - let host = url.host, - let port = url.port - { + let url = URL(string: origin), + let host = url.host, + let port = url.port { functions.useEmulator(withHost: host, port: port) } 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..e0d6c5a0cccb 100644 --- a/packages/cloud_functions/cloud_functions/macos/cloud_functions/Package.swift +++ b/packages/cloud_functions/cloud_functions/macos/cloud_functions/Package.swift @@ -12,10 +12,10 @@ let firebaseSdkVersion: Version = "12.14.0" let package = Package( name: "cloud_functions", platforms: [ - .macOS("10.15") + .macOS("10.15"), ], products: [ - .library(name: "cloud-functions", targets: ["cloud_functions"]) + .library(name: "cloud-functions", targets: ["cloud_functions"]), ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -29,8 +29,8 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources") + .process("Resources"), ] - ) + ), ] ) diff --git a/packages/firebase_ai/firebase_ai/ios/firebase_ai/Package.swift b/packages/firebase_ai/firebase_ai/ios/firebase_ai/Package.swift index a9bd49d4e4d1..087f2530b1c1 100644 --- a/packages/firebase_ai/firebase_ai/ios/firebase_ai/Package.swift +++ b/packages/firebase_ai/firebase_ai/ios/firebase_ai/Package.swift @@ -10,10 +10,10 @@ import PackageDescription let package = Package( name: "firebase_ai", platforms: [ - .iOS("15.0") + .iOS("15.0"), ], products: [ - .library(name: "firebase-ai", targets: ["firebase_ai"]) + .library(name: "firebase-ai", targets: ["firebase_ai"]), ], dependencies: [], targets: [ @@ -21,8 +21,8 @@ let package = Package( name: "firebase_ai", dependencies: [], resources: [ - .process("Resources") + .process("Resources"), ] - ) + ), ] ) diff --git a/packages/firebase_ai/firebase_ai/macos/firebase_ai/Package.swift b/packages/firebase_ai/firebase_ai/macos/firebase_ai/Package.swift index c551b27e41a6..5440873b51b2 100644 --- a/packages/firebase_ai/firebase_ai/macos/firebase_ai/Package.swift +++ b/packages/firebase_ai/firebase_ai/macos/firebase_ai/Package.swift @@ -10,10 +10,10 @@ import PackageDescription let package = Package( name: "firebase_ai", platforms: [ - .macOS("10.15") + .macOS("10.15"), ], products: [ - .library(name: "firebase-ai", targets: ["firebase_ai"]) + .library(name: "firebase-ai", targets: ["firebase_ai"]), ], dependencies: [], targets: [ @@ -21,8 +21,8 @@ let package = Package( name: "firebase_ai", dependencies: [], resources: [ - .process("Resources") + .process("Resources"), ] - ) + ), ] ) 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..68449c9b28b4 100644 --- a/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Package.swift +++ b/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Package.swift @@ -18,10 +18,10 @@ let analyticsProduct = useWithoutAdId ? "FirebaseAnalyticsCore" : "FirebaseAnaly let package = Package( name: "firebase_analytics", platforms: [ - .iOS("15.0") + .iOS("15.0"), ], products: [ - .library(name: "firebase-analytics", targets: ["firebase_analytics"]) + .library(name: "firebase-analytics", targets: ["firebase_analytics"]), ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -35,8 +35,8 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources") + .process("Resources"), ] - ) + ), ] ) diff --git a/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Sources/firebase_analytics/FirebaseAnalyticsMessages.g.swift b/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Sources/firebase_analytics/FirebaseAnalyticsMessages.g.swift index c3a557049cc0..783b48483039 100644 --- a/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Sources/firebase_analytics/FirebaseAnalyticsMessages.g.swift +++ b/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Sources/firebase_analytics/FirebaseAnalyticsMessages.g.swift @@ -259,25 +259,20 @@ class FirebaseAnalyticsMessagesPigeonCodec: FlutterStandardMessageCodec, @unchec protocol FirebaseAnalyticsHostApi { func logEvent(event: [String: Any?], completion: @escaping (Result) -> Void) func setUserId(userId: String?, completion: @escaping (Result) -> Void) - func setUserProperty( - name: String, value: String?, - completion: @escaping (Result) -> Void) - func setAnalyticsCollectionEnabled( - enabled: Bool, - completion: @escaping (Result) -> Void) + func setUserProperty(name: String, value: String?, + completion: @escaping (Result) -> Void) + func setAnalyticsCollectionEnabled(enabled: Bool, + completion: @escaping (Result) -> Void) func resetAnalyticsData(completion: @escaping (Result) -> Void) - func setSessionTimeoutDuration( - timeout: Int64, - completion: @escaping (Result) -> Void) + func setSessionTimeoutDuration(timeout: Int64, + completion: @escaping (Result) -> Void) func setConsent(consent: [String: Bool?], completion: @escaping (Result) -> Void) - func setDefaultEventParameters( - parameters: [String: Any?]?, - completion: @escaping (Result) -> Void) + func setDefaultEventParameters(parameters: [String: Any?]?, + completion: @escaping (Result) -> Void) func getAppInstanceId(completion: @escaping (Result) -> Void) func getSessionId(completion: @escaping (Result) -> Void) - func initiateOnDeviceConversionMeasurement( - arguments: [String: String?], - completion: @escaping (Result) -> Void) + func initiateOnDeviceConversionMeasurement(arguments: [String: String?], + completion: @escaping (Result) -> Void) func logTransaction(transactionId: String, completion: @escaping (Result) -> Void) } @@ -289,14 +284,12 @@ class FirebaseAnalyticsHostApiSetup { /// Sets up an instance of `FirebaseAnalyticsHostApi` to handle messages through the /// `binaryMessenger`. - static func setUp( - binaryMessenger: FlutterBinaryMessenger, api: FirebaseAnalyticsHostApi?, - messageChannelSuffix: String = "" - ) { + static func setUp(binaryMessenger: FlutterBinaryMessenger, api: FirebaseAnalyticsHostApi?, + messageChannelSuffix: String = "") { let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" let logEventChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.logEvent\(channelSuffix)", + "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.logEvent\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -318,7 +311,7 @@ class FirebaseAnalyticsHostApiSetup { } let setUserIdChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.setUserId\(channelSuffix)", + "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.setUserId\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -340,7 +333,7 @@ class FirebaseAnalyticsHostApiSetup { } let setUserPropertyChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.setUserProperty\(channelSuffix)", + "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.setUserProperty\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -363,7 +356,7 @@ class FirebaseAnalyticsHostApiSetup { } let setAnalyticsCollectionEnabledChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.setAnalyticsCollectionEnabled\(channelSuffix)", + "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.setAnalyticsCollectionEnabled\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -385,7 +378,7 @@ class FirebaseAnalyticsHostApiSetup { } let resetAnalyticsDataChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.resetAnalyticsData\(channelSuffix)", + "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.resetAnalyticsData\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -405,7 +398,7 @@ class FirebaseAnalyticsHostApiSetup { } let setSessionTimeoutDurationChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.setSessionTimeoutDuration\(channelSuffix)", + "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.setSessionTimeoutDuration\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -427,7 +420,7 @@ class FirebaseAnalyticsHostApiSetup { } let setConsentChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.setConsent\(channelSuffix)", + "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.setConsent\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -449,7 +442,7 @@ class FirebaseAnalyticsHostApiSetup { } let setDefaultEventParametersChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.setDefaultEventParameters\(channelSuffix)", + "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.setDefaultEventParameters\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -471,7 +464,7 @@ class FirebaseAnalyticsHostApiSetup { } let getAppInstanceIdChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.getAppInstanceId\(channelSuffix)", + "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.getAppInstanceId\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -491,7 +484,7 @@ class FirebaseAnalyticsHostApiSetup { } let getSessionIdChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.getSessionId\(channelSuffix)", + "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.getSessionId\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -511,7 +504,7 @@ class FirebaseAnalyticsHostApiSetup { } let initiateOnDeviceConversionMeasurementChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.initiateOnDeviceConversionMeasurement\(channelSuffix)", + "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.initiateOnDeviceConversionMeasurement\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -533,7 +526,7 @@ class FirebaseAnalyticsHostApiSetup { } let logTransactionChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.logTransaction\(channelSuffix)", + "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.logTransaction\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) diff --git a/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Sources/firebase_analytics/FirebaseAnalyticsPlugin.swift b/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Sources/firebase_analytics/FirebaseAnalyticsPlugin.swift index 96b5921f88b0..9f36574f635b 100644 --- a/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Sources/firebase_analytics/FirebaseAnalyticsPlugin.swift +++ b/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Sources/firebase_analytics/FirebaseAnalyticsPlugin.swift @@ -34,8 +34,7 @@ let FLTFirebaseAnalyticsChannelName = "plugins.flutter.io/firebase_analytics" extension FlutterError: Error {} public class FirebaseAnalyticsPlugin: NSObject, FLTFirebasePluginProtocol, FlutterPlugin, - FirebaseAnalyticsHostApi -{ + FirebaseAnalyticsHostApi { public static func register(with registrar: any FlutterPluginRegistrar) { let binaryMessenger: FlutterBinaryMessenger @@ -64,18 +63,14 @@ public class FirebaseAnalyticsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt completion(.success(())) } - func setUserProperty( - name: String, value: String?, - completion: @escaping (Result) -> Void - ) { + func setUserProperty(name: String, value: String?, + completion: @escaping (Result) -> Void) { Analytics.setUserProperty(value, forName: name) completion(.success(())) } - func setAnalyticsCollectionEnabled( - enabled: Bool, - completion: @escaping (Result) -> Void - ) { + func setAnalyticsCollectionEnabled(enabled: Bool, + completion: @escaping (Result) -> Void) { Analytics.setAnalyticsCollectionEnabled(enabled) completion(.success(())) } @@ -85,18 +80,14 @@ public class FirebaseAnalyticsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt completion(.success(())) } - func setSessionTimeoutDuration( - timeout: Int64, - completion: @escaping (Result) -> Void - ) { + func setSessionTimeoutDuration(timeout: Int64, + completion: @escaping (Result) -> Void) { Analytics.setSessionTimeoutInterval(TimeInterval(timeout)) completion(.success(())) } - func setConsent( - consent: [String: Bool?], - completion: @escaping (Result) -> Void - ) { + func setConsent(consent: [String: Bool?], + completion: @escaping (Result) -> Void) { var parameters: [ConsentType: ConsentStatus] = [:] if let adStorage = consent[kFLTFirebaseAnalyticsAdStorageConsentGranted] as? Bool { parameters[.adStorage] = adStorage ? .granted : .denied @@ -105,8 +96,7 @@ public class FirebaseAnalyticsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt parameters[.analyticsStorage] = analyticsStorage ? .granted : .denied } if let adPersonalization = - consent[kFLTFirebaseAdPersonalizationSignalsConsentGranted] as? Bool - { + consent[kFLTFirebaseAdPersonalizationSignalsConsentGranted] as? Bool { parameters[.adPersonalization] = adPersonalization ? .granted : .denied } if let adUserData = consent[kFLTFirebaseAdUserDataConsentGranted] as? Bool { @@ -116,10 +106,8 @@ public class FirebaseAnalyticsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt completion(.success(())) } - func setDefaultEventParameters( - parameters: [String: Any?]?, - completion: @escaping (Result) -> Void - ) { + func setDefaultEventParameters(parameters: [String: Any?]?, + completion: @escaping (Result) -> Void) { Analytics.setDefaultEventParameters(parameters) completion(.success(())) } @@ -139,12 +127,10 @@ public class FirebaseAnalyticsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt } } - func initiateOnDeviceConversionMeasurement( - arguments: [String: String?], - completion: - @escaping (Result) - -> Void - ) { + func initiateOnDeviceConversionMeasurement(arguments: [String: String?], + completion: + @escaping (Result) + -> Void) { if let emailAddress = arguments["emailAddress"] as? String { Analytics.initiateOnDeviceConversionMeasurement(emailAddress: emailAddress) } @@ -152,22 +138,18 @@ public class FirebaseAnalyticsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt Analytics.initiateOnDeviceConversionMeasurement(phoneNumber: phoneNumber) } if let hashedEmailAddress = arguments["hashedEmailAddress"] as? String, - let data = hexStringToData(hashedEmailAddress) - { + let data = hexStringToData(hashedEmailAddress) { Analytics.initiateOnDeviceConversionMeasurement(hashedEmailAddress: data) } if let hashedPhoneNumber = arguments["hashedPhoneNumber"] as? String, - let data = hexStringToData(hashedPhoneNumber) - { + let data = hexStringToData(hashedPhoneNumber) { Analytics.initiateOnDeviceConversionMeasurement(hashedPhoneNumber: data) } completion(.success(())) } - func logTransaction( - transactionId: String, - completion: @escaping (Result) -> Void - ) { + func logTransaction(transactionId: String, + completion: @escaping (Result) -> Void) { #if os(macOS) if #available(macOS 12.0, *) { logTransactionWithStoreKit(transactionId: transactionId, completion: completion) @@ -204,10 +186,8 @@ public class FirebaseAnalyticsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt #else @available(iOS 15.0, *) #endif - private func logTransactionWithStoreKit( - transactionId: String, - completion: @escaping (Result) -> Void - ) { + private func logTransactionWithStoreKit(transactionId: String, + completion: @escaping (Result) -> Void) { Task { do { guard let id = UInt64(transactionId) else { @@ -264,9 +244,9 @@ public class FirebaseAnalyticsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt var data = Data(capacity: length / 2) var index = hexString.startIndex - for _ in 0..<(length / 2) { + for _ in 0 ..< (length / 2) { let nextIndex = hexString.index(index, offsetBy: 2) - guard let byte = UInt8(hexString[index.."), 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,56 +66,57 @@ 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?, - completion: @escaping (Result) -> Void) - func getToken( - appName: String, forceRefresh: Bool, completion: @escaping (Result) -> Void) - func setTokenAutoRefreshEnabled( - appName: String, isTokenAutoRefreshEnabled: Bool, - completion: @escaping (Result) -> Void) + func activate(appName: String, androidProvider: String?, appleProvider: String?, + debugToken: String?, + completion: @escaping (Result) -> Void) + func getToken(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) + func getLimitedUseAppCheckToken(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 func setUp( - binaryMessenger: FlutterBinaryMessenger, api: FirebaseAppCheckHostApi?, - messageChannelSuffix: String = "" - ) { + 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 = "") { let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" let activateChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_app_check_platform_interface.FirebaseAppCheckHostApi.activate\(channelSuffix)", - binaryMessenger: binaryMessenger, codec: codec) - if let api = api { + "dev.flutter.pigeon.firebase_app_check_platform_interface.FirebaseAppCheckHostApi.activate\(channelSuffix)", + binaryMessenger: binaryMessenger, codec: codec + ) + if let api { activateChannel.setMessageHandler { message, reply in let args = message as! [Any?] let appNameArg = args[0] as! String @@ -140,9 +140,10 @@ 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 { + "dev.flutter.pigeon.firebase_app_check_platform_interface.FirebaseAppCheckHostApi.getToken\(channelSuffix)", + binaryMessenger: binaryMessenger, codec: codec + ) + if let api { getTokenChannel.setMessageHandler { message, reply in let args = message as! [Any?] let appNameArg = args[0] as! String @@ -161,9 +162,10 @@ 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 { + "dev.flutter.pigeon.firebase_app_check_platform_interface.FirebaseAppCheckHostApi.setTokenAutoRefreshEnabled\(channelSuffix)", + binaryMessenger: binaryMessenger, codec: codec + ) + if let api { setTokenAutoRefreshEnabledChannel.setMessageHandler { message, reply in let args = message as! [Any?] let appNameArg = args[0] as! String @@ -184,9 +186,10 @@ 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 { + "dev.flutter.pigeon.firebase_app_check_platform_interface.FirebaseAppCheckHostApi.registerTokenListener\(channelSuffix)", + binaryMessenger: binaryMessenger, codec: codec + ) + if let api { registerTokenListenerChannel.setMessageHandler { message, reply in let args = message as! [Any?] let appNameArg = args[0] as! String @@ -204,9 +207,10 @@ 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 { + "dev.flutter.pigeon.firebase_app_check_platform_interface.FirebaseAppCheckHostApi.getLimitedUseAppCheckToken\(channelSuffix)", + 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/ios/firebase_app_check/Sources/firebase_app_check/FirebaseAppCheckPlugin.swift b/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Sources/firebase_app_check/FirebaseAppCheckPlugin.swift index 2d63a7652e18..a20e7f84640e 100644 --- a/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Sources/firebase_app_check/FirebaseAppCheckPlugin.swift +++ b/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Sources/firebase_app_check/FirebaseAppCheckPlugin.swift @@ -24,8 +24,7 @@ let kFirebaseAppCheckTokenChannelPrefix = "plugins.flutter.io/firebase_app_check extension FlutterError: @retroactive Error {} public class FirebaseAppCheckPlugin: NSObject, FlutterPlugin, - FLTFirebasePluginProtocol, FirebaseAppCheckHostApi -{ + FLTFirebasePluginProtocol, FirebaseAppCheckHostApi { private var eventChannels: [String: FlutterEventChannel] = [:] private var streamHandlers: [String: AppCheckTokenStreamHandler] = [:] private var providerFactory: FlutterAppCheckProviderFactory? @@ -62,11 +61,9 @@ public class FirebaseAppCheckPlugin: NSObject, FlutterPlugin, private var binaryMessenger: FlutterBinaryMessenger? - func activate( - appName: String, androidProvider: String?, appleProvider: String?, - debugToken: String?, - completion: @escaping (Result) -> Void - ) { + func activate(appName: String, androidProvider: String?, appleProvider: String?, + debugToken: String?, + completion: @escaping (Result) -> Void) { guard let app = FLTFirebasePlugin.firebaseAppNamed(appName) else { completion( .failure( @@ -88,12 +85,10 @@ public class FirebaseAppCheckPlugin: NSObject, FlutterPlugin, completion(.success(())) } - func getToken( - appName: String, forceRefresh: Bool, - completion: @escaping (Result) -> Void - ) { + func getToken(appName: String, forceRefresh: Bool, + completion: @escaping (Result) -> Void) { guard let app = FLTFirebasePlugin.firebaseAppNamed(appName), - let appCheck = AppCheck.appCheck(app: app) + let appCheck = AppCheck.appCheck(app: app) else { completion( .failure( @@ -114,12 +109,10 @@ public class FirebaseAppCheckPlugin: NSObject, FlutterPlugin, } } - func setTokenAutoRefreshEnabled( - appName: String, isTokenAutoRefreshEnabled: Bool, - completion: @escaping (Result) -> Void - ) { + func setTokenAutoRefreshEnabled(appName: String, isTokenAutoRefreshEnabled: Bool, + completion: @escaping (Result) -> Void) { guard let app = FLTFirebasePlugin.firebaseAppNamed(appName), - let appCheck = AppCheck.appCheck(app: app) + let appCheck = AppCheck.appCheck(app: app) else { completion( .failure( @@ -134,10 +127,8 @@ public class FirebaseAppCheckPlugin: NSObject, FlutterPlugin, completion(.success(())) } - func registerTokenListener( - appName: String, - completion: @escaping (Result) -> Void - ) { + func registerTokenListener(appName: String, + completion: @escaping (Result) -> Void) { let name = kFirebaseAppCheckTokenChannelPrefix + appName guard let messenger = binaryMessenger else { @@ -163,12 +154,10 @@ public class FirebaseAppCheckPlugin: NSObject, FlutterPlugin, completion(.success(name)) } - func getLimitedUseAppCheckToken( - appName: String, - completion: @escaping (Result) -> Void - ) { + func getLimitedUseAppCheckToken(appName: String, + completion: @escaping (Result) -> Void) { guard let app = FLTFirebasePlugin.firebaseAppNamed(appName), - let appCheck = AppCheck.appCheck(app: app) + let appCheck = AppCheck.appCheck(app: app) else { completion( .failure( @@ -223,13 +212,13 @@ public class FirebaseAppCheckPlugin: NSObject, FlutterPlugin, let nsError = error as NSError var code = "unknown" switch nsError.code { - case 0: // FIRAppCheckErrorCodeServerUnreachable + case 0: // FIRAppCheckErrorCodeServerUnreachable code = "server-unreachable" - case 1: // FIRAppCheckErrorCodeInvalidConfiguration + case 1: // FIRAppCheckErrorCodeInvalidConfiguration code = "invalid-configuration" - case 2: // FIRAppCheckErrorCodeKeychain + case 2: // FIRAppCheckErrorCodeKeychain code = "code-keychain" - case 3: // FIRAppCheckErrorCodeUnsupported + case 3: // FIRAppCheckErrorCodeUnsupported code = "code-unsupported" default: code = "unknown" @@ -247,10 +236,8 @@ public class FirebaseAppCheckPlugin: NSObject, FlutterPlugin, class AppCheckTokenStreamHandler: NSObject, FlutterStreamHandler { private var observer: NSObjectProtocol? - func onListen( - withArguments arguments: Any?, - eventSink events: @escaping FlutterEventSink - ) -> FlutterError? { + func onListen(withArguments arguments: Any?, + eventSink events: @escaping FlutterEventSink) -> FlutterError? { observer = NotificationCenter.default.addObserver( forName: NSNotification.Name("FIRAppCheckAppCheckTokenDidChangeNotification"), object: nil, @@ -291,11 +278,9 @@ class FlutterAppCheckProviderFactory: NSObject, AppCheckProviderFactory { return providers[app.name] } - func configure( - app: FirebaseApp, - providerName: String, - debugToken: String? - ) { + func configure(app: FirebaseApp, + providerName: String, + debugToken: String?) { if providers[app.name] == nil { providers[app.name] = AppCheckProviderWrapper() } @@ -310,11 +295,9 @@ class FlutterAppCheckProviderFactory: NSObject, AppCheckProviderFactory { class AppCheckProviderWrapper: NSObject, AppCheckProvider { private var delegateProvider: (any AppCheckProvider)? - func configure( - app: FirebaseApp, - providerName: String, - debugToken: String? - ) { + func configure(app: FirebaseApp, + providerName: String, + debugToken: String?) { switch providerName { case "debug": if let debugToken { 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..25cc1e541648 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 @@ -12,10 +12,10 @@ let firebaseSdkVersion: Version = "12.14.0" let package = Package( name: "firebase_app_check", platforms: [ - .macOS("10.15") + .macOS("10.15"), ], products: [ - .library(name: "firebase-app-check", targets: ["firebase_app_check"]) + .library(name: "firebase-app-check", targets: ["firebase_app_check"]), ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -29,8 +29,8 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources") + .process("Resources"), ] - ) + ), ] ) 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..8a1b7d4483f5 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 @@ -12,10 +12,10 @@ let firebaseSdkVersion: Version = "12.14.0" let package = Package( name: "firebase_app_installations", platforms: [ - .iOS("15.0") + .iOS("15.0"), ], products: [ - .library(name: "firebase-app-installations", targets: ["firebase_app_installations"]) + .library(name: "firebase-app-installations", targets: ["firebase_app_installations"]), ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -29,8 +29,8 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources") + .process("Resources"), ] - ) + ), ] ) diff --git a/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Sources/firebase_app_installations/FirebaseInstallationsPlugin.swift b/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Sources/firebase_app_installations/FirebaseInstallationsPlugin.swift index eb1d365a1f7e..7d5a0c426033 100644 --- a/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Sources/firebase_app_installations/FirebaseInstallationsPlugin.swift +++ b/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Sources/firebase_app_installations/FirebaseInstallationsPlugin.swift @@ -76,10 +76,8 @@ public class FirebaseInstallationsPlugin: NSObject, FLTFirebasePluginProtocol, F /// - Parameter arguments: the arguments passed by the Dart calling method /// - Parameter result: the result instance used to send the result to Dart. /// - Parameter errorBlock: the error block used to send the error to Dart. - private func getId( - arguments: NSDictionary, result: @escaping FlutterResult, - errorBlock: @escaping FLTFirebaseMethodCallErrorBlock - ) { + private func getId(arguments: NSDictionary, result: @escaping FlutterResult, + errorBlock: @escaping FLTFirebaseMethodCallErrorBlock) { let instance = getInstallations(appName: arguments["appName"] as! String) instance.installationID { (id: String?, error: Error?) in if let error { @@ -94,10 +92,8 @@ public class FirebaseInstallationsPlugin: NSObject, FLTFirebasePluginProtocol, F /// - Parameter arguments: the arguments passed by the Dart calling method /// - Parameter result: the result instance used to send the result to Dart. /// - Parameter errorBlock: the error block used to send the error to Dart. - private func deleteId( - arguments: NSDictionary, result: @escaping FlutterResult, - errorBlock: @escaping FLTFirebaseMethodCallErrorBlock - ) { + private func deleteId(arguments: NSDictionary, result: @escaping FlutterResult, + errorBlock: @escaping FLTFirebaseMethodCallErrorBlock) { let instance = getInstallations(appName: arguments["appName"] as! String) instance.delete { (error: Error?) in if let error { @@ -112,18 +108,14 @@ public class FirebaseInstallationsPlugin: NSObject, FLTFirebasePluginProtocol, F /// - Parameter arguments: the arguments passed by the Dart calling method /// - Parameter result: the result instance used to send the result to Dart. /// - Parameter errorBlock: the error block used to send the error to Dart. - private func getToken( - arguments: NSDictionary, result: @escaping FlutterResult, - errorBlock: @escaping FLTFirebaseMethodCallErrorBlock - ) { + private func getToken(arguments: NSDictionary, result: @escaping FlutterResult, + errorBlock: @escaping FLTFirebaseMethodCallErrorBlock) { let instance = getInstallations(appName: arguments["appName"] as! String) let forceRefresh = arguments["forceRefresh"] as? Bool ?? false instance .authTokenForcingRefresh(forceRefresh) { - ( - tokenResult: InstallationsAuthTokenResult?, - error: Error? - ) in + (tokenResult: InstallationsAuthTokenResult?, + error: Error?) in if let error { errorBlock(nil, nil, nil, error) } else { @@ -136,10 +128,8 @@ public class FirebaseInstallationsPlugin: NSObject, FLTFirebasePluginProtocol, F /// - Parameter arguments: the arguments passed by the Dart calling method /// - Parameter result: the result instance used to send the result to Dart. /// - Parameter errorBlock: the error block used to send the error to Dart. - private func registerIdChangeListener( - arguments: NSDictionary, result: @escaping FlutterResult, - errorBlock: @escaping FLTFirebaseMethodCallErrorBlock - ) { + private func registerIdChangeListener(arguments: NSDictionary, result: @escaping FlutterResult, + errorBlock: @escaping FLTFirebaseMethodCallErrorBlock) { let instance = getInstallations(appName: arguments["appName"] as! String) let appName = arguments["appName"] as! String let eventChannelName = kFLTFirebaseInstallationsChannelName + "/token/" + appName @@ -188,19 +178,17 @@ public class FirebaseInstallationsPlugin: NSObject, FLTFirebasePluginProtocol, F } let errorBlock: FLTFirebaseMethodCallErrorBlock = { - ( - code, message, details, - error: Error? - ) in + (code, message, details, + error: Error?) in var errorDetails = [String: Any?]() errorDetails["code"] = code - ?? self - .mapInstallationsErrorCodes(code: UInt((error! as NSError).code)) + ?? self + .mapInstallationsErrorCodes(code: UInt((error! as NSError).code)) errorDetails["message"] = message ?? error? - .localizedDescription ?? "An unknown error has occurred." + .localizedDescription ?? "An unknown error has occurred." errorDetails["additionalData"] = details if code == "unknown" { diff --git a/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Sources/firebase_app_installations/IdChangedStreamHandler.swift b/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Sources/firebase_app_installations/IdChangedStreamHandler.swift index 89f9cbc2e4e9..30790c94adf5 100644 --- a/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Sources/firebase_app_installations/IdChangedStreamHandler.swift +++ b/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Sources/firebase_app_installations/IdChangedStreamHandler.swift @@ -47,10 +47,8 @@ class IdChangedStreamHandler: NSObject, FlutterStreamHandler { } } - func onListen( - withArguments _: Any?, - eventSink events: @escaping FlutterEventSink - ) -> FlutterError? { + func onListen(withArguments _: Any?, + eventSink events: @escaping FlutterEventSink) -> FlutterError? { eventSink = events installationIDObserver = NotificationCenter.default.addObserver( 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..50e0f1becf79 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 @@ -12,10 +12,10 @@ let firebaseSdkVersion: Version = "12.14.0" let package = Package( name: "firebase_app_installations", platforms: [ - .macOS("10.15") + .macOS("10.15"), ], products: [ - .library(name: "firebase-app-installations", targets: ["firebase_app_installations"]) + .library(name: "firebase-app-installations", targets: ["firebase_app_installations"]), ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -29,8 +29,8 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources") + .process("Resources"), ] - ) + ), ] ) 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..2a8e0d0ae70d 100644 --- a/packages/firebase_auth/firebase_auth/ios/firebase_auth/Package.swift +++ b/packages/firebase_auth/firebase_auth/ios/firebase_auth/Package.swift @@ -13,10 +13,10 @@ let firebaseSdkVersion: Version = "12.14.0" let package = Package( name: "firebase_auth", platforms: [ - .iOS("15.0") + .iOS("15.0"), ], products: [ - .library(name: "firebase-auth", targets: ["firebase_auth"]) + .library(name: "firebase-auth", targets: ["firebase_auth"]), ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,7 +30,7 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources") + .process("Resources"), ], cSettings: [ .headerSearchPath("include/Private"), @@ -38,6 +38,6 @@ let package = Package( .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-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..c7b91fdddac9 100644 --- a/packages/firebase_auth/firebase_auth/macos/firebase_auth/Package.swift +++ b/packages/firebase_auth/firebase_auth/macos/firebase_auth/Package.swift @@ -13,10 +13,10 @@ let firebaseSdkVersion: Version = "12.14.0" let package = Package( name: "firebase_auth", platforms: [ - .macOS("10.15") + .macOS("10.15"), ], products: [ - .library(name: "firebase-auth", targets: ["firebase_auth"]) + .library(name: "firebase-auth", targets: ["firebase_auth"]), ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,7 +30,7 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources") + .process("Resources"), ], cSettings: [ .headerSearchPath("include/Private"), @@ -38,6 +38,6 @@ let package = Package( .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-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..dd6e941b2e14 100644 --- a/packages/firebase_core/firebase_core/ios/firebase_core/Package.swift +++ b/packages/firebase_core/firebase_core/ios/firebase_core/Package.swift @@ -13,29 +13,29 @@ let firebaseSdkVersion: Version = "12.14.0" let package = Package( name: "firebase_core", platforms: [ - .iOS("15.0") + .iOS("15.0"), ], products: [ - .library(name: "firebase-core", targets: ["firebase_core"]) + .library(name: "firebase-core", targets: ["firebase_core"]), ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion) + .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), ], targets: [ .target( name: "firebase_core", dependencies: [ // No product for firebase-core so we pull in the smallest one - .product(name: "FirebaseInstallations", package: "firebase-ios-sdk") + .product(name: "FirebaseInstallations", package: "firebase-ios-sdk"), ], resources: [ - .process("Resources") + .process("Resources"), ], cSettings: [ .headerSearchPath("include/firebase_core"), .define("LIBRARY_VERSION", to: "\"\(libraryVersionString)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-core\""), ] - ) + ), ] ) 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..c4f5b1d824bd 100644 --- a/packages/firebase_core/firebase_core/macos/firebase_core/Package.swift +++ b/packages/firebase_core/firebase_core/macos/firebase_core/Package.swift @@ -13,29 +13,29 @@ let firebaseSdkVersion: Version = "12.14.0" let package = Package( name: "firebase_core", platforms: [ - .macOS("10.15") + .macOS("10.15"), ], products: [ - .library(name: "firebase-core", targets: ["firebase_core"]) + .library(name: "firebase-core", targets: ["firebase_core"]), ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion) + .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), ], targets: [ .target( name: "firebase_core", dependencies: [ // No product for firebase-core so we pull in the smallest one - .product(name: "FirebaseInstallations", package: "firebase-ios-sdk") + .product(name: "FirebaseInstallations", package: "firebase-ios-sdk"), ], resources: [ - .process("Resources") + .process("Resources"), ], cSettings: [ .headerSearchPath("include/firebase_core"), .define("LIBRARY_VERSION", to: "\"\(libraryVersionString)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-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..8da7bfa21e4c 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/ios/firebase_crashlytics/Package.swift +++ b/packages/firebase_crashlytics/firebase_crashlytics/ios/firebase_crashlytics/Package.swift @@ -13,10 +13,10 @@ let firebaseSdkVersion: Version = "12.14.0" let package = Package( name: "firebase_crashlytics", platforms: [ - .iOS("15.0") + .iOS("15.0"), ], products: [ - .library(name: "firebase-crashlytics", targets: ["firebase_crashlytics"]) + .library(name: "firebase-crashlytics", targets: ["firebase_crashlytics"]), ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,13 +30,13 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources") + .process("Resources"), ], cSettings: [ .headerSearchPath("include"), .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-cls\""), ] - ) + ), ] ) 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..8571c01a2aaa 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/macos/firebase_crashlytics/Package.swift +++ b/packages/firebase_crashlytics/firebase_crashlytics/macos/firebase_crashlytics/Package.swift @@ -13,10 +13,10 @@ let firebaseSdkVersion: Version = "12.14.0" let package = Package( name: "firebase_crashlytics", platforms: [ - .macOS("10.15") + .macOS("10.15"), ], products: [ - .library(name: "firebase-crashlytics", targets: ["firebase_crashlytics"]) + .library(name: "firebase-crashlytics", targets: ["firebase_crashlytics"]), ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,13 +30,13 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources") + .process("Resources"), ], cSettings: [ .headerSearchPath("include"), .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-cls\""), ] - ) + ), ] ) 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..1c856cc6836f 100644 --- a/packages/firebase_database/firebase_database/ios/firebase_database/Package.swift +++ b/packages/firebase_database/firebase_database/ios/firebase_database/Package.swift @@ -13,10 +13,10 @@ let firebaseSdkVersion: Version = "12.14.0" let package = Package( name: "firebase_database", platforms: [ - .iOS("15.0") + .iOS("15.0"), ], products: [ - .library(name: "firebase-database", targets: ["firebase_database"]) + .library(name: "firebase-database", targets: ["firebase_database"]), ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,13 +30,13 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources") + .process("Resources"), ], cSettings: [ .headerSearchPath("include"), .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-rtdb\""), ] - ) + ), ] ) diff --git a/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabaseObserveStreamHandler.swift b/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabaseObserveStreamHandler.swift index 86029a6d5d39..4b147e49db5b 100644 --- a/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabaseObserveStreamHandler.swift +++ b/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabaseObserveStreamHandler.swift @@ -22,17 +22,16 @@ import FirebaseDatabase } func onListen(withArguments arguments: Any?, eventSink events: @escaping FlutterEventSink) - -> FlutterError? - { + -> FlutterError? { guard let args = arguments as? [String: Any], - let eventTypeString = args["eventType"] as? String + let eventTypeString = args["eventType"] as? String else { return nil } let observeBlock: (DataSnapshot, String?) -> Void = { [weak self] snapshot, previousChildKey in var eventDictionary: [String: Any] = [ - "eventType": eventTypeString + "eventType": eventTypeString, ] let snapshotDict = FLTFirebaseDatabaseUtils.dictionary( diff --git a/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabasePlugin.swift b/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabasePlugin.swift index d94bc937593f..bd340420004c 100644 --- a/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabasePlugin.swift +++ b/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabasePlugin.swift @@ -24,8 +24,7 @@ let FLTFirebaseDatabaseChannelName = "plugins.flutter.io/firebase_database" @objc(FLTFirebaseDatabasePlugin) public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePluginProtocol, - FirebaseDatabaseHostApi -{ + FirebaseDatabaseHostApi { private var binaryMessenger: FlutterBinaryMessenger private static var cachedDatabaseInstances: [String: Database] = [:] private var streamHandlers: [String: FLTFirebaseDatabaseObserveStreamHandler] = [:] @@ -105,28 +104,22 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug // MARK: - Database Management - func goOnline( - app: DatabasePigeonFirebaseApp, - completion: @escaping (Result) -> Void - ) { + func goOnline(app: DatabasePigeonFirebaseApp, + completion: @escaping (Result) -> Void) { let database = getDatabaseFromPigeonApp(app) database.goOnline() completion(.success(())) } - func goOffline( - app: DatabasePigeonFirebaseApp, - completion: @escaping (Result) -> Void - ) { + func goOffline(app: DatabasePigeonFirebaseApp, + completion: @escaping (Result) -> Void) { let database = getDatabaseFromPigeonApp(app) database.goOffline() completion(.success(())) } - func setPersistenceEnabled( - app: DatabasePigeonFirebaseApp, enabled: Bool, - completion: @escaping (Result) -> Void - ) { + func setPersistenceEnabled(app: DatabasePigeonFirebaseApp, enabled: Bool, + completion: @escaping (Result) -> Void) { let instanceKey = app.appName + (app.databaseURL ?? "") if Self.cachedDatabaseInstances[instanceKey] != nil { completion(.success(())) @@ -138,10 +131,8 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug completion(.success(())) } - func setPersistenceCacheSizeBytes( - app: DatabasePigeonFirebaseApp, cacheSize: Int64, - completion: @escaping (Result) -> Void - ) { + func setPersistenceCacheSizeBytes(app: DatabasePigeonFirebaseApp, cacheSize: Int64, + completion: @escaping (Result) -> Void) { let instanceKey = app.appName + (app.databaseURL ?? "") if Self.cachedDatabaseInstances[instanceKey] != nil { completion(.success(())) @@ -157,47 +148,37 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug completion(.success(())) } - func setLoggingEnabled( - app: DatabasePigeonFirebaseApp, enabled: Bool, - completion: @escaping (Result) -> Void - ) { + func setLoggingEnabled(app: DatabasePigeonFirebaseApp, enabled: Bool, + completion: @escaping (Result) -> Void) { Database.setLoggingEnabled(enabled) completion(.success(())) } - func useDatabaseEmulator( - app: DatabasePigeonFirebaseApp, host: String, port: Int64, - completion: @escaping (Result) -> Void - ) { + func useDatabaseEmulator(app: DatabasePigeonFirebaseApp, host: String, port: Int64, + completion: @escaping (Result) -> Void) { let database = getDatabaseFromPigeonApp(app) database.useEmulator(withHost: host, port: Int(port)) completion(.success(())) } - func ref( - app: DatabasePigeonFirebaseApp, path: String?, - completion: @escaping (Result) -> Void - ) { + func ref(app: DatabasePigeonFirebaseApp, path: String?, + completion: @escaping (Result) -> Void) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(withPath: path ?? "") let result = DatabaseReferencePlatform(path: reference.url) completion(.success(result)) } - func refFromURL( - app: DatabasePigeonFirebaseApp, url: String, - completion: @escaping (Result) -> Void - ) { + func refFromURL(app: DatabasePigeonFirebaseApp, url: String, + completion: @escaping (Result) -> Void) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(fromURL: url) let result = DatabaseReferencePlatform(path: reference.url) completion(.success(result)) } - func purgeOutstandingWrites( - app: DatabasePigeonFirebaseApp, - completion: @escaping (Result) -> Void - ) { + func purgeOutstandingWrites(app: DatabasePigeonFirebaseApp, + completion: @escaping (Result) -> Void) { let database = getDatabaseFromPigeonApp(app) database.purgeOutstandingWrites() completion(.success(())) @@ -205,10 +186,8 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug // MARK: - Database Reference Operations - func databaseReferenceSet( - app: DatabasePigeonFirebaseApp, request: DatabaseReferenceRequest, - completion: @escaping (Result) -> Void - ) { + func databaseReferenceSet(app: DatabasePigeonFirebaseApp, request: DatabaseReferenceRequest, + completion: @escaping (Result) -> Void) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(withPath: request.path) @@ -221,11 +200,9 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug } } - func databaseReferenceSetWithPriority( - app: DatabasePigeonFirebaseApp, - request: DatabaseReferenceRequest, - completion: @escaping (Result) -> Void - ) { + func databaseReferenceSetWithPriority(app: DatabasePigeonFirebaseApp, + request: DatabaseReferenceRequest, + completion: @escaping (Result) -> Void) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(withPath: request.path) @@ -238,10 +215,8 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug } } - func databaseReferenceUpdate( - app: DatabasePigeonFirebaseApp, request: UpdateRequest, - completion: @escaping (Result) -> Void - ) { + func databaseReferenceUpdate(app: DatabasePigeonFirebaseApp, request: UpdateRequest, + completion: @escaping (Result) -> Void) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(withPath: request.path) @@ -256,11 +231,9 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug } } - func databaseReferenceSetPriority( - app: DatabasePigeonFirebaseApp, - request: DatabaseReferenceRequest, - completion: @escaping (Result) -> Void - ) { + func databaseReferenceSetPriority(app: DatabasePigeonFirebaseApp, + request: DatabaseReferenceRequest, + completion: @escaping (Result) -> Void) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(withPath: request.path) @@ -273,10 +246,8 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug } } - func databaseReferenceRunTransaction( - app: DatabasePigeonFirebaseApp, request: TransactionRequest, - completion: @escaping (Result) -> Void - ) { + func databaseReferenceRunTransaction(app: DatabasePigeonFirebaseApp, request: TransactionRequest, + completion: @escaping (Result) -> Void) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(withPath: request.path) @@ -341,12 +312,10 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug ) } - func databaseReferenceGetTransactionResult( - app: DatabasePigeonFirebaseApp, transactionKey: Int64, - completion: - @escaping (Result<[String: Any?], Error>) - -> Void - ) { + func databaseReferenceGetTransactionResult(app: DatabasePigeonFirebaseApp, transactionKey: Int64, + completion: + @escaping (Result<[String: Any?], Error>) + -> Void) { if let result = transactionResults.removeValue(forKey: transactionKey) { completion(.success(result)) } else { @@ -361,10 +330,8 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug // MARK: - OnDisconnect Operations - func onDisconnectSet( - app: DatabasePigeonFirebaseApp, request: DatabaseReferenceRequest, - completion: @escaping (Result) -> Void - ) { + func onDisconnectSet(app: DatabasePigeonFirebaseApp, request: DatabaseReferenceRequest, + completion: @escaping (Result) -> Void) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(withPath: request.path) @@ -377,11 +344,9 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug } } - func onDisconnectSetWithPriority( - app: DatabasePigeonFirebaseApp, - request: DatabaseReferenceRequest, - completion: @escaping (Result) -> Void - ) { + func onDisconnectSetWithPriority(app: DatabasePigeonFirebaseApp, + request: DatabaseReferenceRequest, + completion: @escaping (Result) -> Void) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(withPath: request.path) @@ -394,10 +359,8 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug } } - func onDisconnectUpdate( - app: DatabasePigeonFirebaseApp, request: UpdateRequest, - completion: @escaping (Result) -> Void - ) { + func onDisconnectUpdate(app: DatabasePigeonFirebaseApp, request: UpdateRequest, + completion: @escaping (Result) -> Void) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(withPath: request.path) @@ -412,10 +375,8 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug } } - func onDisconnectCancel( - app: DatabasePigeonFirebaseApp, path: String, - completion: @escaping (Result) -> Void - ) { + func onDisconnectCancel(app: DatabasePigeonFirebaseApp, path: String, + completion: @escaping (Result) -> Void) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(withPath: path) @@ -430,10 +391,8 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug // MARK: - Query Operations - func queryObserve( - app: DatabasePigeonFirebaseApp, request: QueryRequest, - completion: @escaping (Result) -> Void - ) { + func queryObserve(app: DatabasePigeonFirebaseApp, request: QueryRequest, + completion: @escaping (Result) -> Void) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(withPath: request.path) @@ -496,8 +455,7 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug case "limit": if let name = modifier["name"] as? String, - let limit = modifier["limit"] as? NSNumber - { + let limit = modifier["limit"] as? NSNumber { switch name { case "limitToFirst": query = query.queryLimited(toFirst: limit.uintValue) @@ -535,10 +493,8 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug completion(.success(channelName)) } - func queryKeepSynced( - app: DatabasePigeonFirebaseApp, request: QueryRequest, - completion: @escaping (Result) -> Void - ) { + func queryKeepSynced(app: DatabasePigeonFirebaseApp, request: QueryRequest, + completion: @escaping (Result) -> Void) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(withPath: request.path) @@ -601,8 +557,7 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug case "limit": if let name = modifier["name"] as? String, - let limit = modifier["limit"] as? NSNumber - { + let limit = modifier["limit"] as? NSNumber { switch name { case "limitToFirst": query = query.queryLimited(toFirst: limit.uintValue) @@ -625,10 +580,8 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug completion(.success(())) } - func queryGet( - app: DatabasePigeonFirebaseApp, request: QueryRequest, - completion: @escaping (Result<[String: Any?], Error>) -> Void - ) { + func queryGet(app: DatabasePigeonFirebaseApp, request: QueryRequest, + completion: @escaping (Result<[String: Any?], Error>) -> Void) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(withPath: request.path) @@ -702,8 +655,7 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug case "limit": if let name = modifier["name"] as? String, - let limit = modifier["limit"] as? NSNumber - { + let limit = modifier["limit"] as? NSNumber { switch name { case "limitToFirst": query = query.queryLimited(toFirst: limit.uintValue) @@ -766,8 +718,7 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug } if let emulatorHost = app.settings.emulatorHost, - let emulatorPort = app.settings.emulatorPort - { + let emulatorPort = app.settings.emulatorPort { database.useEmulator(withHost: emulatorHost, port: Int(emulatorPort)) } diff --git a/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabaseUtils.swift b/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabaseUtils.swift index c51f5ac67a2a..9561af721ff1 100644 --- a/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabaseUtils.swift +++ b/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabaseUtils.swift @@ -55,8 +55,7 @@ import Foundation } if let emulatorHost = arguments["emulatorHost"] as? String, - let emulatorPort = arguments["emulatorPort"] as? Int - { + let emulatorPort = arguments["emulatorPort"] as? Int { database.useEmulator(withHost: emulatorHost, port: emulatorPort) } @@ -70,10 +69,8 @@ import Foundation return database.reference(withPath: path) } - private static func databaseQuery( - _ query: DatabaseQuery, - applyLimitModifier modifier: [String: Any] - ) -> DatabaseQuery { + private static func databaseQuery(_ query: DatabaseQuery, + applyLimitModifier modifier: [String: Any]) -> DatabaseQuery { let name = modifier["name"] as? String ?? "" let limit = modifier["limit"] as? UInt ?? 0 @@ -87,10 +84,8 @@ import Foundation } } - private static func databaseQuery( - _ query: DatabaseQuery, - applyOrderModifier modifier: [String: Any] - ) -> DatabaseQuery { + private static func databaseQuery(_ query: DatabaseQuery, + applyOrderModifier modifier: [String: Any]) -> DatabaseQuery { let name = modifier["name"] as? String ?? "" switch name { @@ -108,10 +103,8 @@ import Foundation } } - private static func databaseQuery( - _ query: DatabaseQuery, - applyCursorModifier modifier: [String: Any] - ) -> DatabaseQuery { + private static func databaseQuery(_ query: DatabaseQuery, + applyCursorModifier modifier: [String: Any]) -> DatabaseQuery { let name = modifier["name"] as? String ?? "" let key = modifier["key"] as? String let value = modifier["value"] @@ -168,10 +161,8 @@ import Foundation return query } - static func dictionary( - from snapshot: DataSnapshot, - withPreviousChildKey previousChildKey: String? - ) -> [String: Any] { + static func dictionary(from snapshot: DataSnapshot, + withPreviousChildKey previousChildKey: String?) -> [String: Any] { [ "snapshot": dictionary(from: snapshot), "previousChildKey": previousChildKey ?? NSNull(), diff --git a/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FirebaseDatabaseMessages.g.swift b/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FirebaseDatabaseMessages.g.swift index 6a0fb0d765f5..7e305918fa93 100644 --- a/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FirebaseDatabaseMessages.g.swift +++ b/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FirebaseDatabaseMessages.g.swift @@ -304,7 +304,7 @@ struct DatabaseReferencePlatform: Hashable { func toList() -> [Any?] { [ - path + path, ] } @@ -623,74 +623,53 @@ class FirebaseDatabaseMessagesPigeonCodec: FlutterStandardMessageCodec, @uncheck /// Generated protocol from Pigeon that represents a handler of messages from Flutter. protocol FirebaseDatabaseHostApi { func goOnline(app: DatabasePigeonFirebaseApp, completion: @escaping (Result) -> Void) - func goOffline( - app: DatabasePigeonFirebaseApp, - completion: @escaping (Result) -> Void) - func setPersistenceEnabled( - app: DatabasePigeonFirebaseApp, enabled: Bool, - completion: @escaping (Result) -> Void) - func setPersistenceCacheSizeBytes( - app: DatabasePigeonFirebaseApp, cacheSize: Int64, - completion: @escaping (Result) -> Void) - func setLoggingEnabled( - app: DatabasePigeonFirebaseApp, enabled: Bool, - completion: @escaping (Result) -> Void) - func useDatabaseEmulator( - app: DatabasePigeonFirebaseApp, host: String, port: Int64, - completion: @escaping (Result) -> Void) - func ref( - app: DatabasePigeonFirebaseApp, path: String?, - completion: @escaping (Result) -> Void) - func refFromURL( - app: DatabasePigeonFirebaseApp, url: String, - completion: @escaping (Result) -> Void) - func purgeOutstandingWrites( - app: DatabasePigeonFirebaseApp, - completion: @escaping (Result) -> Void) - func databaseReferenceSet( - app: DatabasePigeonFirebaseApp, request: DatabaseReferenceRequest, - completion: @escaping (Result) -> Void) - func databaseReferenceSetWithPriority( - app: DatabasePigeonFirebaseApp, - request: DatabaseReferenceRequest, - completion: @escaping (Result) -> Void) - func databaseReferenceUpdate( - app: DatabasePigeonFirebaseApp, request: UpdateRequest, - completion: @escaping (Result) -> Void) - func databaseReferenceSetPriority( - app: DatabasePigeonFirebaseApp, - request: DatabaseReferenceRequest, - completion: @escaping (Result) -> Void) - func databaseReferenceRunTransaction( - app: DatabasePigeonFirebaseApp, request: TransactionRequest, - completion: @escaping (Result) -> Void) - func databaseReferenceGetTransactionResult( - app: DatabasePigeonFirebaseApp, transactionKey: Int64, - completion: - @escaping (Result<[String: Any?], Error>) - -> Void) - func onDisconnectSet( - app: DatabasePigeonFirebaseApp, request: DatabaseReferenceRequest, - completion: @escaping (Result) -> Void) - func onDisconnectSetWithPriority( - app: DatabasePigeonFirebaseApp, - request: DatabaseReferenceRequest, - completion: @escaping (Result) -> Void) - func onDisconnectUpdate( - app: DatabasePigeonFirebaseApp, request: UpdateRequest, - completion: @escaping (Result) -> Void) - func onDisconnectCancel( - app: DatabasePigeonFirebaseApp, path: String, - completion: @escaping (Result) -> Void) - func queryObserve( - app: DatabasePigeonFirebaseApp, request: QueryRequest, - completion: @escaping (Result) -> Void) - func queryKeepSynced( - app: DatabasePigeonFirebaseApp, request: QueryRequest, - completion: @escaping (Result) -> Void) - func queryGet( - app: DatabasePigeonFirebaseApp, request: QueryRequest, - completion: @escaping (Result<[String: Any?], Error>) -> Void) + func goOffline(app: DatabasePigeonFirebaseApp, + completion: @escaping (Result) -> Void) + func setPersistenceEnabled(app: DatabasePigeonFirebaseApp, enabled: Bool, + completion: @escaping (Result) -> Void) + func setPersistenceCacheSizeBytes(app: DatabasePigeonFirebaseApp, cacheSize: Int64, + completion: @escaping (Result) -> Void) + func setLoggingEnabled(app: DatabasePigeonFirebaseApp, enabled: Bool, + completion: @escaping (Result) -> Void) + func useDatabaseEmulator(app: DatabasePigeonFirebaseApp, host: String, port: Int64, + completion: @escaping (Result) -> Void) + func ref(app: DatabasePigeonFirebaseApp, path: String?, + completion: @escaping (Result) -> Void) + func refFromURL(app: DatabasePigeonFirebaseApp, url: String, + completion: @escaping (Result) -> Void) + func purgeOutstandingWrites(app: DatabasePigeonFirebaseApp, + completion: @escaping (Result) -> Void) + func databaseReferenceSet(app: DatabasePigeonFirebaseApp, request: DatabaseReferenceRequest, + completion: @escaping (Result) -> Void) + func databaseReferenceSetWithPriority(app: DatabasePigeonFirebaseApp, + request: DatabaseReferenceRequest, + completion: @escaping (Result) -> Void) + func databaseReferenceUpdate(app: DatabasePigeonFirebaseApp, request: UpdateRequest, + completion: @escaping (Result) -> Void) + func databaseReferenceSetPriority(app: DatabasePigeonFirebaseApp, + request: DatabaseReferenceRequest, + completion: @escaping (Result) -> Void) + func databaseReferenceRunTransaction(app: DatabasePigeonFirebaseApp, request: TransactionRequest, + completion: @escaping (Result) -> Void) + func databaseReferenceGetTransactionResult(app: DatabasePigeonFirebaseApp, transactionKey: Int64, + completion: + @escaping (Result<[String: Any?], Error>) + -> Void) + func onDisconnectSet(app: DatabasePigeonFirebaseApp, request: DatabaseReferenceRequest, + completion: @escaping (Result) -> Void) + func onDisconnectSetWithPriority(app: DatabasePigeonFirebaseApp, + request: DatabaseReferenceRequest, + completion: @escaping (Result) -> Void) + func onDisconnectUpdate(app: DatabasePigeonFirebaseApp, request: UpdateRequest, + completion: @escaping (Result) -> Void) + func onDisconnectCancel(app: DatabasePigeonFirebaseApp, path: String, + completion: @escaping (Result) -> Void) + func queryObserve(app: DatabasePigeonFirebaseApp, request: QueryRequest, + completion: @escaping (Result) -> Void) + func queryKeepSynced(app: DatabasePigeonFirebaseApp, request: QueryRequest, + completion: @escaping (Result) -> Void) + func queryGet(app: DatabasePigeonFirebaseApp, request: QueryRequest, + completion: @escaping (Result<[String: Any?], Error>) -> Void) } /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`. @@ -701,14 +680,12 @@ class FirebaseDatabaseHostApiSetup { /// Sets up an instance of `FirebaseDatabaseHostApi` to handle messages through the /// `binaryMessenger`. - static func setUp( - binaryMessenger: FlutterBinaryMessenger, api: FirebaseDatabaseHostApi?, - messageChannelSuffix: String = "" - ) { + static func setUp(binaryMessenger: FlutterBinaryMessenger, api: FirebaseDatabaseHostApi?, + messageChannelSuffix: String = "") { let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" let goOnlineChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.goOnline\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.goOnline\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -730,7 +707,7 @@ class FirebaseDatabaseHostApiSetup { } let goOfflineChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.goOffline\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.goOffline\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -752,7 +729,7 @@ class FirebaseDatabaseHostApiSetup { } let setPersistenceEnabledChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.setPersistenceEnabled\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.setPersistenceEnabled\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -775,7 +752,7 @@ class FirebaseDatabaseHostApiSetup { } let setPersistenceCacheSizeBytesChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.setPersistenceCacheSizeBytes\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.setPersistenceCacheSizeBytes\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -798,7 +775,7 @@ class FirebaseDatabaseHostApiSetup { } let setLoggingEnabledChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.setLoggingEnabled\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.setLoggingEnabled\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -821,7 +798,7 @@ class FirebaseDatabaseHostApiSetup { } let useDatabaseEmulatorChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.useDatabaseEmulator\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.useDatabaseEmulator\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -845,7 +822,7 @@ class FirebaseDatabaseHostApiSetup { } let refChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.ref\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.ref\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -868,7 +845,7 @@ class FirebaseDatabaseHostApiSetup { } let refFromURLChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.refFromURL\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.refFromURL\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -891,7 +868,7 @@ class FirebaseDatabaseHostApiSetup { } let purgeOutstandingWritesChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.purgeOutstandingWrites\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.purgeOutstandingWrites\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -913,7 +890,7 @@ class FirebaseDatabaseHostApiSetup { } let databaseReferenceSetChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.databaseReferenceSet\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.databaseReferenceSet\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -936,7 +913,7 @@ class FirebaseDatabaseHostApiSetup { } let databaseReferenceSetWithPriorityChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.databaseReferenceSetWithPriority\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.databaseReferenceSetWithPriority\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -959,7 +936,7 @@ class FirebaseDatabaseHostApiSetup { } let databaseReferenceUpdateChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.databaseReferenceUpdate\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.databaseReferenceUpdate\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -982,7 +959,7 @@ class FirebaseDatabaseHostApiSetup { } let databaseReferenceSetPriorityChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.databaseReferenceSetPriority\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.databaseReferenceSetPriority\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1005,7 +982,7 @@ class FirebaseDatabaseHostApiSetup { } let databaseReferenceRunTransactionChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.databaseReferenceRunTransaction\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.databaseReferenceRunTransaction\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1028,7 +1005,7 @@ class FirebaseDatabaseHostApiSetup { } let databaseReferenceGetTransactionResultChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.databaseReferenceGetTransactionResult\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.databaseReferenceGetTransactionResult\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1055,7 +1032,7 @@ class FirebaseDatabaseHostApiSetup { } let onDisconnectSetChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.onDisconnectSet\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.onDisconnectSet\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1078,7 +1055,7 @@ class FirebaseDatabaseHostApiSetup { } let onDisconnectSetWithPriorityChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.onDisconnectSetWithPriority\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.onDisconnectSetWithPriority\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1101,7 +1078,7 @@ class FirebaseDatabaseHostApiSetup { } let onDisconnectUpdateChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.onDisconnectUpdate\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.onDisconnectUpdate\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1124,7 +1101,7 @@ class FirebaseDatabaseHostApiSetup { } let onDisconnectCancelChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.onDisconnectCancel\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.onDisconnectCancel\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1147,7 +1124,7 @@ class FirebaseDatabaseHostApiSetup { } let queryObserveChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.queryObserve\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.queryObserve\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1170,7 +1147,7 @@ class FirebaseDatabaseHostApiSetup { } let queryKeepSyncedChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.queryKeepSynced\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.queryKeepSynced\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1193,7 +1170,7 @@ class FirebaseDatabaseHostApiSetup { } let queryGetChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.queryGet\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.queryGet\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1219,12 +1196,11 @@ class FirebaseDatabaseHostApiSetup { /// Generated protocol from Pigeon that represents Flutter messages that can be called from Swift. protocol FirebaseDatabaseFlutterApiProtocol { - func callTransactionHandler( - transactionKey transactionKeyArg: Int64, - snapshotValue snapshotValueArg: Any?, - completion: - @escaping (Result) - -> Void) + func callTransactionHandler(transactionKey transactionKeyArg: Int64, + snapshotValue snapshotValueArg: Any?, + completion: + @escaping (Result) + -> Void) } class FirebaseDatabaseFlutterApi: FirebaseDatabaseFlutterApiProtocol { @@ -1239,13 +1215,11 @@ class FirebaseDatabaseFlutterApi: FirebaseDatabaseFlutterApiProtocol { FirebaseDatabaseMessagesPigeonCodec.shared } - func callTransactionHandler( - transactionKey transactionKeyArg: Int64, - snapshotValue snapshotValueArg: Any?, - completion: - @escaping (Result) - -> Void - ) { + func callTransactionHandler(transactionKey transactionKeyArg: Int64, + snapshotValue snapshotValueArg: Any?, + completion: + @escaping (Result) + -> Void) { let channelName = "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseFlutterApi.callTransactionHandler\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( 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..2e4b1834b5a1 100644 --- a/packages/firebase_database/firebase_database/macos/firebase_database/Package.swift +++ b/packages/firebase_database/firebase_database/macos/firebase_database/Package.swift @@ -13,10 +13,10 @@ let firebaseSdkVersion: Version = "12.14.0" let package = Package( name: "firebase_database", platforms: [ - .macOS("10.15") + .macOS("10.15"), ], products: [ - .library(name: "firebase-database", targets: ["firebase_database"]) + .library(name: "firebase-database", targets: ["firebase_database"]), ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,13 +30,13 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources") + .process("Resources"), ], cSettings: [ .headerSearchPath("include"), .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-rtdb\""), ] - ) + ), ] ) 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..97b53c920789 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 @@ -13,10 +13,10 @@ let firebaseSdkVersion: Version = "12.14.0" let package = Package( name: "firebase_in_app_messaging", platforms: [ - .iOS("15.0") + .iOS("15.0"), ], products: [ - .library(name: "firebase-in-app-messaging", targets: ["firebase_in_app_messaging"]) + .library(name: "firebase-in-app-messaging", targets: ["firebase_in_app_messaging"]), ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,13 +30,13 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources") + .process("Resources"), ], cSettings: [ .headerSearchPath("include"), .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-fiam\""), ] - ) + ), ] ) diff --git a/packages/firebase_messaging/firebase_messaging/android/src/main/java/io/flutter/plugins/firebase/messaging/FlutterFirebaseMessagingPlugin.java b/packages/firebase_messaging/firebase_messaging/android/src/main/java/io/flutter/plugins/firebase/messaging/FlutterFirebaseMessagingPlugin.java index 868c950899b3..36f78b804c25 100644 --- a/packages/firebase_messaging/firebase_messaging/android/src/main/java/io/flutter/plugins/firebase/messaging/FlutterFirebaseMessagingPlugin.java +++ b/packages/firebase_messaging/firebase_messaging/android/src/main/java/io/flutter/plugins/firebase/messaging/FlutterFirebaseMessagingPlugin.java @@ -424,12 +424,12 @@ public void onMethodCall(final MethodCall call, @NonNull final Result result) { Task methodCallTask; switch (call.method) { - // This message is sent when the Dart side of this plugin is told to initialize. - // In response, this (native) side of the plugin needs to spin up a background - // Dart isolate by using the given pluginCallbackHandle, and then setup a background - // method channel to communicate with the new background isolate. Once completed, - // this onMethodCall() method will receive messages from both the primary and background - // method channels. + // This message is sent when the Dart side of this plugin is told to initialize. + // In response, this (native) side of the plugin needs to spin up a background + // Dart isolate by using the given pluginCallbackHandle, and then setup a background + // method channel to communicate with the new background isolate. Once completed, + // this onMethodCall() method will receive messages from both the primary and background + // method channels. case "Messaging#startBackgroundIsolate": @SuppressWarnings("unchecked") Map arguments = ((Map) call.arguments); 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..6041810d6441 100644 --- a/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Package.swift +++ b/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Package.swift @@ -13,10 +13,10 @@ let firebaseSdkVersion: Version = "12.14.0" let package = Package( name: "firebase_messaging", platforms: [ - .iOS("15.0") + .iOS("15.0"), ], products: [ - .library(name: "firebase-messaging", targets: ["firebase_messaging"]) + .library(name: "firebase-messaging", targets: ["firebase_messaging"]), ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,13 +30,13 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources") + .process("Resources"), ], cSettings: [ .headerSearchPath("include"), .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-fcm\""), ] - ) + ), ] ) 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..d3fce3506275 100644 --- a/packages/firebase_messaging/firebase_messaging/macos/firebase_messaging/Package.swift +++ b/packages/firebase_messaging/firebase_messaging/macos/firebase_messaging/Package.swift @@ -13,10 +13,10 @@ let firebaseSdkVersion: Version = "12.14.0" let package = Package( name: "firebase_messaging", platforms: [ - .macOS("10.15") + .macOS("10.15"), ], products: [ - .library(name: "firebase-messaging", targets: ["firebase_messaging"]) + .library(name: "firebase-messaging", targets: ["firebase_messaging"]), ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,13 +30,13 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources") + .process("Resources"), ], cSettings: [ .headerSearchPath("include"), .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-fcm\""), ] - ) + ), ] ) 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..df902c7236ec 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 @@ -12,10 +12,10 @@ let firebaseSdkVersion: Version = "12.14.0" let package = Package( name: "firebase_ml_model_downloader", platforms: [ - .iOS("15.0") + .iOS("15.0"), ], products: [ - .library(name: "firebase-ml-model-downloader", targets: ["firebase_ml_model_downloader"]) + .library(name: "firebase-ml-model-downloader", targets: ["firebase_ml_model_downloader"]), ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -29,8 +29,8 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources") + .process("Resources"), ] - ) + ), ] ) diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/ios/firebase_ml_model_downloader/Sources/firebase_ml_model_downloader/FirebaseModelDownloaderPlugin.swift b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/ios/firebase_ml_model_downloader/Sources/firebase_ml_model_downloader/FirebaseModelDownloaderPlugin.swift index 94cc55407399..0a9ee2fe93df 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/ios/firebase_ml_model_downloader/Sources/firebase_ml_model_downloader/FirebaseModelDownloaderPlugin.swift +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/ios/firebase_ml_model_downloader/Sources/firebase_ml_model_downloader/FirebaseModelDownloaderPlugin.swift @@ -87,7 +87,7 @@ public class FirebaseModelDownloaderPlugin: NSObject, FLTFirebasePluginProtocol, errorDetails["code"] = code ?? self.mapErrorCodes(error: error! as NSError) errorDetails["message"] = message ?? error? - .localizedDescription ?? "An unknown error has occurred." + .localizedDescription ?? "An unknown error has occurred." errorDetails["additionalData"] = details ?? ["code": errorDetails["code"], "message": errorDetails["message"]] @@ -119,10 +119,8 @@ public class FirebaseModelDownloaderPlugin: NSObject, FLTFirebasePluginProtocol, } } - func listDownloadedModels( - arguments: [String: Any], - result: FLTFirebaseMethodCallResult - ) { + func listDownloadedModels(arguments: [String: Any], + result: FLTFirebaseMethodCallResult) { let modelDownloader = modelDownloaderFromArguments(arguments: arguments) modelDownloader?.listDownloadedModels { response in @@ -180,10 +178,8 @@ public class FirebaseModelDownloaderPlugin: NSObject, FLTFirebasePluginProtocol, } } - func deleteDownloadedModel( - arguments: [String: Any], - result: FLTFirebaseMethodCallResult - ) { + func deleteDownloadedModel(arguments: [String: Any], + result: FLTFirebaseMethodCallResult) { let modelDownloader = modelDownloaderFromArguments(arguments: arguments) let modelName = arguments["modelName"] 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..96d64667b539 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 @@ -12,10 +12,10 @@ let firebaseSdkVersion: Version = "12.14.0" let package = Package( name: "firebase_ml_model_downloader", platforms: [ - .macOS("10.15") + .macOS("10.15"), ], products: [ - .library(name: "firebase-ml-model-downloader", targets: ["firebase_ml_model_downloader"]) + .library(name: "firebase-ml-model-downloader", targets: ["firebase_ml_model_downloader"]), ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -29,8 +29,8 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources") + .process("Resources"), ] - ) + ), ] ) 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..dce392ec4e69 100644 --- a/packages/firebase_performance/firebase_performance/ios/firebase_performance/Package.swift +++ b/packages/firebase_performance/firebase_performance/ios/firebase_performance/Package.swift @@ -13,10 +13,10 @@ let firebaseSdkVersion: Version = "12.14.0" let package = Package( name: "firebase_performance", platforms: [ - .iOS("15.0") + .iOS("15.0"), ], products: [ - .library(name: "firebase-performance", targets: ["firebase_performance"]) + .library(name: "firebase-performance", targets: ["firebase_performance"]), ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,13 +30,13 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources") + .process("Resources"), ], cSettings: [ .headerSearchPath("include"), .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-perf\""), ] - ) + ), ] ) diff --git a/packages/firebase_performance/firebase_performance/ios/firebase_performance/Sources/firebase_performance/FirebasePerformanceMessages.g.swift b/packages/firebase_performance/firebase_performance/ios/firebase_performance/Sources/firebase_performance/FirebasePerformanceMessages.g.swift index d0bf9252d08f..010a3ec95732 100644 --- a/packages/firebase_performance/firebase_performance/ios/firebase_performance/Sources/firebase_performance/FirebasePerformanceMessages.g.swift +++ b/packages/firebase_performance/firebase_performance/ios/firebase_performance/Sources/firebase_performance/FirebasePerformanceMessages.g.swift @@ -393,20 +393,16 @@ class FirebasePerformanceMessagesPigeonCodec: FlutterStandardMessageCodec, @unch /// Generated protocol from Pigeon that represents a handler of messages from Flutter. protocol FirebasePerformanceHostApi { - func setPerformanceCollectionEnabled( - enabled: Bool, - completion: @escaping (Result) -> Void) + func setPerformanceCollectionEnabled(enabled: Bool, + completion: @escaping (Result) -> Void) func isPerformanceCollectionEnabled(completion: @escaping (Result) -> Void) func startTrace(name: String, completion: @escaping (Result) -> Void) - func stopTrace( - handle: Int64, attributes: TraceAttributes, - completion: @escaping (Result) -> Void) - func startHttpMetric( - options: HttpMetricOptions, - completion: @escaping (Result) -> Void) - func stopHttpMetric( - handle: Int64, attributes: HttpMetricAttributes, - completion: @escaping (Result) -> Void) + func stopTrace(handle: Int64, attributes: TraceAttributes, + completion: @escaping (Result) -> Void) + func startHttpMetric(options: HttpMetricOptions, + completion: @escaping (Result) -> Void) + func stopHttpMetric(handle: Int64, attributes: HttpMetricAttributes, + completion: @escaping (Result) -> Void) } /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`. @@ -417,14 +413,12 @@ class FirebasePerformanceHostApiSetup { /// Sets up an instance of `FirebasePerformanceHostApi` to handle messages through the /// `binaryMessenger`. - static func setUp( - binaryMessenger: FlutterBinaryMessenger, api: FirebasePerformanceHostApi?, - messageChannelSuffix: String = "" - ) { + static func setUp(binaryMessenger: FlutterBinaryMessenger, api: FirebasePerformanceHostApi?, + messageChannelSuffix: String = "") { let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" let setPerformanceCollectionEnabledChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_performance_platform_interface.FirebasePerformanceHostApi.setPerformanceCollectionEnabled\(channelSuffix)", + "dev.flutter.pigeon.firebase_performance_platform_interface.FirebasePerformanceHostApi.setPerformanceCollectionEnabled\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -446,7 +440,7 @@ class FirebasePerformanceHostApiSetup { } let isPerformanceCollectionEnabledChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_performance_platform_interface.FirebasePerformanceHostApi.isPerformanceCollectionEnabled\(channelSuffix)", + "dev.flutter.pigeon.firebase_performance_platform_interface.FirebasePerformanceHostApi.isPerformanceCollectionEnabled\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -466,7 +460,7 @@ class FirebasePerformanceHostApiSetup { } let startTraceChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_performance_platform_interface.FirebasePerformanceHostApi.startTrace\(channelSuffix)", + "dev.flutter.pigeon.firebase_performance_platform_interface.FirebasePerformanceHostApi.startTrace\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -488,7 +482,7 @@ class FirebasePerformanceHostApiSetup { } let stopTraceChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_performance_platform_interface.FirebasePerformanceHostApi.stopTrace\(channelSuffix)", + "dev.flutter.pigeon.firebase_performance_platform_interface.FirebasePerformanceHostApi.stopTrace\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -511,7 +505,7 @@ class FirebasePerformanceHostApiSetup { } let startHttpMetricChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_performance_platform_interface.FirebasePerformanceHostApi.startHttpMetric\(channelSuffix)", + "dev.flutter.pigeon.firebase_performance_platform_interface.FirebasePerformanceHostApi.startHttpMetric\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -533,7 +527,7 @@ class FirebasePerformanceHostApiSetup { } let stopHttpMetricChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_performance_platform_interface.FirebasePerformanceHostApi.stopHttpMetric\(channelSuffix)", + "dev.flutter.pigeon.firebase_performance_platform_interface.FirebasePerformanceHostApi.stopHttpMetric\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) diff --git a/packages/firebase_performance/firebase_performance/ios/firebase_performance/Sources/firebase_performance/FirebasePerformancePlugin.swift b/packages/firebase_performance/firebase_performance/ios/firebase_performance/Sources/firebase_performance/FirebasePerformancePlugin.swift index 3c7d8f50b620..5ece6be74977 100644 --- a/packages/firebase_performance/firebase_performance/ios/firebase_performance/Sources/firebase_performance/FirebasePerformancePlugin.swift +++ b/packages/firebase_performance/firebase_performance/ios/firebase_performance/Sources/firebase_performance/FirebasePerformancePlugin.swift @@ -22,8 +22,7 @@ let FirebasePerformanceChannelName = "plugins.flutter.io/firebase_performance" extension FlutterError: Error {} public class FirebasePerformancePlugin: NSObject, FlutterPlugin, FLTFirebasePluginProtocol, - FirebasePerformanceHostApi -{ + FirebasePerformanceHostApi { public func didReinitializeFirebaseCore(_ completion: @escaping () -> Void) { completion() } @@ -61,10 +60,8 @@ public class FirebasePerformancePlugin: NSObject, FlutterPlugin, FLTFirebasePlug FirebasePerformanceHostApiSetup.setUp(binaryMessenger: binaryMessenger, api: instance) } - public func setPerformanceCollectionEnabled( - enabled: Bool, - completion: @escaping (Result) -> Void - ) { + public func setPerformanceCollectionEnabled(enabled: Bool, + completion: @escaping (Result) -> Void) { Performance.sharedInstance().isDataCollectionEnabled = enabled completion(.success(())) } @@ -82,10 +79,8 @@ public class FirebasePerformancePlugin: NSObject, FlutterPlugin, FLTFirebasePlug completion(.success(Int64(traceHandle))) } - func stopTrace( - handle: Int64, attributes: TraceAttributes, - completion: @escaping (Result) -> Void - ) { + func stopTrace(handle: Int64, attributes: TraceAttributes, + completion: @escaping (Result) -> Void) { guard let trace = traces[Int(handle)] else { completion(.success(())) return @@ -108,10 +103,8 @@ public class FirebasePerformancePlugin: NSObject, FlutterPlugin, FLTFirebasePlug completion(.success(())) } - func startHttpMetric( - options: HttpMetricOptions, - completion: @escaping (Result) -> Void - ) { + func startHttpMetric(options: HttpMetricOptions, + completion: @escaping (Result) -> Void) { guard let url = URL(string: options.url) else { completion(.failure(FlutterError(code: "invalid-url", message: "Invalid url", details: nil))) return @@ -137,10 +130,8 @@ public class FirebasePerformancePlugin: NSObject, FlutterPlugin, FLTFirebasePlug completion(.success(Int64(httpMetricHandle))) } - func stopHttpMetric( - handle: Int64, attributes: HttpMetricAttributes, - completion: @escaping (Result) -> Void - ) { + func stopHttpMetric(handle: Int64, attributes: HttpMetricAttributes, + completion: @escaping (Result) -> Void) { guard let httpMetric = httpMetrics[Int(handle)] else { completion(.success(())) return 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..946b1b890d9e 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 @@ -12,10 +12,10 @@ let firebaseSdkVersion: Version = "12.14.0" let package = Package( name: "firebase_remote_config", platforms: [ - .iOS("15.0") + .iOS("15.0"), ], products: [ - .library(name: "firebase-remote-config", targets: ["firebase_remote_config"]) + .library(name: "firebase-remote-config", targets: ["firebase_remote_config"]), ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -29,8 +29,8 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources") + .process("Resources"), ] - ) + ), ] ) diff --git a/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Sources/firebase_remote_config/FirebaseRemoteConfigMessages.g.swift b/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Sources/firebase_remote_config/FirebaseRemoteConfigMessages.g.swift index f7b031c0c6e3..1168f1b807c7 100644 --- a/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Sources/firebase_remote_config/FirebaseRemoteConfigMessages.g.swift +++ b/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Sources/firebase_remote_config/FirebaseRemoteConfigMessages.g.swift @@ -263,16 +263,13 @@ protocol FirebaseRemoteConfigHostApi { func fetch(appName: String, completion: @escaping (Result) -> Void) func fetchAndActivate(appName: String, completion: @escaping (Result) -> Void) func activate(appName: String, completion: @escaping (Result) -> Void) - func setConfigSettings( - appName: String, settings: RemoteConfigPigeonSettings, - completion: @escaping (Result) -> Void) - func setDefaults( - appName: String, defaultParameters: [String: Any?], - completion: @escaping (Result) -> Void) + func setConfigSettings(appName: String, settings: RemoteConfigPigeonSettings, + completion: @escaping (Result) -> Void) + func setDefaults(appName: String, defaultParameters: [String: Any?], + completion: @escaping (Result) -> Void) func ensureInitialized(appName: String, completion: @escaping (Result) -> Void) - func setCustomSignals( - appName: String, customSignals: [String: Any?], - completion: @escaping (Result) -> Void) + func setCustomSignals(appName: String, customSignals: [String: Any?], + completion: @escaping (Result) -> Void) func getAll(appName: String, completion: @escaping (Result<[String: Any?], Error>) -> Void) func getProperties(appName: String, completion: @escaping (Result<[String: Any], Error>) -> Void) } @@ -285,14 +282,12 @@ class FirebaseRemoteConfigHostApiSetup { /// Sets up an instance of `FirebaseRemoteConfigHostApi` to handle messages through the /// `binaryMessenger`. - static func setUp( - binaryMessenger: FlutterBinaryMessenger, api: FirebaseRemoteConfigHostApi?, - messageChannelSuffix: String = "" - ) { + static func setUp(binaryMessenger: FlutterBinaryMessenger, api: FirebaseRemoteConfigHostApi?, + messageChannelSuffix: String = "") { let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" let fetchChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.fetch\(channelSuffix)", + "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.fetch\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -314,7 +309,7 @@ class FirebaseRemoteConfigHostApiSetup { } let fetchAndActivateChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.fetchAndActivate\(channelSuffix)", + "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.fetchAndActivate\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -336,7 +331,7 @@ class FirebaseRemoteConfigHostApiSetup { } let activateChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.activate\(channelSuffix)", + "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.activate\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -358,7 +353,7 @@ class FirebaseRemoteConfigHostApiSetup { } let setConfigSettingsChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.setConfigSettings\(channelSuffix)", + "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.setConfigSettings\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -381,7 +376,7 @@ class FirebaseRemoteConfigHostApiSetup { } let setDefaultsChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.setDefaults\(channelSuffix)", + "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.setDefaults\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -404,7 +399,7 @@ class FirebaseRemoteConfigHostApiSetup { } let ensureInitializedChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.ensureInitialized\(channelSuffix)", + "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.ensureInitialized\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -426,7 +421,7 @@ class FirebaseRemoteConfigHostApiSetup { } let setCustomSignalsChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.setCustomSignals\(channelSuffix)", + "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.setCustomSignals\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -449,7 +444,7 @@ class FirebaseRemoteConfigHostApiSetup { } let getAllChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.getAll\(channelSuffix)", + "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.getAll\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -471,7 +466,7 @@ class FirebaseRemoteConfigHostApiSetup { } let getPropertiesChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.getProperties\(channelSuffix)", + "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.getProperties\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) diff --git a/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Sources/firebase_remote_config/FirebaseRemoteConfigPlugin.swift b/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Sources/firebase_remote_config/FirebaseRemoteConfigPlugin.swift index aa923738980a..301e35d5ab19 100644 --- a/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Sources/firebase_remote_config/FirebaseRemoteConfigPlugin.swift +++ b/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Sources/firebase_remote_config/FirebaseRemoteConfigPlugin.swift @@ -22,8 +22,7 @@ let kFirebaseRemoteConfigUpdatedChannelName = "plugins.flutter.io/firebase_remot extension FlutterError: Error {} public class FirebaseRemoteConfigPlugin: NSObject, FlutterPlugin, FlutterStreamHandler, - FLTFirebasePluginProtocol, FirebaseRemoteConfigHostApi -{ + FLTFirebasePluginProtocol, FirebaseRemoteConfigHostApi { private var listenersMap: [String: ConfigUpdateListenerRegistration] = [:] private var fetchAndActivateRetry = false @@ -108,10 +107,8 @@ public class FirebaseRemoteConfigPlugin: NSObject, FlutterPlugin, FlutterStreamH } } - func setConfigSettings( - appName: String, settings: RemoteConfigPigeonSettings, - completion: @escaping (Result) -> Void - ) { + func setConfigSettings(appName: String, settings: RemoteConfigPigeonSettings, + completion: @escaping (Result) -> Void) { let fetchTimeout = settings.fetchTimeoutSeconds let minFetchInterval = settings.minimumFetchIntervalSeconds let configSettings = RemoteConfigSettings() @@ -121,10 +118,8 @@ public class FirebaseRemoteConfigPlugin: NSObject, FlutterPlugin, FlutterStreamH completion(.success(())) } - func setDefaults( - appName: String, defaultParameters: [String: Any?], - completion: @escaping (Result) -> Void - ) { + func setDefaults(appName: String, defaultParameters: [String: Any?], + completion: @escaping (Result) -> Void) { var filtered: [String: NSObject] = [:] for (key, value) in defaultParameters { @@ -147,10 +142,8 @@ public class FirebaseRemoteConfigPlugin: NSObject, FlutterPlugin, FlutterStreamH } } - func setCustomSignals( - appName: String, customSignals: [String: Any?], - completion: @escaping (Result) -> Void - ) { + func setCustomSignals(appName: String, customSignals: [String: Any?], + completion: @escaping (Result) -> Void) { let signalValues = convertToCustomSignalValues(customSignals) Task { do { @@ -179,10 +172,8 @@ public class FirebaseRemoteConfigPlugin: NSObject, FlutterPlugin, FlutterStreamH completion(.success(parameters)) } - func getProperties( - appName: String, - completion: @escaping (Result<[String: Any], any Error>) -> Void - ) { + func getProperties(appName: String, + completion: @escaping (Result<[String: Any], any Error>) -> Void) { let config = getRemoteConfig(from: appName) completion(.success(configProperties(for: config))) } @@ -199,10 +190,8 @@ public class FirebaseRemoteConfigPlugin: NSObject, FlutterPlugin, FlutterStreamH kFirebaseRemoteConfigChannelName } - public func onListen( - withArguments arguments: Any?, - eventSink events: @escaping FlutterEventSink - ) -> FlutterError? { + public func onListen(withArguments arguments: Any?, + eventSink events: @escaping FlutterEventSink) -> FlutterError? { guard let args = arguments as? [String: Any], let appName = args["appName"] as? String else { return nil } @@ -248,8 +237,7 @@ public class FirebaseRemoteConfigPlugin: NSObject, FlutterPlugin, FlutterStreamH } private func createRemoteConfigValueDict(_ remoteConfigValue: RemoteConfigValue) - -> [String: Any] - { + -> [String: Any] { [ "value": FlutterStandardTypedData(bytes: remoteConfigValue.dataValue), "source": mapSource(remoteConfigValue.source), diff --git a/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Sources/firebase_remote_config/FirebaseRemoteConfigUtils.swift b/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Sources/firebase_remote_config/FirebaseRemoteConfigUtils.swift index 45065769736b..1e35341b36aa 100644 --- a/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Sources/firebase_remote_config/FirebaseRemoteConfigUtils.swift +++ b/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Sources/firebase_remote_config/FirebaseRemoteConfigUtils.swift @@ -11,8 +11,7 @@ class FLTFirebaseRemoteConfigUtils { switch error.code { case RemoteConfigError.internalError.rawValue: if let description = error.userInfo[NSLocalizedDescriptionKey] as? String, - description.contains("403") - { + description.contains("403") { // See PR for details: https://github.com/firebase/flutterfire/pull/9629 codeAndMessage["code"] = "forbidden" let updateMessage = @@ -22,7 +21,7 @@ class FLTFirebaseRemoteConfigUtils { codeAndMessage["code"] = "internal" codeAndMessage["message"] = error - .userInfo[NSLocalizedDescriptionKey] as? String ?? "Internal error" + .userInfo[NSLocalizedDescriptionKey] as? String ?? "Internal error" } case RemoteConfigError.throttled.rawValue: 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..44cdc9df140b 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 @@ -12,10 +12,10 @@ let firebaseSdkVersion: Version = "12.14.0" let package = Package( name: "firebase_remote_config", platforms: [ - .macOS("10.15") + .macOS("10.15"), ], products: [ - .library(name: "firebase-remote-config", targets: ["firebase_remote_config"]) + .library(name: "firebase-remote-config", targets: ["firebase_remote_config"]), ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -29,8 +29,8 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources") + .process("Resources"), ] - ) + ), ] ) 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..502ccbbe5340 100644 --- a/packages/firebase_storage/firebase_storage/ios/firebase_storage/Package.swift +++ b/packages/firebase_storage/firebase_storage/ios/firebase_storage/Package.swift @@ -13,10 +13,10 @@ let firebaseSdkVersion: Version = "12.14.0" let package = Package( name: "firebase_storage", platforms: [ - .iOS("15.0") + .iOS("15.0"), ], products: [ - .library(name: "firebase-storage", targets: ["firebase_storage"]) + .library(name: "firebase-storage", targets: ["firebase_storage"]), ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,13 +30,13 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources") + .process("Resources"), ], cSettings: [ .headerSearchPath("include"), .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-gcs\""), ] - ) + ), ] ) diff --git a/packages/firebase_storage/firebase_storage/ios/firebase_storage/Sources/firebase_storage/FLTFirebaseStoragePlugin.swift b/packages/firebase_storage/firebase_storage/ios/firebase_storage/Sources/firebase_storage/FLTFirebaseStoragePlugin.swift index ef81f56e31da..c49aed7f7312 100644 --- a/packages/firebase_storage/firebase_storage/ios/firebase_storage/Sources/firebase_storage/FLTFirebaseStoragePlugin.swift +++ b/packages/firebase_storage/firebase_storage/ios/firebase_storage/Sources/firebase_storage/FLTFirebaseStoragePlugin.swift @@ -63,10 +63,8 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt return Storage.storage(app: firApp, url: base) } - private func ref( - app: InternalStorageFirebaseApp, - reference: InternalStorageReference - ) -> StorageReference { + private func ref(app: InternalStorageFirebaseApp, + reference: InternalStorageReference) -> StorageReference { storage(app: app).reference(withPath: reference.fullPath) } @@ -74,10 +72,8 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt InternalStorageReference(bucket: ref.bucket, fullPath: ref.fullPath, name: ref.name) } - func getReferencebyPath( - app: InternalStorageFirebaseApp, path: String, bucket: String?, - completion: @escaping (Result) -> Void - ) { + func getReferencebyPath(app: InternalStorageFirebaseApp, path: String, bucket: String?, + completion: @escaping (Result) -> Void) { let r = storage(app: app).reference(withPath: path) completion( .success( @@ -90,34 +86,26 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt ) } - func setMaxOperationRetryTime( - app: InternalStorageFirebaseApp, time: Int64, - completion: @escaping (Result) -> Void - ) { + func setMaxOperationRetryTime(app: InternalStorageFirebaseApp, time: Int64, + completion: @escaping (Result) -> Void) { storage(app: app).maxOperationRetryTime = TimeInterval(Double(time) / 1000.0) completion(.success(())) } - func setMaxUploadRetryTime( - app: InternalStorageFirebaseApp, time: Int64, - completion: @escaping (Result) -> Void - ) { + func setMaxUploadRetryTime(app: InternalStorageFirebaseApp, time: Int64, + completion: @escaping (Result) -> Void) { storage(app: app).maxUploadRetryTime = TimeInterval(Double(time) / 1000.0) completion(.success(())) } - func setMaxDownloadRetryTime( - app: InternalStorageFirebaseApp, time: Int64, - completion: @escaping (Result) -> Void - ) { + func setMaxDownloadRetryTime(app: InternalStorageFirebaseApp, time: Int64, + completion: @escaping (Result) -> Void) { storage(app: app).maxDownloadRetryTime = TimeInterval(Double(time) / 1000.0) completion(.success(())) } - func useStorageEmulator( - app: InternalStorageFirebaseApp, host: String, port: Int64, - completion: @escaping (Result) -> Void - ) { + func useStorageEmulator(app: InternalStorageFirebaseApp, host: String, port: Int64, + completion: @escaping (Result) -> Void) { guard emulatorBooted[app.bucket] == nil else { completion(.success(())) return @@ -128,10 +116,8 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt completion(.success(())) } - func referenceDelete( - app: InternalStorageFirebaseApp, reference: InternalStorageReference, - completion: @escaping (Result) -> Void - ) { + func referenceDelete(app: InternalStorageFirebaseApp, reference: InternalStorageReference, + completion: @escaping (Result) -> Void) { ref(app: app, reference: reference).delete { error in if let e = error { completion(.failure(self.toFlutterError(e))) @@ -141,10 +127,8 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt } } - func referenceGetDownloadURL( - app: InternalStorageFirebaseApp, reference: InternalStorageReference, - completion: @escaping (Result) -> Void - ) { + func referenceGetDownloadURL(app: InternalStorageFirebaseApp, reference: InternalStorageReference, + completion: @escaping (Result) -> Void) { ref(app: app, reference: reference).downloadURL { url, error in if let e = error { completion(.failure(self.toFlutterError(e))) @@ -161,10 +145,8 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt } } - func referenceGetMetaData( - app: InternalStorageFirebaseApp, reference: InternalStorageReference, - completion: @escaping (Result) -> Void - ) { + func referenceGetMetaData(app: InternalStorageFirebaseApp, reference: InternalStorageReference, + completion: @escaping (Result) -> Void) { ref(app: app, reference: reference).getMetadata { md, error in if let e = error { completion(.failure(self.toFlutterError(e))) @@ -174,11 +156,9 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt } } - func referenceList( - app: InternalStorageFirebaseApp, reference: InternalStorageReference, - options: InternalListOptions, - completion: @escaping (Result) -> Void - ) { + func referenceList(app: InternalStorageFirebaseApp, reference: InternalStorageReference, + options: InternalListOptions, + completion: @escaping (Result) -> Void) { let r = ref(app: app, reference: reference) let block: (StorageListResult?, Error?) -> Void = { list, error in if let e = error { @@ -194,10 +174,8 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt } } - func referenceListAll( - app: InternalStorageFirebaseApp, reference: InternalStorageReference, - completion: @escaping (Result) -> Void - ) { + func referenceListAll(app: InternalStorageFirebaseApp, reference: InternalStorageReference, + completion: @escaping (Result) -> Void) { ref(app: app, reference: reference).listAll { list, error in if let e = error { completion(.failure(self.toFlutterError(e))) @@ -207,11 +185,9 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt } } - func referenceGetData( - app: InternalStorageFirebaseApp, reference: InternalStorageReference, - maxSize: Int64, - completion: @escaping (Result) -> Void - ) { + func referenceGetData(app: InternalStorageFirebaseApp, reference: InternalStorageReference, + maxSize: Int64, + completion: @escaping (Result) -> Void) { ref(app: app, reference: reference).getData(maxSize: maxSize) { data, error in if let e = error { completion(.failure(self.toFlutterError(e))) @@ -223,11 +199,9 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt } } - func referencePutData( - app: InternalStorageFirebaseApp, reference: InternalStorageReference, - data: FlutterStandardTypedData, settableMetaData: InternalSettableMetadata, - handle: Int64, completion: @escaping (Result) -> Void - ) { + func referencePutData(app: InternalStorageFirebaseApp, reference: InternalStorageReference, + data: FlutterStandardTypedData, settableMetaData: InternalSettableMetadata, + handle: Int64, completion: @escaping (Result) -> Void) { let r = ref(app: app, reference: reference) let task = r.putData(data.data, metadata: toMeta(settableMetaData)) completion( @@ -242,11 +216,9 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt ) } - func referencePutString( - app: InternalStorageFirebaseApp, reference: InternalStorageReference, - data: String, format: Int64, settableMetaData: InternalSettableMetadata, - handle: Int64, completion: @escaping (Result) -> Void - ) { + func referencePutString(app: InternalStorageFirebaseApp, reference: InternalStorageReference, + data: String, format: Int64, settableMetaData: InternalSettableMetadata, + handle: Int64, completion: @escaping (Result) -> Void) { let r = ref(app: app, reference: reference) let d: Data if format == 1 { @@ -274,12 +246,10 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt ) } - func referencePutFile( - app: InternalStorageFirebaseApp, reference: InternalStorageReference, - filePath: String, settableMetaData: InternalSettableMetadata?, - handle: Int64, - completion: @escaping (Result) -> Void - ) { + func referencePutFile(app: InternalStorageFirebaseApp, reference: InternalStorageReference, + filePath: String, settableMetaData: InternalSettableMetadata?, + handle: Int64, + completion: @escaping (Result) -> Void) { let r = ref(app: app, reference: reference) let url = URL(fileURLWithPath: filePath) let task: StorageUploadTask @@ -300,11 +270,9 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt ) } - func referenceDownloadFile( - app: InternalStorageFirebaseApp, reference: InternalStorageReference, - filePath: String, handle: Int64, - completion: @escaping (Result) -> Void - ) { + func referenceDownloadFile(app: InternalStorageFirebaseApp, reference: InternalStorageReference, + filePath: String, handle: Int64, + completion: @escaping (Result) -> Void) { let r = ref(app: app, reference: reference) let url = URL(fileURLWithPath: filePath) let task = r.write(toFile: url) @@ -320,13 +288,11 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt ) } - func referenceUpdateMetadata( - app: InternalStorageFirebaseApp, reference: InternalStorageReference, - metadata: InternalSettableMetadata, - completion: - @escaping (Result) - -> Void - ) { + func referenceUpdateMetadata(app: InternalStorageFirebaseApp, reference: InternalStorageReference, + metadata: InternalSettableMetadata, + completion: + @escaping (Result) + -> Void) { ref(app: app, reference: reference).updateMetadata(toMeta(metadata)) { md, error in if let e = error { completion(.failure(self.toFlutterError(e))) @@ -336,10 +302,8 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt } } - func taskPause( - app: InternalStorageFirebaseApp, handle: Int64, - completion: @escaping (Result<[String: Any], Error>) -> Void - ) { + func taskPause(app: InternalStorageFirebaseApp, handle: Int64, + completion: @escaping (Result<[String: Any], Error>) -> Void) { if let task = handleToTask[handle] as? StorageUploadTask { task.pause() completion(.success(["status": true, "snapshot": currentSnapshot(handle: handle)])) @@ -351,10 +315,8 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt } } - func taskResume( - app: InternalStorageFirebaseApp, handle: Int64, - completion: @escaping (Result<[String: Any], Error>) -> Void - ) { + func taskResume(app: InternalStorageFirebaseApp, handle: Int64, + completion: @escaping (Result<[String: Any], Error>) -> Void) { if let task = handleToTask[handle] as? StorageUploadTask { task.resume() completion(.success(["status": true, "snapshot": currentSnapshot(handle: handle)])) @@ -366,10 +328,8 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt } } - func taskCancel( - app: InternalStorageFirebaseApp, handle: Int64, - completion: @escaping (Result<[String: Any], Error>) -> Void - ) { + func taskCancel(app: InternalStorageFirebaseApp, handle: Int64, + completion: @escaping (Result<[String: Any], Error>) -> Void) { if let task = handleToTask[handle] as? StorageUploadTask { task.cancel() if let id = handleToIdentifier[handle] { @@ -427,10 +387,8 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt return InternalListResult(items: itemsOpt, pageToken: list.pageToken, prefixs: prefixesOpt) } - private func registerTask( - task: StorageObservableTask, appName: String, handle: Int64, - path: String - ) -> String { + private func registerTask(task: StorageObservableTask, appName: String, handle: Int64, + path: String) -> String { let uuid = UUID().uuidString let channelName = "plugins.flutter.io/firebase_storage/taskEvent/\(uuid)" let channel = FlutterEventChannel(name: channelName, binaryMessenger: messenger!) diff --git a/packages/firebase_storage/firebase_storage/ios/firebase_storage/Sources/firebase_storage/FirebaseStorageMessages.g.swift b/packages/firebase_storage/firebase_storage/ios/firebase_storage/Sources/firebase_storage/FirebaseStorageMessages.g.swift index 8012456b979d..1dccb935f562 100644 --- a/packages/firebase_storage/firebase_storage/ios/firebase_storage/Sources/firebase_storage/FirebaseStorageMessages.g.swift +++ b/packages/firebase_storage/firebase_storage/ios/firebase_storage/Sources/firebase_storage/FirebaseStorageMessages.g.swift @@ -297,7 +297,7 @@ struct InternalFullMetaData: Hashable { func toList() -> [Any?] { [ - metadata + metadata, ] } @@ -627,70 +627,51 @@ class FirebaseStorageMessagesPigeonCodec: FlutterStandardMessageCodec, @unchecke /// Generated protocol from Pigeon that represents a handler of messages from Flutter. protocol FirebaseStorageHostApi { - func getReferencebyPath( - app: InternalStorageFirebaseApp, path: String, bucket: String?, - completion: @escaping (Result) -> Void) - func setMaxOperationRetryTime( - app: InternalStorageFirebaseApp, time: Int64, - completion: @escaping (Result) -> Void) - func setMaxUploadRetryTime( - app: InternalStorageFirebaseApp, time: Int64, - completion: @escaping (Result) -> Void) - func setMaxDownloadRetryTime( - app: InternalStorageFirebaseApp, time: Int64, - completion: @escaping (Result) -> Void) - func useStorageEmulator( - app: InternalStorageFirebaseApp, host: String, port: Int64, - completion: @escaping (Result) -> Void) - func referenceDelete( - app: InternalStorageFirebaseApp, reference: InternalStorageReference, - completion: @escaping (Result) -> Void) - func referenceGetDownloadURL( - app: InternalStorageFirebaseApp, reference: InternalStorageReference, - completion: @escaping (Result) -> Void) - func referenceGetMetaData( - app: InternalStorageFirebaseApp, reference: InternalStorageReference, - completion: @escaping (Result) -> Void) - func referenceList( - app: InternalStorageFirebaseApp, reference: InternalStorageReference, - options: InternalListOptions, - completion: @escaping (Result) -> Void) - func referenceListAll( - app: InternalStorageFirebaseApp, reference: InternalStorageReference, - completion: @escaping (Result) -> Void) - func referenceGetData( - app: InternalStorageFirebaseApp, reference: InternalStorageReference, - maxSize: Int64, - completion: @escaping (Result) -> Void) - func referencePutData( - app: InternalStorageFirebaseApp, reference: InternalStorageReference, - data: FlutterStandardTypedData, settableMetaData: InternalSettableMetadata, - handle: Int64, completion: @escaping (Result) -> Void) - func referencePutString( - app: InternalStorageFirebaseApp, reference: InternalStorageReference, - data: String, format: Int64, settableMetaData: InternalSettableMetadata, - handle: Int64, completion: @escaping (Result) -> Void) - func referencePutFile( - app: InternalStorageFirebaseApp, reference: InternalStorageReference, - filePath: String, settableMetaData: InternalSettableMetadata?, - handle: Int64, completion: @escaping (Result) -> Void) - func referenceDownloadFile( - app: InternalStorageFirebaseApp, reference: InternalStorageReference, - filePath: String, handle: Int64, - completion: @escaping (Result) -> Void) - func referenceUpdateMetadata( - app: InternalStorageFirebaseApp, reference: InternalStorageReference, - metadata: InternalSettableMetadata, - completion: @escaping (Result) -> Void) - func taskPause( - app: InternalStorageFirebaseApp, handle: Int64, - completion: @escaping (Result<[String: Any], Error>) -> Void) - func taskResume( - app: InternalStorageFirebaseApp, handle: Int64, - completion: @escaping (Result<[String: Any], Error>) -> Void) - func taskCancel( - app: InternalStorageFirebaseApp, handle: Int64, - completion: @escaping (Result<[String: Any], Error>) -> Void) + func getReferencebyPath(app: InternalStorageFirebaseApp, path: String, bucket: String?, + completion: @escaping (Result) -> Void) + func setMaxOperationRetryTime(app: InternalStorageFirebaseApp, time: Int64, + completion: @escaping (Result) -> Void) + func setMaxUploadRetryTime(app: InternalStorageFirebaseApp, time: Int64, + completion: @escaping (Result) -> Void) + func setMaxDownloadRetryTime(app: InternalStorageFirebaseApp, time: Int64, + completion: @escaping (Result) -> Void) + func useStorageEmulator(app: InternalStorageFirebaseApp, host: String, port: Int64, + completion: @escaping (Result) -> Void) + func referenceDelete(app: InternalStorageFirebaseApp, reference: InternalStorageReference, + completion: @escaping (Result) -> Void) + func referenceGetDownloadURL(app: InternalStorageFirebaseApp, reference: InternalStorageReference, + completion: @escaping (Result) -> Void) + func referenceGetMetaData(app: InternalStorageFirebaseApp, reference: InternalStorageReference, + completion: @escaping (Result) -> Void) + func referenceList(app: InternalStorageFirebaseApp, reference: InternalStorageReference, + options: InternalListOptions, + completion: @escaping (Result) -> Void) + func referenceListAll(app: InternalStorageFirebaseApp, reference: InternalStorageReference, + completion: @escaping (Result) -> Void) + func referenceGetData(app: InternalStorageFirebaseApp, reference: InternalStorageReference, + maxSize: Int64, + completion: @escaping (Result) -> Void) + func referencePutData(app: InternalStorageFirebaseApp, reference: InternalStorageReference, + data: FlutterStandardTypedData, settableMetaData: InternalSettableMetadata, + handle: Int64, completion: @escaping (Result) -> Void) + func referencePutString(app: InternalStorageFirebaseApp, reference: InternalStorageReference, + data: String, format: Int64, settableMetaData: InternalSettableMetadata, + handle: Int64, completion: @escaping (Result) -> Void) + func referencePutFile(app: InternalStorageFirebaseApp, reference: InternalStorageReference, + filePath: String, settableMetaData: InternalSettableMetadata?, + handle: Int64, completion: @escaping (Result) -> Void) + func referenceDownloadFile(app: InternalStorageFirebaseApp, reference: InternalStorageReference, + filePath: String, handle: Int64, + completion: @escaping (Result) -> Void) + func referenceUpdateMetadata(app: InternalStorageFirebaseApp, reference: InternalStorageReference, + metadata: InternalSettableMetadata, + completion: @escaping (Result) -> Void) + func taskPause(app: InternalStorageFirebaseApp, handle: Int64, + completion: @escaping (Result<[String: Any], Error>) -> Void) + func taskResume(app: InternalStorageFirebaseApp, handle: Int64, + completion: @escaping (Result<[String: Any], Error>) -> Void) + func taskCancel(app: InternalStorageFirebaseApp, handle: Int64, + completion: @escaping (Result<[String: Any], Error>) -> Void) } /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`. @@ -701,14 +682,12 @@ class FirebaseStorageHostApiSetup { /// Sets up an instance of `FirebaseStorageHostApi` to handle messages through the /// `binaryMessenger`. - static func setUp( - binaryMessenger: FlutterBinaryMessenger, api: FirebaseStorageHostApi?, - messageChannelSuffix: String = "" - ) { + static func setUp(binaryMessenger: FlutterBinaryMessenger, api: FirebaseStorageHostApi?, + messageChannelSuffix: String = "") { let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" let getReferencebyPathChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.getReferencebyPath\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.getReferencebyPath\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -732,7 +711,7 @@ class FirebaseStorageHostApiSetup { } let setMaxOperationRetryTimeChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.setMaxOperationRetryTime\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.setMaxOperationRetryTime\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -755,7 +734,7 @@ class FirebaseStorageHostApiSetup { } let setMaxUploadRetryTimeChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.setMaxUploadRetryTime\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.setMaxUploadRetryTime\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -778,7 +757,7 @@ class FirebaseStorageHostApiSetup { } let setMaxDownloadRetryTimeChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.setMaxDownloadRetryTime\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.setMaxDownloadRetryTime\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -801,7 +780,7 @@ class FirebaseStorageHostApiSetup { } let useStorageEmulatorChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.useStorageEmulator\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.useStorageEmulator\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -825,7 +804,7 @@ class FirebaseStorageHostApiSetup { } let referenceDeleteChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceDelete\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceDelete\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -848,7 +827,7 @@ class FirebaseStorageHostApiSetup { } let referenceGetDownloadURLChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceGetDownloadURL\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceGetDownloadURL\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -871,7 +850,7 @@ class FirebaseStorageHostApiSetup { } let referenceGetMetaDataChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceGetMetaData\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceGetMetaData\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -894,7 +873,7 @@ class FirebaseStorageHostApiSetup { } let referenceListChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceList\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceList\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -918,7 +897,7 @@ class FirebaseStorageHostApiSetup { } let referenceListAllChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceListAll\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceListAll\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -941,7 +920,7 @@ class FirebaseStorageHostApiSetup { } let referenceGetDataChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceGetData\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceGetData\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -965,7 +944,7 @@ class FirebaseStorageHostApiSetup { } let referencePutDataChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referencePutData\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referencePutData\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -997,7 +976,7 @@ class FirebaseStorageHostApiSetup { } let referencePutStringChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referencePutString\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referencePutString\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1031,7 +1010,7 @@ class FirebaseStorageHostApiSetup { } let referencePutFileChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referencePutFile\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referencePutFile\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1063,7 +1042,7 @@ class FirebaseStorageHostApiSetup { } let referenceDownloadFileChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceDownloadFile\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceDownloadFile\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1093,7 +1072,7 @@ class FirebaseStorageHostApiSetup { } let referenceUpdateMetadataChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceUpdateMetadata\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceUpdateMetadata\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1121,7 +1100,7 @@ class FirebaseStorageHostApiSetup { } let taskPauseChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.taskPause\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.taskPause\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1144,7 +1123,7 @@ class FirebaseStorageHostApiSetup { } let taskResumeChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.taskResume\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.taskResume\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1167,7 +1146,7 @@ class FirebaseStorageHostApiSetup { } let taskCancelChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.taskCancel\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.taskCancel\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) diff --git a/packages/firebase_storage/firebase_storage/ios/firebase_storage/Sources/firebase_storage/TaskStateChannelStreamHandler.swift b/packages/firebase_storage/firebase_storage/ios/firebase_storage/Sources/firebase_storage/TaskStateChannelStreamHandler.swift index 21acfcbe6f32..9cc69b046a25 100644 --- a/packages/firebase_storage/firebase_storage/ios/firebase_storage/Sources/firebase_storage/TaskStateChannelStreamHandler.swift +++ b/packages/firebase_storage/firebase_storage/ios/firebase_storage/Sources/firebase_storage/TaskStateChannelStreamHandler.swift @@ -27,13 +27,11 @@ final class TaskStateChannelStreamHandler: NSObject, FlutterStreamHandler { self.identifier = identifier } - func onListen( - withArguments arguments: Any?, - eventSink events: @escaping FlutterEventSink - ) -> FlutterError? { + func onListen(withArguments arguments: Any?, + eventSink events: @escaping FlutterEventSink) -> FlutterError? { successHandle = task.observe(.success) { snapshot in events([ - "taskState": 2, // success + "taskState": 2, // success "appName": self.storage.app.name, "snapshot": self.parseTaskSnapshot(snapshot), ]) @@ -43,7 +41,7 @@ final class TaskStateChannelStreamHandler: NSObject, FlutterStreamHandler { let err = snapshot.error as NSError? let errorDict: [String: Any] = self.errorDict(err) events([ - "taskState": 4, // error (including cancellations as errors per platform contract) + "taskState": 4, // error (including cancellations as errors per platform contract) "appName": self.storage.app.name, "error": errorDict, ]) @@ -51,14 +49,14 @@ final class TaskStateChannelStreamHandler: NSObject, FlutterStreamHandler { } pausedHandle = task.observe(.pause) { snapshot in events([ - "taskState": 0, // paused + "taskState": 0, // paused "appName": self.storage.app.name, "snapshot": self.parseTaskSnapshot(snapshot), ]) } progressHandle = task.observe(.progress) { snapshot in events([ - "taskState": 1, // running + "taskState": 1, // running "appName": self.storage.app.name, "snapshot": self.parseTaskSnapshot(snapshot), ]) @@ -107,8 +105,7 @@ final class TaskStateChannelStreamHandler: NSObject, FlutterStreamHandler { } let code: String if error.domain == StorageErrorDomain, - let storageCode = StorageErrorCode(rawValue: error.code) - { + let storageCode = StorageErrorCode(rawValue: error.code) { switch storageCode { case .objectNotFound: code = "object-not-found" case .bucketNotFound: code = "bucket-not-found" 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..96faaecf35e9 100644 --- a/packages/firebase_storage/firebase_storage/macos/firebase_storage/Package.swift +++ b/packages/firebase_storage/firebase_storage/macos/firebase_storage/Package.swift @@ -13,10 +13,10 @@ let firebaseSdkVersion: Version = "12.14.0" let package = Package( name: "firebase_storage", platforms: [ - .macOS("10.15") + .macOS("10.15"), ], products: [ - .library(name: "firebase-storage", targets: ["firebase_storage"]) + .library(name: "firebase-storage", targets: ["firebase_storage"]), ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,13 +30,13 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources") + .process("Resources"), ], cSettings: [ .headerSearchPath("include"), .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-gcs\""), ] - ) + ), ] ) From 0ffebcc1020b408eff874bc6b53af69c6622e730 Mon Sep 17 00:00:00 2001 From: Guillaume Bernos Date: Wed, 17 Jun 2026 11:30:39 +0200 Subject: [PATCH 2/2] format --- .../ios/cloud_firestore/Package.swift | 12 +- .../macos/cloud_firestore/Package.swift | 12 +- .../ios/cloud_functions/Package.swift | 10 +- .../CloudFunctionsMessages.g.swift | 15 +- .../FirebaseFunctionsPlugin.swift | 25 ++- .../FunctionsStreamHandler.swift | 13 +- .../macos/cloud_functions/Package.swift | 10 +- .../firebase_ai/example/ios/Podfile | 43 ++++ .../firebase_ai/example/macos/Podfile | 42 ++++ .../firebase_ai/ios/firebase_ai/Package.swift | 8 +- .../macos/firebase_ai/Package.swift | 8 +- .../ios/firebase_analytics/Package.swift | 10 +- .../FirebaseAnalyticsMessages.g.swift | 55 ++--- .../FirebaseAnalyticsPlugin.swift | 68 ++++--- .../macos/firebase_analytics/Package.swift | 10 +- .../firebase_app_check/example/ios/Podfile | 43 ++++ .../firebase_app_check/example/macos/Podfile | 42 ++++ .../ios/firebase_app_check/Package.swift | 10 +- .../FirebaseAppCheckMessages.g.swift | 38 ++-- .../FirebaseAppCheckPlugin.swift | 71 ++++--- .../macos/firebase_app_check/Package.swift | 10 +- .../firebase_app_installations/Package.swift | 10 +- .../FirebaseInstallationsPlugin.swift | 42 ++-- .../IdChangedStreamHandler.swift | 6 +- .../firebase_app_installations/Package.swift | 10 +- .../ios/firebase_auth/Package.swift | 12 +- .../macos/firebase_auth/Package.swift | 12 +- .../ios/firebase_core/Package.swift | 16 +- .../firebase_core/FLTFirebaseCorePlugin.m | 7 +- .../macos/firebase_core/Package.swift | 16 +- .../ios/firebase_crashlytics/Package.swift | 12 +- .../macos/firebase_crashlytics/Package.swift | 12 +- .../ios/firebase_database/Package.swift | 12 +- ...FirebaseDatabaseObserveStreamHandler.swift | 7 +- .../FLTFirebaseDatabasePlugin.swift | 157 ++++++++++----- .../FLTFirebaseDatabaseUtils.swift | 27 ++- .../FirebaseDatabaseMessages.g.swift | 190 ++++++++++-------- .../macos/firebase_database/Package.swift | 12 +- .../firebase_in_app_messaging/Package.swift | 12 +- .../FlutterFirebaseMessagingPlugin.java | 12 +- .../ios/firebase_messaging/Package.swift | 12 +- .../macos/firebase_messaging/Package.swift | 12 +- .../Package.swift | 10 +- .../FirebaseModelDownloaderPlugin.swift | 14 +- .../Package.swift | 10 +- .../ios/firebase_performance/Package.swift | 12 +- .../FirebasePerformanceMessages.g.swift | 38 ++-- .../FirebasePerformancePlugin.swift | 27 ++- .../ios/firebase_remote_config/Package.swift | 10 +- .../FirebaseRemoteConfigMessages.g.swift | 39 ++-- .../FirebaseRemoteConfigPlugin.swift | 36 ++-- .../FirebaseRemoteConfigUtils.swift | 5 +- .../firebase_remote_config/Package.swift | 10 +- .../ios/firebase_storage/Package.swift | 12 +- .../FLTFirebaseStoragePlugin.swift | 146 +++++++++----- .../FirebaseStorageMessages.g.swift | 155 ++++++++------ .../TaskStateChannelStreamHandler.swift | 17 +- .../macos/firebase_storage/Package.swift | 12 +- 58 files changed, 1074 insertions(+), 642 deletions(-) create mode 100644 packages/firebase_ai/firebase_ai/example/ios/Podfile create mode 100644 packages/firebase_ai/firebase_ai/example/macos/Podfile create mode 100644 packages/firebase_app_check/firebase_app_check/example/ios/Podfile create mode 100644 packages/firebase_app_check/firebase_app_check/example/macos/Podfile 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 1c58698320e7..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,16 +7,16 @@ 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", platforms: [ - .iOS("15.0"), + .iOS("15.0") ], products: [ - .library(name: "cloud-firestore", targets: ["cloud_firestore"]), + .library(name: "cloud-firestore", targets: ["cloud_firestore"]) ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,7 +30,7 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources"), + .process("Resources") ], cSettings: [ .headerSearchPath("include/cloud_firestore/Private"), @@ -38,6 +38,6 @@ let package = Package( .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-fst\""), ] - ), + ) ] ) 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 de5ef20cb2d8..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,16 +7,16 @@ 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", platforms: [ - .macOS("10.15"), + .macOS("10.15") ], products: [ - .library(name: "cloud-firestore", targets: ["cloud_firestore"]), + .library(name: "cloud-firestore", targets: ["cloud_firestore"]) ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,7 +30,7 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources"), + .process("Resources") ], cSettings: [ .headerSearchPath("include/cloud_firestore/Private"), @@ -38,6 +38,6 @@ let package = Package( .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-fst\""), ] - ), + ) ] ) 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 d23cef4787af..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,15 +7,15 @@ import PackageDescription -let firebaseSdkVersion: Version = "12.14.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "cloud_functions", platforms: [ - .iOS("15.0"), + .iOS("15.0") ], products: [ - .library(name: "cloud-functions", targets: ["cloud_functions"]), + .library(name: "cloud-functions", targets: ["cloud_functions"]) ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -29,8 +29,8 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources"), + .process("Resources") ] - ), + ) ] ) diff --git a/packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/CloudFunctionsMessages.g.swift b/packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/CloudFunctionsMessages.g.swift index 19b6fc229d6d..86ba0c92f137 100644 --- a/packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/CloudFunctionsMessages.g.swift +++ b/packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/CloudFunctionsMessages.g.swift @@ -88,8 +88,9 @@ class CloudFunctionsMessagesPigeonCodec: FlutterStandardMessageCodec, @unchecked /// Generated protocol from Pigeon that represents a handler of messages from Flutter. protocol CloudFunctionsHostApi { func call(arguments: [String: Any?], completion: @escaping (Result) -> Void) - func registerEventChannel(arguments: [String: Any], - completion: @escaping (Result) -> Void) + func registerEventChannel( + arguments: [String: Any], + completion: @escaping (Result) -> Void) } /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`. @@ -100,12 +101,14 @@ class CloudFunctionsHostApiSetup { /// Sets up an instance of `CloudFunctionsHostApi` to handle messages through the /// `binaryMessenger`. - static func setUp(binaryMessenger: FlutterBinaryMessenger, api: CloudFunctionsHostApi?, - messageChannelSuffix: String = "") { + static func setUp( + binaryMessenger: FlutterBinaryMessenger, api: CloudFunctionsHostApi?, + messageChannelSuffix: String = "" + ) { let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" let callChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.cloud_functions_platform_interface.CloudFunctionsHostApi.call\(channelSuffix)", + "dev.flutter.pigeon.cloud_functions_platform_interface.CloudFunctionsHostApi.call\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -127,7 +130,7 @@ class CloudFunctionsHostApiSetup { } let registerEventChannelChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.cloud_functions_platform_interface.CloudFunctionsHostApi.registerEventChannel\(channelSuffix)", + "dev.flutter.pigeon.cloud_functions_platform_interface.CloudFunctionsHostApi.registerEventChannel\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) diff --git a/packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/FirebaseFunctionsPlugin.swift b/packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/FirebaseFunctionsPlugin.swift index 18941ed8c2b5..c5026ca8578b 100644 --- a/packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/FirebaseFunctionsPlugin.swift +++ b/packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/FirebaseFunctionsPlugin.swift @@ -21,7 +21,8 @@ extension FlutterError: Error {} let kFLTFirebaseFunctionsChannelName = "plugins.flutter.io/firebase_functions" public class FirebaseFunctionsPlugin: NSObject, FLTFirebasePluginProtocol, FlutterPlugin, - CloudFunctionsHostApi { + CloudFunctionsHostApi +{ func call(arguments: [String: Any?], completion: @escaping (Result) -> Void) { httpsFunctionCall(arguments: arguments) { result, error in if let error { @@ -32,8 +33,10 @@ public class FirebaseFunctionsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt } } - func registerEventChannel(arguments: [String: Any], - completion: @escaping (Result) -> Void) { + func registerEventChannel( + arguments: [String: Any], + completion: @escaping (Result) -> Void + ) { let eventChannelId = arguments["eventChannelId"]! let eventChannelName = "\(kFLTFirebaseFunctionsChannelName)/\(eventChannelId)" let eventChannel = FlutterEventChannel(name: eventChannelName, binaryMessenger: binaryMessenger) @@ -81,8 +84,10 @@ public class FirebaseFunctionsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt CloudFunctionsHostApiSetup.setUp(binaryMessenger: binaryMessenger, api: instance) } - private func httpsFunctionCall(arguments: [String: Any], - completion: @escaping (Any?, FlutterError?) -> Void) { + private func httpsFunctionCall( + arguments: [String: Any], + completion: @escaping (Any?, FlutterError?) -> Void + ) { let appName = arguments["appName"] as? String ?? "" let functionName = arguments["functionName"] as? String let functionUri = arguments["functionUri"] as? String @@ -97,9 +102,10 @@ public class FirebaseFunctionsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt let functions = Functions.functions(app: app, region: region ?? "") if let origin, !origin.isEmpty, - let url = URL(string: origin), - let host = url.host, - let port = url.port { + let url = URL(string: origin), + let host = url.host, + let port = url.port + { functions.useEmulator(withHost: host, port: port) } @@ -110,7 +116,8 @@ public class FirebaseFunctionsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt if let functionName, !functionName.isEmpty { function = functions.httpsCallable(functionName, options: options) } else if let functionUri, !functionUri.isEmpty, - let url = URL(string: functionUri) { + let url = URL(string: functionUri) + { function = functions.httpsCallable(url, options: options) } else { completion( diff --git a/packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/FunctionsStreamHandler.swift b/packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/FunctionsStreamHandler.swift index 6b238cbd7c4f..7d2ce08e76cc 100644 --- a/packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/FunctionsStreamHandler.swift +++ b/packages/cloud_functions/cloud_functions/ios/cloud_functions/Sources/cloud_functions/FunctionsStreamHandler.swift @@ -19,8 +19,10 @@ class FunctionsStreamHandler: NSObject, FlutterStreamHandler { super.init() } - func onListen(withArguments arguments: Any?, - eventSink events: @escaping FlutterEventSink) -> FlutterError? { + func onListen( + withArguments arguments: Any?, + eventSink events: @escaping FlutterEventSink + ) -> FlutterError? { streamTask = Task { await httpsStreamCall(arguments: arguments, events: events) } @@ -53,9 +55,10 @@ class FunctionsStreamHandler: NSObject, FlutterStreamHandler { let limitedUseAppCheckToken = arguments["limitedUseAppCheckToken"] as? Bool ?? false if let origin, - let url = URL(string: origin), - let host = url.host, - let port = url.port { + let url = URL(string: origin), + let host = url.host, + let port = url.port + { functions.useEmulator(withHost: host, port: port) } 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 e0d6c5a0cccb..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,15 +7,15 @@ import PackageDescription -let firebaseSdkVersion: Version = "12.14.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "cloud_functions", platforms: [ - .macOS("10.15"), + .macOS("10.15") ], products: [ - .library(name: "cloud-functions", targets: ["cloud_functions"]), + .library(name: "cloud-functions", targets: ["cloud_functions"]) ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -29,8 +29,8 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources"), + .process("Resources") ] - ), + ) ] ) 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_ai/firebase_ai/ios/firebase_ai/Package.swift b/packages/firebase_ai/firebase_ai/ios/firebase_ai/Package.swift index 087f2530b1c1..a9bd49d4e4d1 100644 --- a/packages/firebase_ai/firebase_ai/ios/firebase_ai/Package.swift +++ b/packages/firebase_ai/firebase_ai/ios/firebase_ai/Package.swift @@ -10,10 +10,10 @@ import PackageDescription let package = Package( name: "firebase_ai", platforms: [ - .iOS("15.0"), + .iOS("15.0") ], products: [ - .library(name: "firebase-ai", targets: ["firebase_ai"]), + .library(name: "firebase-ai", targets: ["firebase_ai"]) ], dependencies: [], targets: [ @@ -21,8 +21,8 @@ let package = Package( name: "firebase_ai", dependencies: [], resources: [ - .process("Resources"), + .process("Resources") ] - ), + ) ] ) diff --git a/packages/firebase_ai/firebase_ai/macos/firebase_ai/Package.swift b/packages/firebase_ai/firebase_ai/macos/firebase_ai/Package.swift index 5440873b51b2..c551b27e41a6 100644 --- a/packages/firebase_ai/firebase_ai/macos/firebase_ai/Package.swift +++ b/packages/firebase_ai/firebase_ai/macos/firebase_ai/Package.swift @@ -10,10 +10,10 @@ import PackageDescription let package = Package( name: "firebase_ai", platforms: [ - .macOS("10.15"), + .macOS("10.15") ], products: [ - .library(name: "firebase-ai", targets: ["firebase_ai"]), + .library(name: "firebase-ai", targets: ["firebase_ai"]) ], dependencies: [], targets: [ @@ -21,8 +21,8 @@ let package = Package( name: "firebase_ai", dependencies: [], resources: [ - .process("Resources"), + .process("Resources") ] - ), + ) ] ) 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 68449c9b28b4..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 @@ -18,10 +18,10 @@ let analyticsProduct = useWithoutAdId ? "FirebaseAnalyticsCore" : "FirebaseAnaly let package = Package( name: "firebase_analytics", platforms: [ - .iOS("15.0"), + .iOS("15.0") ], products: [ - .library(name: "firebase-analytics", targets: ["firebase_analytics"]), + .library(name: "firebase-analytics", targets: ["firebase_analytics"]) ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -35,8 +35,8 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources"), + .process("Resources") ] - ), + ) ] ) diff --git a/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Sources/firebase_analytics/FirebaseAnalyticsMessages.g.swift b/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Sources/firebase_analytics/FirebaseAnalyticsMessages.g.swift index 783b48483039..c3a557049cc0 100644 --- a/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Sources/firebase_analytics/FirebaseAnalyticsMessages.g.swift +++ b/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Sources/firebase_analytics/FirebaseAnalyticsMessages.g.swift @@ -259,20 +259,25 @@ class FirebaseAnalyticsMessagesPigeonCodec: FlutterStandardMessageCodec, @unchec protocol FirebaseAnalyticsHostApi { func logEvent(event: [String: Any?], completion: @escaping (Result) -> Void) func setUserId(userId: String?, completion: @escaping (Result) -> Void) - func setUserProperty(name: String, value: String?, - completion: @escaping (Result) -> Void) - func setAnalyticsCollectionEnabled(enabled: Bool, - completion: @escaping (Result) -> Void) + func setUserProperty( + name: String, value: String?, + completion: @escaping (Result) -> Void) + func setAnalyticsCollectionEnabled( + enabled: Bool, + completion: @escaping (Result) -> Void) func resetAnalyticsData(completion: @escaping (Result) -> Void) - func setSessionTimeoutDuration(timeout: Int64, - completion: @escaping (Result) -> Void) + func setSessionTimeoutDuration( + timeout: Int64, + completion: @escaping (Result) -> Void) func setConsent(consent: [String: Bool?], completion: @escaping (Result) -> Void) - func setDefaultEventParameters(parameters: [String: Any?]?, - completion: @escaping (Result) -> Void) + func setDefaultEventParameters( + parameters: [String: Any?]?, + completion: @escaping (Result) -> Void) func getAppInstanceId(completion: @escaping (Result) -> Void) func getSessionId(completion: @escaping (Result) -> Void) - func initiateOnDeviceConversionMeasurement(arguments: [String: String?], - completion: @escaping (Result) -> Void) + func initiateOnDeviceConversionMeasurement( + arguments: [String: String?], + completion: @escaping (Result) -> Void) func logTransaction(transactionId: String, completion: @escaping (Result) -> Void) } @@ -284,12 +289,14 @@ class FirebaseAnalyticsHostApiSetup { /// Sets up an instance of `FirebaseAnalyticsHostApi` to handle messages through the /// `binaryMessenger`. - static func setUp(binaryMessenger: FlutterBinaryMessenger, api: FirebaseAnalyticsHostApi?, - messageChannelSuffix: String = "") { + static func setUp( + binaryMessenger: FlutterBinaryMessenger, api: FirebaseAnalyticsHostApi?, + messageChannelSuffix: String = "" + ) { let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" let logEventChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.logEvent\(channelSuffix)", + "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.logEvent\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -311,7 +318,7 @@ class FirebaseAnalyticsHostApiSetup { } let setUserIdChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.setUserId\(channelSuffix)", + "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.setUserId\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -333,7 +340,7 @@ class FirebaseAnalyticsHostApiSetup { } let setUserPropertyChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.setUserProperty\(channelSuffix)", + "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.setUserProperty\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -356,7 +363,7 @@ class FirebaseAnalyticsHostApiSetup { } let setAnalyticsCollectionEnabledChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.setAnalyticsCollectionEnabled\(channelSuffix)", + "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.setAnalyticsCollectionEnabled\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -378,7 +385,7 @@ class FirebaseAnalyticsHostApiSetup { } let resetAnalyticsDataChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.resetAnalyticsData\(channelSuffix)", + "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.resetAnalyticsData\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -398,7 +405,7 @@ class FirebaseAnalyticsHostApiSetup { } let setSessionTimeoutDurationChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.setSessionTimeoutDuration\(channelSuffix)", + "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.setSessionTimeoutDuration\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -420,7 +427,7 @@ class FirebaseAnalyticsHostApiSetup { } let setConsentChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.setConsent\(channelSuffix)", + "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.setConsent\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -442,7 +449,7 @@ class FirebaseAnalyticsHostApiSetup { } let setDefaultEventParametersChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.setDefaultEventParameters\(channelSuffix)", + "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.setDefaultEventParameters\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -464,7 +471,7 @@ class FirebaseAnalyticsHostApiSetup { } let getAppInstanceIdChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.getAppInstanceId\(channelSuffix)", + "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.getAppInstanceId\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -484,7 +491,7 @@ class FirebaseAnalyticsHostApiSetup { } let getSessionIdChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.getSessionId\(channelSuffix)", + "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.getSessionId\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -504,7 +511,7 @@ class FirebaseAnalyticsHostApiSetup { } let initiateOnDeviceConversionMeasurementChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.initiateOnDeviceConversionMeasurement\(channelSuffix)", + "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.initiateOnDeviceConversionMeasurement\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -526,7 +533,7 @@ class FirebaseAnalyticsHostApiSetup { } let logTransactionChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.logTransaction\(channelSuffix)", + "dev.flutter.pigeon.firebase_analytics_platform_interface.FirebaseAnalyticsHostApi.logTransaction\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) diff --git a/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Sources/firebase_analytics/FirebaseAnalyticsPlugin.swift b/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Sources/firebase_analytics/FirebaseAnalyticsPlugin.swift index 9f36574f635b..96b5921f88b0 100644 --- a/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Sources/firebase_analytics/FirebaseAnalyticsPlugin.swift +++ b/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Sources/firebase_analytics/FirebaseAnalyticsPlugin.swift @@ -34,7 +34,8 @@ let FLTFirebaseAnalyticsChannelName = "plugins.flutter.io/firebase_analytics" extension FlutterError: Error {} public class FirebaseAnalyticsPlugin: NSObject, FLTFirebasePluginProtocol, FlutterPlugin, - FirebaseAnalyticsHostApi { + FirebaseAnalyticsHostApi +{ public static func register(with registrar: any FlutterPluginRegistrar) { let binaryMessenger: FlutterBinaryMessenger @@ -63,14 +64,18 @@ public class FirebaseAnalyticsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt completion(.success(())) } - func setUserProperty(name: String, value: String?, - completion: @escaping (Result) -> Void) { + func setUserProperty( + name: String, value: String?, + completion: @escaping (Result) -> Void + ) { Analytics.setUserProperty(value, forName: name) completion(.success(())) } - func setAnalyticsCollectionEnabled(enabled: Bool, - completion: @escaping (Result) -> Void) { + func setAnalyticsCollectionEnabled( + enabled: Bool, + completion: @escaping (Result) -> Void + ) { Analytics.setAnalyticsCollectionEnabled(enabled) completion(.success(())) } @@ -80,14 +85,18 @@ public class FirebaseAnalyticsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt completion(.success(())) } - func setSessionTimeoutDuration(timeout: Int64, - completion: @escaping (Result) -> Void) { + func setSessionTimeoutDuration( + timeout: Int64, + completion: @escaping (Result) -> Void + ) { Analytics.setSessionTimeoutInterval(TimeInterval(timeout)) completion(.success(())) } - func setConsent(consent: [String: Bool?], - completion: @escaping (Result) -> Void) { + func setConsent( + consent: [String: Bool?], + completion: @escaping (Result) -> Void + ) { var parameters: [ConsentType: ConsentStatus] = [:] if let adStorage = consent[kFLTFirebaseAnalyticsAdStorageConsentGranted] as? Bool { parameters[.adStorage] = adStorage ? .granted : .denied @@ -96,7 +105,8 @@ public class FirebaseAnalyticsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt parameters[.analyticsStorage] = analyticsStorage ? .granted : .denied } if let adPersonalization = - consent[kFLTFirebaseAdPersonalizationSignalsConsentGranted] as? Bool { + consent[kFLTFirebaseAdPersonalizationSignalsConsentGranted] as? Bool + { parameters[.adPersonalization] = adPersonalization ? .granted : .denied } if let adUserData = consent[kFLTFirebaseAdUserDataConsentGranted] as? Bool { @@ -106,8 +116,10 @@ public class FirebaseAnalyticsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt completion(.success(())) } - func setDefaultEventParameters(parameters: [String: Any?]?, - completion: @escaping (Result) -> Void) { + func setDefaultEventParameters( + parameters: [String: Any?]?, + completion: @escaping (Result) -> Void + ) { Analytics.setDefaultEventParameters(parameters) completion(.success(())) } @@ -127,10 +139,12 @@ public class FirebaseAnalyticsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt } } - func initiateOnDeviceConversionMeasurement(arguments: [String: String?], - completion: - @escaping (Result) - -> Void) { + func initiateOnDeviceConversionMeasurement( + arguments: [String: String?], + completion: + @escaping (Result) + -> Void + ) { if let emailAddress = arguments["emailAddress"] as? String { Analytics.initiateOnDeviceConversionMeasurement(emailAddress: emailAddress) } @@ -138,18 +152,22 @@ public class FirebaseAnalyticsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt Analytics.initiateOnDeviceConversionMeasurement(phoneNumber: phoneNumber) } if let hashedEmailAddress = arguments["hashedEmailAddress"] as? String, - let data = hexStringToData(hashedEmailAddress) { + let data = hexStringToData(hashedEmailAddress) + { Analytics.initiateOnDeviceConversionMeasurement(hashedEmailAddress: data) } if let hashedPhoneNumber = arguments["hashedPhoneNumber"] as? String, - let data = hexStringToData(hashedPhoneNumber) { + let data = hexStringToData(hashedPhoneNumber) + { Analytics.initiateOnDeviceConversionMeasurement(hashedPhoneNumber: data) } completion(.success(())) } - func logTransaction(transactionId: String, - completion: @escaping (Result) -> Void) { + func logTransaction( + transactionId: String, + completion: @escaping (Result) -> Void + ) { #if os(macOS) if #available(macOS 12.0, *) { logTransactionWithStoreKit(transactionId: transactionId, completion: completion) @@ -186,8 +204,10 @@ public class FirebaseAnalyticsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt #else @available(iOS 15.0, *) #endif - private func logTransactionWithStoreKit(transactionId: String, - completion: @escaping (Result) -> Void) { + private func logTransactionWithStoreKit( + transactionId: String, + completion: @escaping (Result) -> Void + ) { Task { do { guard let id = UInt64(transactionId) else { @@ -244,9 +264,9 @@ public class FirebaseAnalyticsPlugin: NSObject, FLTFirebasePluginProtocol, Flutt var data = Data(capacity: length / 2) var index = hexString.startIndex - for _ in 0 ..< (length / 2) { + for _ in 0..<(length / 2) { let nextIndex = hexString.index(index, offsetBy: 2) - guard let byte = UInt8(hexString[index ..< nextIndex], radix: 16) else { + guard let byte = UInt8(hexString[index.. :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 739abdeb2bee..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,15 +7,15 @@ import PackageDescription -let firebaseSdkVersion: Version = "12.14.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_app_check", platforms: [ - .iOS("15.0"), + .iOS("15.0") ], products: [ - .library(name: "firebase-app-check", targets: ["firebase_app_check"]), + .library(name: "firebase-app-check", targets: ["firebase_app_check"]) ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -34,8 +34,8 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources"), + .process("Resources") ] - ), + ) ] ) 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 6ea943c1b7fa..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 @@ -88,16 +88,20 @@ class FirebaseAppCheckMessagesPigeonCodec: FlutterStandardMessageCodec, @uncheck /// Generated protocol from Pigeon that represents a handler of messages from Flutter. protocol FirebaseAppCheckHostApi { - func activate(appName: String, androidProvider: String?, appleProvider: String?, - debugToken: String?, - completion: @escaping (Result) -> Void) - func getToken(appName: String, forceRefresh: Bool, - completion: @escaping (Result) -> Void) - func setTokenAutoRefreshEnabled(appName: String, isTokenAutoRefreshEnabled: Bool, - completion: @escaping (Result) -> Void) + func activate( + appName: String, androidProvider: String?, appleProvider: String?, + debugToken: String?, + completion: @escaping (Result) -> Void) + func getToken( + 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) + func getLimitedUseAppCheckToken( + appName: String, + completion: @escaping (Result) -> Void) } /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`. @@ -108,12 +112,14 @@ class FirebaseAppCheckHostApiSetup { /// Sets up an instance of `FirebaseAppCheckHostApi` to handle messages through the /// `binaryMessenger`. - static func setUp(binaryMessenger: FlutterBinaryMessenger, api: FirebaseAppCheckHostApi?, - messageChannelSuffix: String = "") { + static func setUp( + binaryMessenger: FlutterBinaryMessenger, api: FirebaseAppCheckHostApi?, + messageChannelSuffix: String = "" + ) { let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" let activateChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_app_check_platform_interface.FirebaseAppCheckHostApi.activate\(channelSuffix)", + "dev.flutter.pigeon.firebase_app_check_platform_interface.FirebaseAppCheckHostApi.activate\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) if let api { @@ -140,7 +146,7 @@ class FirebaseAppCheckHostApiSetup { } let getTokenChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_app_check_platform_interface.FirebaseAppCheckHostApi.getToken\(channelSuffix)", + "dev.flutter.pigeon.firebase_app_check_platform_interface.FirebaseAppCheckHostApi.getToken\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) if let api { @@ -162,7 +168,7 @@ class FirebaseAppCheckHostApiSetup { } let setTokenAutoRefreshEnabledChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_app_check_platform_interface.FirebaseAppCheckHostApi.setTokenAutoRefreshEnabled\(channelSuffix)", + "dev.flutter.pigeon.firebase_app_check_platform_interface.FirebaseAppCheckHostApi.setTokenAutoRefreshEnabled\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) if let api { @@ -186,7 +192,7 @@ class FirebaseAppCheckHostApiSetup { } let registerTokenListenerChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_app_check_platform_interface.FirebaseAppCheckHostApi.registerTokenListener\(channelSuffix)", + "dev.flutter.pigeon.firebase_app_check_platform_interface.FirebaseAppCheckHostApi.registerTokenListener\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) if let api { @@ -207,7 +213,7 @@ class FirebaseAppCheckHostApiSetup { } let getLimitedUseAppCheckTokenChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_app_check_platform_interface.FirebaseAppCheckHostApi.getLimitedUseAppCheckToken\(channelSuffix)", + "dev.flutter.pigeon.firebase_app_check_platform_interface.FirebaseAppCheckHostApi.getLimitedUseAppCheckToken\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) if let api { diff --git a/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Sources/firebase_app_check/FirebaseAppCheckPlugin.swift b/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Sources/firebase_app_check/FirebaseAppCheckPlugin.swift index a20e7f84640e..2d63a7652e18 100644 --- a/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Sources/firebase_app_check/FirebaseAppCheckPlugin.swift +++ b/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Sources/firebase_app_check/FirebaseAppCheckPlugin.swift @@ -24,7 +24,8 @@ let kFirebaseAppCheckTokenChannelPrefix = "plugins.flutter.io/firebase_app_check extension FlutterError: @retroactive Error {} public class FirebaseAppCheckPlugin: NSObject, FlutterPlugin, - FLTFirebasePluginProtocol, FirebaseAppCheckHostApi { + FLTFirebasePluginProtocol, FirebaseAppCheckHostApi +{ private var eventChannels: [String: FlutterEventChannel] = [:] private var streamHandlers: [String: AppCheckTokenStreamHandler] = [:] private var providerFactory: FlutterAppCheckProviderFactory? @@ -61,9 +62,11 @@ public class FirebaseAppCheckPlugin: NSObject, FlutterPlugin, private var binaryMessenger: FlutterBinaryMessenger? - func activate(appName: String, androidProvider: String?, appleProvider: String?, - debugToken: String?, - completion: @escaping (Result) -> Void) { + func activate( + appName: String, androidProvider: String?, appleProvider: String?, + debugToken: String?, + completion: @escaping (Result) -> Void + ) { guard let app = FLTFirebasePlugin.firebaseAppNamed(appName) else { completion( .failure( @@ -85,10 +88,12 @@ public class FirebaseAppCheckPlugin: NSObject, FlutterPlugin, completion(.success(())) } - func getToken(appName: String, forceRefresh: Bool, - completion: @escaping (Result) -> Void) { + func getToken( + appName: String, forceRefresh: Bool, + completion: @escaping (Result) -> Void + ) { guard let app = FLTFirebasePlugin.firebaseAppNamed(appName), - let appCheck = AppCheck.appCheck(app: app) + let appCheck = AppCheck.appCheck(app: app) else { completion( .failure( @@ -109,10 +114,12 @@ public class FirebaseAppCheckPlugin: NSObject, FlutterPlugin, } } - func setTokenAutoRefreshEnabled(appName: String, isTokenAutoRefreshEnabled: Bool, - completion: @escaping (Result) -> Void) { + func setTokenAutoRefreshEnabled( + appName: String, isTokenAutoRefreshEnabled: Bool, + completion: @escaping (Result) -> Void + ) { guard let app = FLTFirebasePlugin.firebaseAppNamed(appName), - let appCheck = AppCheck.appCheck(app: app) + let appCheck = AppCheck.appCheck(app: app) else { completion( .failure( @@ -127,8 +134,10 @@ public class FirebaseAppCheckPlugin: NSObject, FlutterPlugin, completion(.success(())) } - func registerTokenListener(appName: String, - completion: @escaping (Result) -> Void) { + func registerTokenListener( + appName: String, + completion: @escaping (Result) -> Void + ) { let name = kFirebaseAppCheckTokenChannelPrefix + appName guard let messenger = binaryMessenger else { @@ -154,10 +163,12 @@ public class FirebaseAppCheckPlugin: NSObject, FlutterPlugin, completion(.success(name)) } - func getLimitedUseAppCheckToken(appName: String, - completion: @escaping (Result) -> Void) { + func getLimitedUseAppCheckToken( + appName: String, + completion: @escaping (Result) -> Void + ) { guard let app = FLTFirebasePlugin.firebaseAppNamed(appName), - let appCheck = AppCheck.appCheck(app: app) + let appCheck = AppCheck.appCheck(app: app) else { completion( .failure( @@ -212,13 +223,13 @@ public class FirebaseAppCheckPlugin: NSObject, FlutterPlugin, let nsError = error as NSError var code = "unknown" switch nsError.code { - case 0: // FIRAppCheckErrorCodeServerUnreachable + case 0: // FIRAppCheckErrorCodeServerUnreachable code = "server-unreachable" - case 1: // FIRAppCheckErrorCodeInvalidConfiguration + case 1: // FIRAppCheckErrorCodeInvalidConfiguration code = "invalid-configuration" - case 2: // FIRAppCheckErrorCodeKeychain + case 2: // FIRAppCheckErrorCodeKeychain code = "code-keychain" - case 3: // FIRAppCheckErrorCodeUnsupported + case 3: // FIRAppCheckErrorCodeUnsupported code = "code-unsupported" default: code = "unknown" @@ -236,8 +247,10 @@ public class FirebaseAppCheckPlugin: NSObject, FlutterPlugin, class AppCheckTokenStreamHandler: NSObject, FlutterStreamHandler { private var observer: NSObjectProtocol? - func onListen(withArguments arguments: Any?, - eventSink events: @escaping FlutterEventSink) -> FlutterError? { + func onListen( + withArguments arguments: Any?, + eventSink events: @escaping FlutterEventSink + ) -> FlutterError? { observer = NotificationCenter.default.addObserver( forName: NSNotification.Name("FIRAppCheckAppCheckTokenDidChangeNotification"), object: nil, @@ -278,9 +291,11 @@ class FlutterAppCheckProviderFactory: NSObject, AppCheckProviderFactory { return providers[app.name] } - func configure(app: FirebaseApp, - providerName: String, - debugToken: String?) { + func configure( + app: FirebaseApp, + providerName: String, + debugToken: String? + ) { if providers[app.name] == nil { providers[app.name] = AppCheckProviderWrapper() } @@ -295,9 +310,11 @@ class FlutterAppCheckProviderFactory: NSObject, AppCheckProviderFactory { class AppCheckProviderWrapper: NSObject, AppCheckProvider { private var delegateProvider: (any AppCheckProvider)? - func configure(app: FirebaseApp, - providerName: String, - debugToken: String?) { + func configure( + app: FirebaseApp, + providerName: String, + debugToken: String? + ) { switch providerName { case "debug": if let debugToken { 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 25cc1e541648..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,15 +7,15 @@ import PackageDescription -let firebaseSdkVersion: Version = "12.14.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_app_check", platforms: [ - .macOS("10.15"), + .macOS("10.15") ], products: [ - .library(name: "firebase-app-check", targets: ["firebase_app_check"]), + .library(name: "firebase-app-check", targets: ["firebase_app_check"]) ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -29,8 +29,8 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources"), + .process("Resources") ] - ), + ) ] ) 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 8a1b7d4483f5..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,15 +7,15 @@ import PackageDescription -let firebaseSdkVersion: Version = "12.14.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_app_installations", platforms: [ - .iOS("15.0"), + .iOS("15.0") ], products: [ - .library(name: "firebase-app-installations", targets: ["firebase_app_installations"]), + .library(name: "firebase-app-installations", targets: ["firebase_app_installations"]) ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -29,8 +29,8 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources"), + .process("Resources") ] - ), + ) ] ) diff --git a/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Sources/firebase_app_installations/FirebaseInstallationsPlugin.swift b/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Sources/firebase_app_installations/FirebaseInstallationsPlugin.swift index 7d5a0c426033..eb1d365a1f7e 100644 --- a/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Sources/firebase_app_installations/FirebaseInstallationsPlugin.swift +++ b/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Sources/firebase_app_installations/FirebaseInstallationsPlugin.swift @@ -76,8 +76,10 @@ public class FirebaseInstallationsPlugin: NSObject, FLTFirebasePluginProtocol, F /// - Parameter arguments: the arguments passed by the Dart calling method /// - Parameter result: the result instance used to send the result to Dart. /// - Parameter errorBlock: the error block used to send the error to Dart. - private func getId(arguments: NSDictionary, result: @escaping FlutterResult, - errorBlock: @escaping FLTFirebaseMethodCallErrorBlock) { + private func getId( + arguments: NSDictionary, result: @escaping FlutterResult, + errorBlock: @escaping FLTFirebaseMethodCallErrorBlock + ) { let instance = getInstallations(appName: arguments["appName"] as! String) instance.installationID { (id: String?, error: Error?) in if let error { @@ -92,8 +94,10 @@ public class FirebaseInstallationsPlugin: NSObject, FLTFirebasePluginProtocol, F /// - Parameter arguments: the arguments passed by the Dart calling method /// - Parameter result: the result instance used to send the result to Dart. /// - Parameter errorBlock: the error block used to send the error to Dart. - private func deleteId(arguments: NSDictionary, result: @escaping FlutterResult, - errorBlock: @escaping FLTFirebaseMethodCallErrorBlock) { + private func deleteId( + arguments: NSDictionary, result: @escaping FlutterResult, + errorBlock: @escaping FLTFirebaseMethodCallErrorBlock + ) { let instance = getInstallations(appName: arguments["appName"] as! String) instance.delete { (error: Error?) in if let error { @@ -108,14 +112,18 @@ public class FirebaseInstallationsPlugin: NSObject, FLTFirebasePluginProtocol, F /// - Parameter arguments: the arguments passed by the Dart calling method /// - Parameter result: the result instance used to send the result to Dart. /// - Parameter errorBlock: the error block used to send the error to Dart. - private func getToken(arguments: NSDictionary, result: @escaping FlutterResult, - errorBlock: @escaping FLTFirebaseMethodCallErrorBlock) { + private func getToken( + arguments: NSDictionary, result: @escaping FlutterResult, + errorBlock: @escaping FLTFirebaseMethodCallErrorBlock + ) { let instance = getInstallations(appName: arguments["appName"] as! String) let forceRefresh = arguments["forceRefresh"] as? Bool ?? false instance .authTokenForcingRefresh(forceRefresh) { - (tokenResult: InstallationsAuthTokenResult?, - error: Error?) in + ( + tokenResult: InstallationsAuthTokenResult?, + error: Error? + ) in if let error { errorBlock(nil, nil, nil, error) } else { @@ -128,8 +136,10 @@ public class FirebaseInstallationsPlugin: NSObject, FLTFirebasePluginProtocol, F /// - Parameter arguments: the arguments passed by the Dart calling method /// - Parameter result: the result instance used to send the result to Dart. /// - Parameter errorBlock: the error block used to send the error to Dart. - private func registerIdChangeListener(arguments: NSDictionary, result: @escaping FlutterResult, - errorBlock: @escaping FLTFirebaseMethodCallErrorBlock) { + private func registerIdChangeListener( + arguments: NSDictionary, result: @escaping FlutterResult, + errorBlock: @escaping FLTFirebaseMethodCallErrorBlock + ) { let instance = getInstallations(appName: arguments["appName"] as! String) let appName = arguments["appName"] as! String let eventChannelName = kFLTFirebaseInstallationsChannelName + "/token/" + appName @@ -178,17 +188,19 @@ public class FirebaseInstallationsPlugin: NSObject, FLTFirebasePluginProtocol, F } let errorBlock: FLTFirebaseMethodCallErrorBlock = { - (code, message, details, - error: Error?) in + ( + code, message, details, + error: Error? + ) in var errorDetails = [String: Any?]() errorDetails["code"] = code - ?? self - .mapInstallationsErrorCodes(code: UInt((error! as NSError).code)) + ?? self + .mapInstallationsErrorCodes(code: UInt((error! as NSError).code)) errorDetails["message"] = message ?? error? - .localizedDescription ?? "An unknown error has occurred." + .localizedDescription ?? "An unknown error has occurred." errorDetails["additionalData"] = details if code == "unknown" { diff --git a/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Sources/firebase_app_installations/IdChangedStreamHandler.swift b/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Sources/firebase_app_installations/IdChangedStreamHandler.swift index 30790c94adf5..89f9cbc2e4e9 100644 --- a/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Sources/firebase_app_installations/IdChangedStreamHandler.swift +++ b/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Sources/firebase_app_installations/IdChangedStreamHandler.swift @@ -47,8 +47,10 @@ class IdChangedStreamHandler: NSObject, FlutterStreamHandler { } } - func onListen(withArguments _: Any?, - eventSink events: @escaping FlutterEventSink) -> FlutterError? { + func onListen( + withArguments _: Any?, + eventSink events: @escaping FlutterEventSink + ) -> FlutterError? { eventSink = events installationIDObserver = NotificationCenter.default.addObserver( 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 50e0f1becf79..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,15 +7,15 @@ import PackageDescription -let firebaseSdkVersion: Version = "12.14.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_app_installations", platforms: [ - .macOS("10.15"), + .macOS("10.15") ], products: [ - .library(name: "firebase-app-installations", targets: ["firebase_app_installations"]), + .library(name: "firebase-app-installations", targets: ["firebase_app_installations"]) ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -29,8 +29,8 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources"), + .process("Resources") ] - ), + ) ] ) 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 2a8e0d0ae70d..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,16 +7,16 @@ 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", platforms: [ - .iOS("15.0"), + .iOS("15.0") ], products: [ - .library(name: "firebase-auth", targets: ["firebase_auth"]), + .library(name: "firebase-auth", targets: ["firebase_auth"]) ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,7 +30,7 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources"), + .process("Resources") ], cSettings: [ .headerSearchPath("include/Private"), @@ -38,6 +38,6 @@ let package = Package( .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-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 c7b91fdddac9..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,16 +7,16 @@ 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", platforms: [ - .macOS("10.15"), + .macOS("10.15") ], products: [ - .library(name: "firebase-auth", targets: ["firebase_auth"]), + .library(name: "firebase-auth", targets: ["firebase_auth"]) ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,7 +30,7 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources"), + .process("Resources") ], cSettings: [ .headerSearchPath("include/Private"), @@ -38,6 +38,6 @@ let package = Package( .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-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 dd6e941b2e14..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,35 +7,35 @@ 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", platforms: [ - .iOS("15.0"), + .iOS("15.0") ], products: [ - .library(name: "firebase-core", targets: ["firebase_core"]), + .library(name: "firebase-core", targets: ["firebase_core"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion) ], targets: [ .target( name: "firebase_core", dependencies: [ // No product for firebase-core so we pull in the smallest one - .product(name: "FirebaseInstallations", package: "firebase-ios-sdk"), + .product(name: "FirebaseInstallations", package: "firebase-ios-sdk") ], resources: [ - .process("Resources"), + .process("Resources") ], cSettings: [ .headerSearchPath("include/firebase_core"), .define("LIBRARY_VERSION", to: "\"\(libraryVersionString)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-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 c4f5b1d824bd..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,35 +7,35 @@ 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", platforms: [ - .macOS("10.15"), + .macOS("10.15") ], products: [ - .library(name: "firebase-core", targets: ["firebase_core"]), + .library(name: "firebase-core", targets: ["firebase_core"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion) ], targets: [ .target( name: "firebase_core", dependencies: [ // No product for firebase-core so we pull in the smallest one - .product(name: "FirebaseInstallations", package: "firebase-ios-sdk"), + .product(name: "FirebaseInstallations", package: "firebase-ios-sdk") ], resources: [ - .process("Resources"), + .process("Resources") ], cSettings: [ .headerSearchPath("include/firebase_core"), .define("LIBRARY_VERSION", to: "\"\(libraryVersionString)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-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 8da7bfa21e4c..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,16 +7,16 @@ 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", platforms: [ - .iOS("15.0"), + .iOS("15.0") ], products: [ - .library(name: "firebase-crashlytics", targets: ["firebase_crashlytics"]), + .library(name: "firebase-crashlytics", targets: ["firebase_crashlytics"]) ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,13 +30,13 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources"), + .process("Resources") ], cSettings: [ .headerSearchPath("include"), .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-cls\""), ] - ), + ) ] ) 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 8571c01a2aaa..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,16 +7,16 @@ 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", platforms: [ - .macOS("10.15"), + .macOS("10.15") ], products: [ - .library(name: "firebase-crashlytics", targets: ["firebase_crashlytics"]), + .library(name: "firebase-crashlytics", targets: ["firebase_crashlytics"]) ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,13 +30,13 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources"), + .process("Resources") ], cSettings: [ .headerSearchPath("include"), .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-cls\""), ] - ), + ) ] ) 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 1c856cc6836f..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,16 +7,16 @@ 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", platforms: [ - .iOS("15.0"), + .iOS("15.0") ], products: [ - .library(name: "firebase-database", targets: ["firebase_database"]), + .library(name: "firebase-database", targets: ["firebase_database"]) ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,13 +30,13 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources"), + .process("Resources") ], cSettings: [ .headerSearchPath("include"), .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-rtdb\""), ] - ), + ) ] ) diff --git a/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabaseObserveStreamHandler.swift b/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabaseObserveStreamHandler.swift index 4b147e49db5b..86029a6d5d39 100644 --- a/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabaseObserveStreamHandler.swift +++ b/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabaseObserveStreamHandler.swift @@ -22,16 +22,17 @@ import FirebaseDatabase } func onListen(withArguments arguments: Any?, eventSink events: @escaping FlutterEventSink) - -> FlutterError? { + -> FlutterError? + { guard let args = arguments as? [String: Any], - let eventTypeString = args["eventType"] as? String + let eventTypeString = args["eventType"] as? String else { return nil } let observeBlock: (DataSnapshot, String?) -> Void = { [weak self] snapshot, previousChildKey in var eventDictionary: [String: Any] = [ - "eventType": eventTypeString, + "eventType": eventTypeString ] let snapshotDict = FLTFirebaseDatabaseUtils.dictionary( diff --git a/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabasePlugin.swift b/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabasePlugin.swift index bd340420004c..d94bc937593f 100644 --- a/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabasePlugin.swift +++ b/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabasePlugin.swift @@ -24,7 +24,8 @@ let FLTFirebaseDatabaseChannelName = "plugins.flutter.io/firebase_database" @objc(FLTFirebaseDatabasePlugin) public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePluginProtocol, - FirebaseDatabaseHostApi { + FirebaseDatabaseHostApi +{ private var binaryMessenger: FlutterBinaryMessenger private static var cachedDatabaseInstances: [String: Database] = [:] private var streamHandlers: [String: FLTFirebaseDatabaseObserveStreamHandler] = [:] @@ -104,22 +105,28 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug // MARK: - Database Management - func goOnline(app: DatabasePigeonFirebaseApp, - completion: @escaping (Result) -> Void) { + func goOnline( + app: DatabasePigeonFirebaseApp, + completion: @escaping (Result) -> Void + ) { let database = getDatabaseFromPigeonApp(app) database.goOnline() completion(.success(())) } - func goOffline(app: DatabasePigeonFirebaseApp, - completion: @escaping (Result) -> Void) { + func goOffline( + app: DatabasePigeonFirebaseApp, + completion: @escaping (Result) -> Void + ) { let database = getDatabaseFromPigeonApp(app) database.goOffline() completion(.success(())) } - func setPersistenceEnabled(app: DatabasePigeonFirebaseApp, enabled: Bool, - completion: @escaping (Result) -> Void) { + func setPersistenceEnabled( + app: DatabasePigeonFirebaseApp, enabled: Bool, + completion: @escaping (Result) -> Void + ) { let instanceKey = app.appName + (app.databaseURL ?? "") if Self.cachedDatabaseInstances[instanceKey] != nil { completion(.success(())) @@ -131,8 +138,10 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug completion(.success(())) } - func setPersistenceCacheSizeBytes(app: DatabasePigeonFirebaseApp, cacheSize: Int64, - completion: @escaping (Result) -> Void) { + func setPersistenceCacheSizeBytes( + app: DatabasePigeonFirebaseApp, cacheSize: Int64, + completion: @escaping (Result) -> Void + ) { let instanceKey = app.appName + (app.databaseURL ?? "") if Self.cachedDatabaseInstances[instanceKey] != nil { completion(.success(())) @@ -148,37 +157,47 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug completion(.success(())) } - func setLoggingEnabled(app: DatabasePigeonFirebaseApp, enabled: Bool, - completion: @escaping (Result) -> Void) { + func setLoggingEnabled( + app: DatabasePigeonFirebaseApp, enabled: Bool, + completion: @escaping (Result) -> Void + ) { Database.setLoggingEnabled(enabled) completion(.success(())) } - func useDatabaseEmulator(app: DatabasePigeonFirebaseApp, host: String, port: Int64, - completion: @escaping (Result) -> Void) { + func useDatabaseEmulator( + app: DatabasePigeonFirebaseApp, host: String, port: Int64, + completion: @escaping (Result) -> Void + ) { let database = getDatabaseFromPigeonApp(app) database.useEmulator(withHost: host, port: Int(port)) completion(.success(())) } - func ref(app: DatabasePigeonFirebaseApp, path: String?, - completion: @escaping (Result) -> Void) { + func ref( + app: DatabasePigeonFirebaseApp, path: String?, + completion: @escaping (Result) -> Void + ) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(withPath: path ?? "") let result = DatabaseReferencePlatform(path: reference.url) completion(.success(result)) } - func refFromURL(app: DatabasePigeonFirebaseApp, url: String, - completion: @escaping (Result) -> Void) { + func refFromURL( + app: DatabasePigeonFirebaseApp, url: String, + completion: @escaping (Result) -> Void + ) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(fromURL: url) let result = DatabaseReferencePlatform(path: reference.url) completion(.success(result)) } - func purgeOutstandingWrites(app: DatabasePigeonFirebaseApp, - completion: @escaping (Result) -> Void) { + func purgeOutstandingWrites( + app: DatabasePigeonFirebaseApp, + completion: @escaping (Result) -> Void + ) { let database = getDatabaseFromPigeonApp(app) database.purgeOutstandingWrites() completion(.success(())) @@ -186,8 +205,10 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug // MARK: - Database Reference Operations - func databaseReferenceSet(app: DatabasePigeonFirebaseApp, request: DatabaseReferenceRequest, - completion: @escaping (Result) -> Void) { + func databaseReferenceSet( + app: DatabasePigeonFirebaseApp, request: DatabaseReferenceRequest, + completion: @escaping (Result) -> Void + ) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(withPath: request.path) @@ -200,9 +221,11 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug } } - func databaseReferenceSetWithPriority(app: DatabasePigeonFirebaseApp, - request: DatabaseReferenceRequest, - completion: @escaping (Result) -> Void) { + func databaseReferenceSetWithPriority( + app: DatabasePigeonFirebaseApp, + request: DatabaseReferenceRequest, + completion: @escaping (Result) -> Void + ) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(withPath: request.path) @@ -215,8 +238,10 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug } } - func databaseReferenceUpdate(app: DatabasePigeonFirebaseApp, request: UpdateRequest, - completion: @escaping (Result) -> Void) { + func databaseReferenceUpdate( + app: DatabasePigeonFirebaseApp, request: UpdateRequest, + completion: @escaping (Result) -> Void + ) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(withPath: request.path) @@ -231,9 +256,11 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug } } - func databaseReferenceSetPriority(app: DatabasePigeonFirebaseApp, - request: DatabaseReferenceRequest, - completion: @escaping (Result) -> Void) { + func databaseReferenceSetPriority( + app: DatabasePigeonFirebaseApp, + request: DatabaseReferenceRequest, + completion: @escaping (Result) -> Void + ) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(withPath: request.path) @@ -246,8 +273,10 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug } } - func databaseReferenceRunTransaction(app: DatabasePigeonFirebaseApp, request: TransactionRequest, - completion: @escaping (Result) -> Void) { + func databaseReferenceRunTransaction( + app: DatabasePigeonFirebaseApp, request: TransactionRequest, + completion: @escaping (Result) -> Void + ) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(withPath: request.path) @@ -312,10 +341,12 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug ) } - func databaseReferenceGetTransactionResult(app: DatabasePigeonFirebaseApp, transactionKey: Int64, - completion: - @escaping (Result<[String: Any?], Error>) - -> Void) { + func databaseReferenceGetTransactionResult( + app: DatabasePigeonFirebaseApp, transactionKey: Int64, + completion: + @escaping (Result<[String: Any?], Error>) + -> Void + ) { if let result = transactionResults.removeValue(forKey: transactionKey) { completion(.success(result)) } else { @@ -330,8 +361,10 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug // MARK: - OnDisconnect Operations - func onDisconnectSet(app: DatabasePigeonFirebaseApp, request: DatabaseReferenceRequest, - completion: @escaping (Result) -> Void) { + func onDisconnectSet( + app: DatabasePigeonFirebaseApp, request: DatabaseReferenceRequest, + completion: @escaping (Result) -> Void + ) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(withPath: request.path) @@ -344,9 +377,11 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug } } - func onDisconnectSetWithPriority(app: DatabasePigeonFirebaseApp, - request: DatabaseReferenceRequest, - completion: @escaping (Result) -> Void) { + func onDisconnectSetWithPriority( + app: DatabasePigeonFirebaseApp, + request: DatabaseReferenceRequest, + completion: @escaping (Result) -> Void + ) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(withPath: request.path) @@ -359,8 +394,10 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug } } - func onDisconnectUpdate(app: DatabasePigeonFirebaseApp, request: UpdateRequest, - completion: @escaping (Result) -> Void) { + func onDisconnectUpdate( + app: DatabasePigeonFirebaseApp, request: UpdateRequest, + completion: @escaping (Result) -> Void + ) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(withPath: request.path) @@ -375,8 +412,10 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug } } - func onDisconnectCancel(app: DatabasePigeonFirebaseApp, path: String, - completion: @escaping (Result) -> Void) { + func onDisconnectCancel( + app: DatabasePigeonFirebaseApp, path: String, + completion: @escaping (Result) -> Void + ) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(withPath: path) @@ -391,8 +430,10 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug // MARK: - Query Operations - func queryObserve(app: DatabasePigeonFirebaseApp, request: QueryRequest, - completion: @escaping (Result) -> Void) { + func queryObserve( + app: DatabasePigeonFirebaseApp, request: QueryRequest, + completion: @escaping (Result) -> Void + ) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(withPath: request.path) @@ -455,7 +496,8 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug case "limit": if let name = modifier["name"] as? String, - let limit = modifier["limit"] as? NSNumber { + let limit = modifier["limit"] as? NSNumber + { switch name { case "limitToFirst": query = query.queryLimited(toFirst: limit.uintValue) @@ -493,8 +535,10 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug completion(.success(channelName)) } - func queryKeepSynced(app: DatabasePigeonFirebaseApp, request: QueryRequest, - completion: @escaping (Result) -> Void) { + func queryKeepSynced( + app: DatabasePigeonFirebaseApp, request: QueryRequest, + completion: @escaping (Result) -> Void + ) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(withPath: request.path) @@ -557,7 +601,8 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug case "limit": if let name = modifier["name"] as? String, - let limit = modifier["limit"] as? NSNumber { + let limit = modifier["limit"] as? NSNumber + { switch name { case "limitToFirst": query = query.queryLimited(toFirst: limit.uintValue) @@ -580,8 +625,10 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug completion(.success(())) } - func queryGet(app: DatabasePigeonFirebaseApp, request: QueryRequest, - completion: @escaping (Result<[String: Any?], Error>) -> Void) { + func queryGet( + app: DatabasePigeonFirebaseApp, request: QueryRequest, + completion: @escaping (Result<[String: Any?], Error>) -> Void + ) { let database = getDatabaseFromPigeonApp(app) let reference = database.reference(withPath: request.path) @@ -655,7 +702,8 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug case "limit": if let name = modifier["name"] as? String, - let limit = modifier["limit"] as? NSNumber { + let limit = modifier["limit"] as? NSNumber + { switch name { case "limitToFirst": query = query.queryLimited(toFirst: limit.uintValue) @@ -718,7 +766,8 @@ public class FLTFirebaseDatabasePlugin: NSObject, FlutterPlugin, FLTFirebasePlug } if let emulatorHost = app.settings.emulatorHost, - let emulatorPort = app.settings.emulatorPort { + let emulatorPort = app.settings.emulatorPort + { database.useEmulator(withHost: emulatorHost, port: Int(emulatorPort)) } diff --git a/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabaseUtils.swift b/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabaseUtils.swift index 9561af721ff1..c51f5ac67a2a 100644 --- a/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabaseUtils.swift +++ b/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FLTFirebaseDatabaseUtils.swift @@ -55,7 +55,8 @@ import Foundation } if let emulatorHost = arguments["emulatorHost"] as? String, - let emulatorPort = arguments["emulatorPort"] as? Int { + let emulatorPort = arguments["emulatorPort"] as? Int + { database.useEmulator(withHost: emulatorHost, port: emulatorPort) } @@ -69,8 +70,10 @@ import Foundation return database.reference(withPath: path) } - private static func databaseQuery(_ query: DatabaseQuery, - applyLimitModifier modifier: [String: Any]) -> DatabaseQuery { + private static func databaseQuery( + _ query: DatabaseQuery, + applyLimitModifier modifier: [String: Any] + ) -> DatabaseQuery { let name = modifier["name"] as? String ?? "" let limit = modifier["limit"] as? UInt ?? 0 @@ -84,8 +87,10 @@ import Foundation } } - private static func databaseQuery(_ query: DatabaseQuery, - applyOrderModifier modifier: [String: Any]) -> DatabaseQuery { + private static func databaseQuery( + _ query: DatabaseQuery, + applyOrderModifier modifier: [String: Any] + ) -> DatabaseQuery { let name = modifier["name"] as? String ?? "" switch name { @@ -103,8 +108,10 @@ import Foundation } } - private static func databaseQuery(_ query: DatabaseQuery, - applyCursorModifier modifier: [String: Any]) -> DatabaseQuery { + private static func databaseQuery( + _ query: DatabaseQuery, + applyCursorModifier modifier: [String: Any] + ) -> DatabaseQuery { let name = modifier["name"] as? String ?? "" let key = modifier["key"] as? String let value = modifier["value"] @@ -161,8 +168,10 @@ import Foundation return query } - static func dictionary(from snapshot: DataSnapshot, - withPreviousChildKey previousChildKey: String?) -> [String: Any] { + static func dictionary( + from snapshot: DataSnapshot, + withPreviousChildKey previousChildKey: String? + ) -> [String: Any] { [ "snapshot": dictionary(from: snapshot), "previousChildKey": previousChildKey ?? NSNull(), diff --git a/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FirebaseDatabaseMessages.g.swift b/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FirebaseDatabaseMessages.g.swift index 7e305918fa93..6a0fb0d765f5 100644 --- a/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FirebaseDatabaseMessages.g.swift +++ b/packages/firebase_database/firebase_database/ios/firebase_database/Sources/firebase_database/FirebaseDatabaseMessages.g.swift @@ -304,7 +304,7 @@ struct DatabaseReferencePlatform: Hashable { func toList() -> [Any?] { [ - path, + path ] } @@ -623,53 +623,74 @@ class FirebaseDatabaseMessagesPigeonCodec: FlutterStandardMessageCodec, @uncheck /// Generated protocol from Pigeon that represents a handler of messages from Flutter. protocol FirebaseDatabaseHostApi { func goOnline(app: DatabasePigeonFirebaseApp, completion: @escaping (Result) -> Void) - func goOffline(app: DatabasePigeonFirebaseApp, - completion: @escaping (Result) -> Void) - func setPersistenceEnabled(app: DatabasePigeonFirebaseApp, enabled: Bool, - completion: @escaping (Result) -> Void) - func setPersistenceCacheSizeBytes(app: DatabasePigeonFirebaseApp, cacheSize: Int64, - completion: @escaping (Result) -> Void) - func setLoggingEnabled(app: DatabasePigeonFirebaseApp, enabled: Bool, - completion: @escaping (Result) -> Void) - func useDatabaseEmulator(app: DatabasePigeonFirebaseApp, host: String, port: Int64, - completion: @escaping (Result) -> Void) - func ref(app: DatabasePigeonFirebaseApp, path: String?, - completion: @escaping (Result) -> Void) - func refFromURL(app: DatabasePigeonFirebaseApp, url: String, - completion: @escaping (Result) -> Void) - func purgeOutstandingWrites(app: DatabasePigeonFirebaseApp, - completion: @escaping (Result) -> Void) - func databaseReferenceSet(app: DatabasePigeonFirebaseApp, request: DatabaseReferenceRequest, - completion: @escaping (Result) -> Void) - func databaseReferenceSetWithPriority(app: DatabasePigeonFirebaseApp, - request: DatabaseReferenceRequest, - completion: @escaping (Result) -> Void) - func databaseReferenceUpdate(app: DatabasePigeonFirebaseApp, request: UpdateRequest, - completion: @escaping (Result) -> Void) - func databaseReferenceSetPriority(app: DatabasePigeonFirebaseApp, - request: DatabaseReferenceRequest, - completion: @escaping (Result) -> Void) - func databaseReferenceRunTransaction(app: DatabasePigeonFirebaseApp, request: TransactionRequest, - completion: @escaping (Result) -> Void) - func databaseReferenceGetTransactionResult(app: DatabasePigeonFirebaseApp, transactionKey: Int64, - completion: - @escaping (Result<[String: Any?], Error>) - -> Void) - func onDisconnectSet(app: DatabasePigeonFirebaseApp, request: DatabaseReferenceRequest, - completion: @escaping (Result) -> Void) - func onDisconnectSetWithPriority(app: DatabasePigeonFirebaseApp, - request: DatabaseReferenceRequest, - completion: @escaping (Result) -> Void) - func onDisconnectUpdate(app: DatabasePigeonFirebaseApp, request: UpdateRequest, - completion: @escaping (Result) -> Void) - func onDisconnectCancel(app: DatabasePigeonFirebaseApp, path: String, - completion: @escaping (Result) -> Void) - func queryObserve(app: DatabasePigeonFirebaseApp, request: QueryRequest, - completion: @escaping (Result) -> Void) - func queryKeepSynced(app: DatabasePigeonFirebaseApp, request: QueryRequest, - completion: @escaping (Result) -> Void) - func queryGet(app: DatabasePigeonFirebaseApp, request: QueryRequest, - completion: @escaping (Result<[String: Any?], Error>) -> Void) + func goOffline( + app: DatabasePigeonFirebaseApp, + completion: @escaping (Result) -> Void) + func setPersistenceEnabled( + app: DatabasePigeonFirebaseApp, enabled: Bool, + completion: @escaping (Result) -> Void) + func setPersistenceCacheSizeBytes( + app: DatabasePigeonFirebaseApp, cacheSize: Int64, + completion: @escaping (Result) -> Void) + func setLoggingEnabled( + app: DatabasePigeonFirebaseApp, enabled: Bool, + completion: @escaping (Result) -> Void) + func useDatabaseEmulator( + app: DatabasePigeonFirebaseApp, host: String, port: Int64, + completion: @escaping (Result) -> Void) + func ref( + app: DatabasePigeonFirebaseApp, path: String?, + completion: @escaping (Result) -> Void) + func refFromURL( + app: DatabasePigeonFirebaseApp, url: String, + completion: @escaping (Result) -> Void) + func purgeOutstandingWrites( + app: DatabasePigeonFirebaseApp, + completion: @escaping (Result) -> Void) + func databaseReferenceSet( + app: DatabasePigeonFirebaseApp, request: DatabaseReferenceRequest, + completion: @escaping (Result) -> Void) + func databaseReferenceSetWithPriority( + app: DatabasePigeonFirebaseApp, + request: DatabaseReferenceRequest, + completion: @escaping (Result) -> Void) + func databaseReferenceUpdate( + app: DatabasePigeonFirebaseApp, request: UpdateRequest, + completion: @escaping (Result) -> Void) + func databaseReferenceSetPriority( + app: DatabasePigeonFirebaseApp, + request: DatabaseReferenceRequest, + completion: @escaping (Result) -> Void) + func databaseReferenceRunTransaction( + app: DatabasePigeonFirebaseApp, request: TransactionRequest, + completion: @escaping (Result) -> Void) + func databaseReferenceGetTransactionResult( + app: DatabasePigeonFirebaseApp, transactionKey: Int64, + completion: + @escaping (Result<[String: Any?], Error>) + -> Void) + func onDisconnectSet( + app: DatabasePigeonFirebaseApp, request: DatabaseReferenceRequest, + completion: @escaping (Result) -> Void) + func onDisconnectSetWithPriority( + app: DatabasePigeonFirebaseApp, + request: DatabaseReferenceRequest, + completion: @escaping (Result) -> Void) + func onDisconnectUpdate( + app: DatabasePigeonFirebaseApp, request: UpdateRequest, + completion: @escaping (Result) -> Void) + func onDisconnectCancel( + app: DatabasePigeonFirebaseApp, path: String, + completion: @escaping (Result) -> Void) + func queryObserve( + app: DatabasePigeonFirebaseApp, request: QueryRequest, + completion: @escaping (Result) -> Void) + func queryKeepSynced( + app: DatabasePigeonFirebaseApp, request: QueryRequest, + completion: @escaping (Result) -> Void) + func queryGet( + app: DatabasePigeonFirebaseApp, request: QueryRequest, + completion: @escaping (Result<[String: Any?], Error>) -> Void) } /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`. @@ -680,12 +701,14 @@ class FirebaseDatabaseHostApiSetup { /// Sets up an instance of `FirebaseDatabaseHostApi` to handle messages through the /// `binaryMessenger`. - static func setUp(binaryMessenger: FlutterBinaryMessenger, api: FirebaseDatabaseHostApi?, - messageChannelSuffix: String = "") { + static func setUp( + binaryMessenger: FlutterBinaryMessenger, api: FirebaseDatabaseHostApi?, + messageChannelSuffix: String = "" + ) { let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" let goOnlineChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.goOnline\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.goOnline\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -707,7 +730,7 @@ class FirebaseDatabaseHostApiSetup { } let goOfflineChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.goOffline\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.goOffline\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -729,7 +752,7 @@ class FirebaseDatabaseHostApiSetup { } let setPersistenceEnabledChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.setPersistenceEnabled\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.setPersistenceEnabled\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -752,7 +775,7 @@ class FirebaseDatabaseHostApiSetup { } let setPersistenceCacheSizeBytesChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.setPersistenceCacheSizeBytes\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.setPersistenceCacheSizeBytes\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -775,7 +798,7 @@ class FirebaseDatabaseHostApiSetup { } let setLoggingEnabledChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.setLoggingEnabled\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.setLoggingEnabled\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -798,7 +821,7 @@ class FirebaseDatabaseHostApiSetup { } let useDatabaseEmulatorChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.useDatabaseEmulator\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.useDatabaseEmulator\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -822,7 +845,7 @@ class FirebaseDatabaseHostApiSetup { } let refChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.ref\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.ref\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -845,7 +868,7 @@ class FirebaseDatabaseHostApiSetup { } let refFromURLChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.refFromURL\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.refFromURL\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -868,7 +891,7 @@ class FirebaseDatabaseHostApiSetup { } let purgeOutstandingWritesChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.purgeOutstandingWrites\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.purgeOutstandingWrites\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -890,7 +913,7 @@ class FirebaseDatabaseHostApiSetup { } let databaseReferenceSetChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.databaseReferenceSet\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.databaseReferenceSet\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -913,7 +936,7 @@ class FirebaseDatabaseHostApiSetup { } let databaseReferenceSetWithPriorityChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.databaseReferenceSetWithPriority\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.databaseReferenceSetWithPriority\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -936,7 +959,7 @@ class FirebaseDatabaseHostApiSetup { } let databaseReferenceUpdateChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.databaseReferenceUpdate\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.databaseReferenceUpdate\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -959,7 +982,7 @@ class FirebaseDatabaseHostApiSetup { } let databaseReferenceSetPriorityChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.databaseReferenceSetPriority\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.databaseReferenceSetPriority\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -982,7 +1005,7 @@ class FirebaseDatabaseHostApiSetup { } let databaseReferenceRunTransactionChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.databaseReferenceRunTransaction\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.databaseReferenceRunTransaction\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1005,7 +1028,7 @@ class FirebaseDatabaseHostApiSetup { } let databaseReferenceGetTransactionResultChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.databaseReferenceGetTransactionResult\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.databaseReferenceGetTransactionResult\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1032,7 +1055,7 @@ class FirebaseDatabaseHostApiSetup { } let onDisconnectSetChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.onDisconnectSet\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.onDisconnectSet\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1055,7 +1078,7 @@ class FirebaseDatabaseHostApiSetup { } let onDisconnectSetWithPriorityChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.onDisconnectSetWithPriority\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.onDisconnectSetWithPriority\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1078,7 +1101,7 @@ class FirebaseDatabaseHostApiSetup { } let onDisconnectUpdateChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.onDisconnectUpdate\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.onDisconnectUpdate\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1101,7 +1124,7 @@ class FirebaseDatabaseHostApiSetup { } let onDisconnectCancelChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.onDisconnectCancel\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.onDisconnectCancel\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1124,7 +1147,7 @@ class FirebaseDatabaseHostApiSetup { } let queryObserveChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.queryObserve\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.queryObserve\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1147,7 +1170,7 @@ class FirebaseDatabaseHostApiSetup { } let queryKeepSyncedChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.queryKeepSynced\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.queryKeepSynced\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1170,7 +1193,7 @@ class FirebaseDatabaseHostApiSetup { } let queryGetChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.queryGet\(channelSuffix)", + "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseHostApi.queryGet\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1196,11 +1219,12 @@ class FirebaseDatabaseHostApiSetup { /// Generated protocol from Pigeon that represents Flutter messages that can be called from Swift. protocol FirebaseDatabaseFlutterApiProtocol { - func callTransactionHandler(transactionKey transactionKeyArg: Int64, - snapshotValue snapshotValueArg: Any?, - completion: - @escaping (Result) - -> Void) + func callTransactionHandler( + transactionKey transactionKeyArg: Int64, + snapshotValue snapshotValueArg: Any?, + completion: + @escaping (Result) + -> Void) } class FirebaseDatabaseFlutterApi: FirebaseDatabaseFlutterApiProtocol { @@ -1215,11 +1239,13 @@ class FirebaseDatabaseFlutterApi: FirebaseDatabaseFlutterApiProtocol { FirebaseDatabaseMessagesPigeonCodec.shared } - func callTransactionHandler(transactionKey transactionKeyArg: Int64, - snapshotValue snapshotValueArg: Any?, - completion: - @escaping (Result) - -> Void) { + func callTransactionHandler( + transactionKey transactionKeyArg: Int64, + snapshotValue snapshotValueArg: Any?, + completion: + @escaping (Result) + -> Void + ) { let channelName = "dev.flutter.pigeon.firebase_database_platform_interface.FirebaseDatabaseFlutterApi.callTransactionHandler\(messageChannelSuffix)" let channel = FlutterBasicMessageChannel( 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 2e4b1834b5a1..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,16 +7,16 @@ 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", platforms: [ - .macOS("10.15"), + .macOS("10.15") ], products: [ - .library(name: "firebase-database", targets: ["firebase_database"]), + .library(name: "firebase-database", targets: ["firebase_database"]) ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,13 +30,13 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources"), + .process("Resources") ], cSettings: [ .headerSearchPath("include"), .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-rtdb\""), ] - ), + ) ] ) 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 97b53c920789..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,16 +7,16 @@ 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", platforms: [ - .iOS("15.0"), + .iOS("15.0") ], products: [ - .library(name: "firebase-in-app-messaging", targets: ["firebase_in_app_messaging"]), + .library(name: "firebase-in-app-messaging", targets: ["firebase_in_app_messaging"]) ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,13 +30,13 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources"), + .process("Resources") ], cSettings: [ .headerSearchPath("include"), .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-fiam\""), ] - ), + ) ] ) diff --git a/packages/firebase_messaging/firebase_messaging/android/src/main/java/io/flutter/plugins/firebase/messaging/FlutterFirebaseMessagingPlugin.java b/packages/firebase_messaging/firebase_messaging/android/src/main/java/io/flutter/plugins/firebase/messaging/FlutterFirebaseMessagingPlugin.java index 36f78b804c25..868c950899b3 100644 --- a/packages/firebase_messaging/firebase_messaging/android/src/main/java/io/flutter/plugins/firebase/messaging/FlutterFirebaseMessagingPlugin.java +++ b/packages/firebase_messaging/firebase_messaging/android/src/main/java/io/flutter/plugins/firebase/messaging/FlutterFirebaseMessagingPlugin.java @@ -424,12 +424,12 @@ public void onMethodCall(final MethodCall call, @NonNull final Result result) { Task methodCallTask; switch (call.method) { - // This message is sent when the Dart side of this plugin is told to initialize. - // In response, this (native) side of the plugin needs to spin up a background - // Dart isolate by using the given pluginCallbackHandle, and then setup a background - // method channel to communicate with the new background isolate. Once completed, - // this onMethodCall() method will receive messages from both the primary and background - // method channels. + // This message is sent when the Dart side of this plugin is told to initialize. + // In response, this (native) side of the plugin needs to spin up a background + // Dart isolate by using the given pluginCallbackHandle, and then setup a background + // method channel to communicate with the new background isolate. Once completed, + // this onMethodCall() method will receive messages from both the primary and background + // method channels. case "Messaging#startBackgroundIsolate": @SuppressWarnings("unchecked") Map arguments = ((Map) call.arguments); 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 6041810d6441..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,16 +7,16 @@ 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", platforms: [ - .iOS("15.0"), + .iOS("15.0") ], products: [ - .library(name: "firebase-messaging", targets: ["firebase_messaging"]), + .library(name: "firebase-messaging", targets: ["firebase_messaging"]) ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,13 +30,13 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources"), + .process("Resources") ], cSettings: [ .headerSearchPath("include"), .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-fcm\""), ] - ), + ) ] ) 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 d3fce3506275..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,16 +7,16 @@ 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", platforms: [ - .macOS("10.15"), + .macOS("10.15") ], products: [ - .library(name: "firebase-messaging", targets: ["firebase_messaging"]), + .library(name: "firebase-messaging", targets: ["firebase_messaging"]) ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,13 +30,13 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources"), + .process("Resources") ], cSettings: [ .headerSearchPath("include"), .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-fcm\""), ] - ), + ) ] ) 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 df902c7236ec..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,15 +7,15 @@ import PackageDescription -let firebaseSdkVersion: Version = "12.14.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_ml_model_downloader", platforms: [ - .iOS("15.0"), + .iOS("15.0") ], products: [ - .library(name: "firebase-ml-model-downloader", targets: ["firebase_ml_model_downloader"]), + .library(name: "firebase-ml-model-downloader", targets: ["firebase_ml_model_downloader"]) ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -29,8 +29,8 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources"), + .process("Resources") ] - ), + ) ] ) diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/ios/firebase_ml_model_downloader/Sources/firebase_ml_model_downloader/FirebaseModelDownloaderPlugin.swift b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/ios/firebase_ml_model_downloader/Sources/firebase_ml_model_downloader/FirebaseModelDownloaderPlugin.swift index 0a9ee2fe93df..94cc55407399 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/ios/firebase_ml_model_downloader/Sources/firebase_ml_model_downloader/FirebaseModelDownloaderPlugin.swift +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/ios/firebase_ml_model_downloader/Sources/firebase_ml_model_downloader/FirebaseModelDownloaderPlugin.swift @@ -87,7 +87,7 @@ public class FirebaseModelDownloaderPlugin: NSObject, FLTFirebasePluginProtocol, errorDetails["code"] = code ?? self.mapErrorCodes(error: error! as NSError) errorDetails["message"] = message ?? error? - .localizedDescription ?? "An unknown error has occurred." + .localizedDescription ?? "An unknown error has occurred." errorDetails["additionalData"] = details ?? ["code": errorDetails["code"], "message": errorDetails["message"]] @@ -119,8 +119,10 @@ public class FirebaseModelDownloaderPlugin: NSObject, FLTFirebasePluginProtocol, } } - func listDownloadedModels(arguments: [String: Any], - result: FLTFirebaseMethodCallResult) { + func listDownloadedModels( + arguments: [String: Any], + result: FLTFirebaseMethodCallResult + ) { let modelDownloader = modelDownloaderFromArguments(arguments: arguments) modelDownloader?.listDownloadedModels { response in @@ -178,8 +180,10 @@ public class FirebaseModelDownloaderPlugin: NSObject, FLTFirebasePluginProtocol, } } - func deleteDownloadedModel(arguments: [String: Any], - result: FLTFirebaseMethodCallResult) { + func deleteDownloadedModel( + arguments: [String: Any], + result: FLTFirebaseMethodCallResult + ) { let modelDownloader = modelDownloaderFromArguments(arguments: arguments) let modelName = arguments["modelName"] 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 96d64667b539..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,15 +7,15 @@ import PackageDescription -let firebaseSdkVersion: Version = "12.14.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_ml_model_downloader", platforms: [ - .macOS("10.15"), + .macOS("10.15") ], products: [ - .library(name: "firebase-ml-model-downloader", targets: ["firebase_ml_model_downloader"]), + .library(name: "firebase-ml-model-downloader", targets: ["firebase_ml_model_downloader"]) ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -29,8 +29,8 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources"), + .process("Resources") ] - ), + ) ] ) 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 dce392ec4e69..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,16 +7,16 @@ 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", platforms: [ - .iOS("15.0"), + .iOS("15.0") ], products: [ - .library(name: "firebase-performance", targets: ["firebase_performance"]), + .library(name: "firebase-performance", targets: ["firebase_performance"]) ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,13 +30,13 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources"), + .process("Resources") ], cSettings: [ .headerSearchPath("include"), .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-perf\""), ] - ), + ) ] ) diff --git a/packages/firebase_performance/firebase_performance/ios/firebase_performance/Sources/firebase_performance/FirebasePerformanceMessages.g.swift b/packages/firebase_performance/firebase_performance/ios/firebase_performance/Sources/firebase_performance/FirebasePerformanceMessages.g.swift index 010a3ec95732..d0bf9252d08f 100644 --- a/packages/firebase_performance/firebase_performance/ios/firebase_performance/Sources/firebase_performance/FirebasePerformanceMessages.g.swift +++ b/packages/firebase_performance/firebase_performance/ios/firebase_performance/Sources/firebase_performance/FirebasePerformanceMessages.g.swift @@ -393,16 +393,20 @@ class FirebasePerformanceMessagesPigeonCodec: FlutterStandardMessageCodec, @unch /// Generated protocol from Pigeon that represents a handler of messages from Flutter. protocol FirebasePerformanceHostApi { - func setPerformanceCollectionEnabled(enabled: Bool, - completion: @escaping (Result) -> Void) + func setPerformanceCollectionEnabled( + enabled: Bool, + completion: @escaping (Result) -> Void) func isPerformanceCollectionEnabled(completion: @escaping (Result) -> Void) func startTrace(name: String, completion: @escaping (Result) -> Void) - func stopTrace(handle: Int64, attributes: TraceAttributes, - completion: @escaping (Result) -> Void) - func startHttpMetric(options: HttpMetricOptions, - completion: @escaping (Result) -> Void) - func stopHttpMetric(handle: Int64, attributes: HttpMetricAttributes, - completion: @escaping (Result) -> Void) + func stopTrace( + handle: Int64, attributes: TraceAttributes, + completion: @escaping (Result) -> Void) + func startHttpMetric( + options: HttpMetricOptions, + completion: @escaping (Result) -> Void) + func stopHttpMetric( + handle: Int64, attributes: HttpMetricAttributes, + completion: @escaping (Result) -> Void) } /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`. @@ -413,12 +417,14 @@ class FirebasePerformanceHostApiSetup { /// Sets up an instance of `FirebasePerformanceHostApi` to handle messages through the /// `binaryMessenger`. - static func setUp(binaryMessenger: FlutterBinaryMessenger, api: FirebasePerformanceHostApi?, - messageChannelSuffix: String = "") { + static func setUp( + binaryMessenger: FlutterBinaryMessenger, api: FirebasePerformanceHostApi?, + messageChannelSuffix: String = "" + ) { let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" let setPerformanceCollectionEnabledChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_performance_platform_interface.FirebasePerformanceHostApi.setPerformanceCollectionEnabled\(channelSuffix)", + "dev.flutter.pigeon.firebase_performance_platform_interface.FirebasePerformanceHostApi.setPerformanceCollectionEnabled\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -440,7 +446,7 @@ class FirebasePerformanceHostApiSetup { } let isPerformanceCollectionEnabledChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_performance_platform_interface.FirebasePerformanceHostApi.isPerformanceCollectionEnabled\(channelSuffix)", + "dev.flutter.pigeon.firebase_performance_platform_interface.FirebasePerformanceHostApi.isPerformanceCollectionEnabled\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -460,7 +466,7 @@ class FirebasePerformanceHostApiSetup { } let startTraceChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_performance_platform_interface.FirebasePerformanceHostApi.startTrace\(channelSuffix)", + "dev.flutter.pigeon.firebase_performance_platform_interface.FirebasePerformanceHostApi.startTrace\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -482,7 +488,7 @@ class FirebasePerformanceHostApiSetup { } let stopTraceChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_performance_platform_interface.FirebasePerformanceHostApi.stopTrace\(channelSuffix)", + "dev.flutter.pigeon.firebase_performance_platform_interface.FirebasePerformanceHostApi.stopTrace\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -505,7 +511,7 @@ class FirebasePerformanceHostApiSetup { } let startHttpMetricChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_performance_platform_interface.FirebasePerformanceHostApi.startHttpMetric\(channelSuffix)", + "dev.flutter.pigeon.firebase_performance_platform_interface.FirebasePerformanceHostApi.startHttpMetric\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -527,7 +533,7 @@ class FirebasePerformanceHostApiSetup { } let stopHttpMetricChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_performance_platform_interface.FirebasePerformanceHostApi.stopHttpMetric\(channelSuffix)", + "dev.flutter.pigeon.firebase_performance_platform_interface.FirebasePerformanceHostApi.stopHttpMetric\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) diff --git a/packages/firebase_performance/firebase_performance/ios/firebase_performance/Sources/firebase_performance/FirebasePerformancePlugin.swift b/packages/firebase_performance/firebase_performance/ios/firebase_performance/Sources/firebase_performance/FirebasePerformancePlugin.swift index 5ece6be74977..3c7d8f50b620 100644 --- a/packages/firebase_performance/firebase_performance/ios/firebase_performance/Sources/firebase_performance/FirebasePerformancePlugin.swift +++ b/packages/firebase_performance/firebase_performance/ios/firebase_performance/Sources/firebase_performance/FirebasePerformancePlugin.swift @@ -22,7 +22,8 @@ let FirebasePerformanceChannelName = "plugins.flutter.io/firebase_performance" extension FlutterError: Error {} public class FirebasePerformancePlugin: NSObject, FlutterPlugin, FLTFirebasePluginProtocol, - FirebasePerformanceHostApi { + FirebasePerformanceHostApi +{ public func didReinitializeFirebaseCore(_ completion: @escaping () -> Void) { completion() } @@ -60,8 +61,10 @@ public class FirebasePerformancePlugin: NSObject, FlutterPlugin, FLTFirebasePlug FirebasePerformanceHostApiSetup.setUp(binaryMessenger: binaryMessenger, api: instance) } - public func setPerformanceCollectionEnabled(enabled: Bool, - completion: @escaping (Result) -> Void) { + public func setPerformanceCollectionEnabled( + enabled: Bool, + completion: @escaping (Result) -> Void + ) { Performance.sharedInstance().isDataCollectionEnabled = enabled completion(.success(())) } @@ -79,8 +82,10 @@ public class FirebasePerformancePlugin: NSObject, FlutterPlugin, FLTFirebasePlug completion(.success(Int64(traceHandle))) } - func stopTrace(handle: Int64, attributes: TraceAttributes, - completion: @escaping (Result) -> Void) { + func stopTrace( + handle: Int64, attributes: TraceAttributes, + completion: @escaping (Result) -> Void + ) { guard let trace = traces[Int(handle)] else { completion(.success(())) return @@ -103,8 +108,10 @@ public class FirebasePerformancePlugin: NSObject, FlutterPlugin, FLTFirebasePlug completion(.success(())) } - func startHttpMetric(options: HttpMetricOptions, - completion: @escaping (Result) -> Void) { + func startHttpMetric( + options: HttpMetricOptions, + completion: @escaping (Result) -> Void + ) { guard let url = URL(string: options.url) else { completion(.failure(FlutterError(code: "invalid-url", message: "Invalid url", details: nil))) return @@ -130,8 +137,10 @@ public class FirebasePerformancePlugin: NSObject, FlutterPlugin, FLTFirebasePlug completion(.success(Int64(httpMetricHandle))) } - func stopHttpMetric(handle: Int64, attributes: HttpMetricAttributes, - completion: @escaping (Result) -> Void) { + func stopHttpMetric( + handle: Int64, attributes: HttpMetricAttributes, + completion: @escaping (Result) -> Void + ) { guard let httpMetric = httpMetrics[Int(handle)] else { completion(.success(())) return 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 946b1b890d9e..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,15 +7,15 @@ import PackageDescription -let firebaseSdkVersion: Version = "12.14.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_remote_config", platforms: [ - .iOS("15.0"), + .iOS("15.0") ], products: [ - .library(name: "firebase-remote-config", targets: ["firebase_remote_config"]), + .library(name: "firebase-remote-config", targets: ["firebase_remote_config"]) ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -29,8 +29,8 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources"), + .process("Resources") ] - ), + ) ] ) diff --git a/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Sources/firebase_remote_config/FirebaseRemoteConfigMessages.g.swift b/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Sources/firebase_remote_config/FirebaseRemoteConfigMessages.g.swift index 1168f1b807c7..f7b031c0c6e3 100644 --- a/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Sources/firebase_remote_config/FirebaseRemoteConfigMessages.g.swift +++ b/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Sources/firebase_remote_config/FirebaseRemoteConfigMessages.g.swift @@ -263,13 +263,16 @@ protocol FirebaseRemoteConfigHostApi { func fetch(appName: String, completion: @escaping (Result) -> Void) func fetchAndActivate(appName: String, completion: @escaping (Result) -> Void) func activate(appName: String, completion: @escaping (Result) -> Void) - func setConfigSettings(appName: String, settings: RemoteConfigPigeonSettings, - completion: @escaping (Result) -> Void) - func setDefaults(appName: String, defaultParameters: [String: Any?], - completion: @escaping (Result) -> Void) + func setConfigSettings( + appName: String, settings: RemoteConfigPigeonSettings, + completion: @escaping (Result) -> Void) + func setDefaults( + appName: String, defaultParameters: [String: Any?], + completion: @escaping (Result) -> Void) func ensureInitialized(appName: String, completion: @escaping (Result) -> Void) - func setCustomSignals(appName: String, customSignals: [String: Any?], - completion: @escaping (Result) -> Void) + func setCustomSignals( + appName: String, customSignals: [String: Any?], + completion: @escaping (Result) -> Void) func getAll(appName: String, completion: @escaping (Result<[String: Any?], Error>) -> Void) func getProperties(appName: String, completion: @escaping (Result<[String: Any], Error>) -> Void) } @@ -282,12 +285,14 @@ class FirebaseRemoteConfigHostApiSetup { /// Sets up an instance of `FirebaseRemoteConfigHostApi` to handle messages through the /// `binaryMessenger`. - static func setUp(binaryMessenger: FlutterBinaryMessenger, api: FirebaseRemoteConfigHostApi?, - messageChannelSuffix: String = "") { + static func setUp( + binaryMessenger: FlutterBinaryMessenger, api: FirebaseRemoteConfigHostApi?, + messageChannelSuffix: String = "" + ) { let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" let fetchChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.fetch\(channelSuffix)", + "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.fetch\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -309,7 +314,7 @@ class FirebaseRemoteConfigHostApiSetup { } let fetchAndActivateChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.fetchAndActivate\(channelSuffix)", + "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.fetchAndActivate\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -331,7 +336,7 @@ class FirebaseRemoteConfigHostApiSetup { } let activateChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.activate\(channelSuffix)", + "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.activate\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -353,7 +358,7 @@ class FirebaseRemoteConfigHostApiSetup { } let setConfigSettingsChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.setConfigSettings\(channelSuffix)", + "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.setConfigSettings\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -376,7 +381,7 @@ class FirebaseRemoteConfigHostApiSetup { } let setDefaultsChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.setDefaults\(channelSuffix)", + "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.setDefaults\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -399,7 +404,7 @@ class FirebaseRemoteConfigHostApiSetup { } let ensureInitializedChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.ensureInitialized\(channelSuffix)", + "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.ensureInitialized\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -421,7 +426,7 @@ class FirebaseRemoteConfigHostApiSetup { } let setCustomSignalsChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.setCustomSignals\(channelSuffix)", + "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.setCustomSignals\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -444,7 +449,7 @@ class FirebaseRemoteConfigHostApiSetup { } let getAllChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.getAll\(channelSuffix)", + "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.getAll\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -466,7 +471,7 @@ class FirebaseRemoteConfigHostApiSetup { } let getPropertiesChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.getProperties\(channelSuffix)", + "dev.flutter.pigeon.firebase_remote_config_platform_interface.FirebaseRemoteConfigHostApi.getProperties\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) diff --git a/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Sources/firebase_remote_config/FirebaseRemoteConfigPlugin.swift b/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Sources/firebase_remote_config/FirebaseRemoteConfigPlugin.swift index 301e35d5ab19..aa923738980a 100644 --- a/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Sources/firebase_remote_config/FirebaseRemoteConfigPlugin.swift +++ b/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Sources/firebase_remote_config/FirebaseRemoteConfigPlugin.swift @@ -22,7 +22,8 @@ let kFirebaseRemoteConfigUpdatedChannelName = "plugins.flutter.io/firebase_remot extension FlutterError: Error {} public class FirebaseRemoteConfigPlugin: NSObject, FlutterPlugin, FlutterStreamHandler, - FLTFirebasePluginProtocol, FirebaseRemoteConfigHostApi { + FLTFirebasePluginProtocol, FirebaseRemoteConfigHostApi +{ private var listenersMap: [String: ConfigUpdateListenerRegistration] = [:] private var fetchAndActivateRetry = false @@ -107,8 +108,10 @@ public class FirebaseRemoteConfigPlugin: NSObject, FlutterPlugin, FlutterStreamH } } - func setConfigSettings(appName: String, settings: RemoteConfigPigeonSettings, - completion: @escaping (Result) -> Void) { + func setConfigSettings( + appName: String, settings: RemoteConfigPigeonSettings, + completion: @escaping (Result) -> Void + ) { let fetchTimeout = settings.fetchTimeoutSeconds let minFetchInterval = settings.minimumFetchIntervalSeconds let configSettings = RemoteConfigSettings() @@ -118,8 +121,10 @@ public class FirebaseRemoteConfigPlugin: NSObject, FlutterPlugin, FlutterStreamH completion(.success(())) } - func setDefaults(appName: String, defaultParameters: [String: Any?], - completion: @escaping (Result) -> Void) { + func setDefaults( + appName: String, defaultParameters: [String: Any?], + completion: @escaping (Result) -> Void + ) { var filtered: [String: NSObject] = [:] for (key, value) in defaultParameters { @@ -142,8 +147,10 @@ public class FirebaseRemoteConfigPlugin: NSObject, FlutterPlugin, FlutterStreamH } } - func setCustomSignals(appName: String, customSignals: [String: Any?], - completion: @escaping (Result) -> Void) { + func setCustomSignals( + appName: String, customSignals: [String: Any?], + completion: @escaping (Result) -> Void + ) { let signalValues = convertToCustomSignalValues(customSignals) Task { do { @@ -172,8 +179,10 @@ public class FirebaseRemoteConfigPlugin: NSObject, FlutterPlugin, FlutterStreamH completion(.success(parameters)) } - func getProperties(appName: String, - completion: @escaping (Result<[String: Any], any Error>) -> Void) { + func getProperties( + appName: String, + completion: @escaping (Result<[String: Any], any Error>) -> Void + ) { let config = getRemoteConfig(from: appName) completion(.success(configProperties(for: config))) } @@ -190,8 +199,10 @@ public class FirebaseRemoteConfigPlugin: NSObject, FlutterPlugin, FlutterStreamH kFirebaseRemoteConfigChannelName } - public func onListen(withArguments arguments: Any?, - eventSink events: @escaping FlutterEventSink) -> FlutterError? { + public func onListen( + withArguments arguments: Any?, + eventSink events: @escaping FlutterEventSink + ) -> FlutterError? { guard let args = arguments as? [String: Any], let appName = args["appName"] as? String else { return nil } @@ -237,7 +248,8 @@ public class FirebaseRemoteConfigPlugin: NSObject, FlutterPlugin, FlutterStreamH } private func createRemoteConfigValueDict(_ remoteConfigValue: RemoteConfigValue) - -> [String: Any] { + -> [String: Any] + { [ "value": FlutterStandardTypedData(bytes: remoteConfigValue.dataValue), "source": mapSource(remoteConfigValue.source), diff --git a/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Sources/firebase_remote_config/FirebaseRemoteConfigUtils.swift b/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Sources/firebase_remote_config/FirebaseRemoteConfigUtils.swift index 1e35341b36aa..45065769736b 100644 --- a/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Sources/firebase_remote_config/FirebaseRemoteConfigUtils.swift +++ b/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Sources/firebase_remote_config/FirebaseRemoteConfigUtils.swift @@ -11,7 +11,8 @@ class FLTFirebaseRemoteConfigUtils { switch error.code { case RemoteConfigError.internalError.rawValue: if let description = error.userInfo[NSLocalizedDescriptionKey] as? String, - description.contains("403") { + description.contains("403") + { // See PR for details: https://github.com/firebase/flutterfire/pull/9629 codeAndMessage["code"] = "forbidden" let updateMessage = @@ -21,7 +22,7 @@ class FLTFirebaseRemoteConfigUtils { codeAndMessage["code"] = "internal" codeAndMessage["message"] = error - .userInfo[NSLocalizedDescriptionKey] as? String ?? "Internal error" + .userInfo[NSLocalizedDescriptionKey] as? String ?? "Internal error" } case RemoteConfigError.throttled.rawValue: 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 44cdc9df140b..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,15 +7,15 @@ import PackageDescription -let firebaseSdkVersion: Version = "12.14.0" +let firebaseSdkVersion: Version = "12.15.0" let package = Package( name: "firebase_remote_config", platforms: [ - .macOS("10.15"), + .macOS("10.15") ], products: [ - .library(name: "firebase-remote-config", targets: ["firebase_remote_config"]), + .library(name: "firebase-remote-config", targets: ["firebase_remote_config"]) ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -29,8 +29,8 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources"), + .process("Resources") ] - ), + ) ] ) 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 502ccbbe5340..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,16 +7,16 @@ 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", platforms: [ - .iOS("15.0"), + .iOS("15.0") ], products: [ - .library(name: "firebase-storage", targets: ["firebase_storage"]), + .library(name: "firebase-storage", targets: ["firebase_storage"]) ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,13 +30,13 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources"), + .process("Resources") ], cSettings: [ .headerSearchPath("include"), .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-gcs\""), ] - ), + ) ] ) diff --git a/packages/firebase_storage/firebase_storage/ios/firebase_storage/Sources/firebase_storage/FLTFirebaseStoragePlugin.swift b/packages/firebase_storage/firebase_storage/ios/firebase_storage/Sources/firebase_storage/FLTFirebaseStoragePlugin.swift index c49aed7f7312..ef81f56e31da 100644 --- a/packages/firebase_storage/firebase_storage/ios/firebase_storage/Sources/firebase_storage/FLTFirebaseStoragePlugin.swift +++ b/packages/firebase_storage/firebase_storage/ios/firebase_storage/Sources/firebase_storage/FLTFirebaseStoragePlugin.swift @@ -63,8 +63,10 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt return Storage.storage(app: firApp, url: base) } - private func ref(app: InternalStorageFirebaseApp, - reference: InternalStorageReference) -> StorageReference { + private func ref( + app: InternalStorageFirebaseApp, + reference: InternalStorageReference + ) -> StorageReference { storage(app: app).reference(withPath: reference.fullPath) } @@ -72,8 +74,10 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt InternalStorageReference(bucket: ref.bucket, fullPath: ref.fullPath, name: ref.name) } - func getReferencebyPath(app: InternalStorageFirebaseApp, path: String, bucket: String?, - completion: @escaping (Result) -> Void) { + func getReferencebyPath( + app: InternalStorageFirebaseApp, path: String, bucket: String?, + completion: @escaping (Result) -> Void + ) { let r = storage(app: app).reference(withPath: path) completion( .success( @@ -86,26 +90,34 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt ) } - func setMaxOperationRetryTime(app: InternalStorageFirebaseApp, time: Int64, - completion: @escaping (Result) -> Void) { + func setMaxOperationRetryTime( + app: InternalStorageFirebaseApp, time: Int64, + completion: @escaping (Result) -> Void + ) { storage(app: app).maxOperationRetryTime = TimeInterval(Double(time) / 1000.0) completion(.success(())) } - func setMaxUploadRetryTime(app: InternalStorageFirebaseApp, time: Int64, - completion: @escaping (Result) -> Void) { + func setMaxUploadRetryTime( + app: InternalStorageFirebaseApp, time: Int64, + completion: @escaping (Result) -> Void + ) { storage(app: app).maxUploadRetryTime = TimeInterval(Double(time) / 1000.0) completion(.success(())) } - func setMaxDownloadRetryTime(app: InternalStorageFirebaseApp, time: Int64, - completion: @escaping (Result) -> Void) { + func setMaxDownloadRetryTime( + app: InternalStorageFirebaseApp, time: Int64, + completion: @escaping (Result) -> Void + ) { storage(app: app).maxDownloadRetryTime = TimeInterval(Double(time) / 1000.0) completion(.success(())) } - func useStorageEmulator(app: InternalStorageFirebaseApp, host: String, port: Int64, - completion: @escaping (Result) -> Void) { + func useStorageEmulator( + app: InternalStorageFirebaseApp, host: String, port: Int64, + completion: @escaping (Result) -> Void + ) { guard emulatorBooted[app.bucket] == nil else { completion(.success(())) return @@ -116,8 +128,10 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt completion(.success(())) } - func referenceDelete(app: InternalStorageFirebaseApp, reference: InternalStorageReference, - completion: @escaping (Result) -> Void) { + func referenceDelete( + app: InternalStorageFirebaseApp, reference: InternalStorageReference, + completion: @escaping (Result) -> Void + ) { ref(app: app, reference: reference).delete { error in if let e = error { completion(.failure(self.toFlutterError(e))) @@ -127,8 +141,10 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt } } - func referenceGetDownloadURL(app: InternalStorageFirebaseApp, reference: InternalStorageReference, - completion: @escaping (Result) -> Void) { + func referenceGetDownloadURL( + app: InternalStorageFirebaseApp, reference: InternalStorageReference, + completion: @escaping (Result) -> Void + ) { ref(app: app, reference: reference).downloadURL { url, error in if let e = error { completion(.failure(self.toFlutterError(e))) @@ -145,8 +161,10 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt } } - func referenceGetMetaData(app: InternalStorageFirebaseApp, reference: InternalStorageReference, - completion: @escaping (Result) -> Void) { + func referenceGetMetaData( + app: InternalStorageFirebaseApp, reference: InternalStorageReference, + completion: @escaping (Result) -> Void + ) { ref(app: app, reference: reference).getMetadata { md, error in if let e = error { completion(.failure(self.toFlutterError(e))) @@ -156,9 +174,11 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt } } - func referenceList(app: InternalStorageFirebaseApp, reference: InternalStorageReference, - options: InternalListOptions, - completion: @escaping (Result) -> Void) { + func referenceList( + app: InternalStorageFirebaseApp, reference: InternalStorageReference, + options: InternalListOptions, + completion: @escaping (Result) -> Void + ) { let r = ref(app: app, reference: reference) let block: (StorageListResult?, Error?) -> Void = { list, error in if let e = error { @@ -174,8 +194,10 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt } } - func referenceListAll(app: InternalStorageFirebaseApp, reference: InternalStorageReference, - completion: @escaping (Result) -> Void) { + func referenceListAll( + app: InternalStorageFirebaseApp, reference: InternalStorageReference, + completion: @escaping (Result) -> Void + ) { ref(app: app, reference: reference).listAll { list, error in if let e = error { completion(.failure(self.toFlutterError(e))) @@ -185,9 +207,11 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt } } - func referenceGetData(app: InternalStorageFirebaseApp, reference: InternalStorageReference, - maxSize: Int64, - completion: @escaping (Result) -> Void) { + func referenceGetData( + app: InternalStorageFirebaseApp, reference: InternalStorageReference, + maxSize: Int64, + completion: @escaping (Result) -> Void + ) { ref(app: app, reference: reference).getData(maxSize: maxSize) { data, error in if let e = error { completion(.failure(self.toFlutterError(e))) @@ -199,9 +223,11 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt } } - func referencePutData(app: InternalStorageFirebaseApp, reference: InternalStorageReference, - data: FlutterStandardTypedData, settableMetaData: InternalSettableMetadata, - handle: Int64, completion: @escaping (Result) -> Void) { + func referencePutData( + app: InternalStorageFirebaseApp, reference: InternalStorageReference, + data: FlutterStandardTypedData, settableMetaData: InternalSettableMetadata, + handle: Int64, completion: @escaping (Result) -> Void + ) { let r = ref(app: app, reference: reference) let task = r.putData(data.data, metadata: toMeta(settableMetaData)) completion( @@ -216,9 +242,11 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt ) } - func referencePutString(app: InternalStorageFirebaseApp, reference: InternalStorageReference, - data: String, format: Int64, settableMetaData: InternalSettableMetadata, - handle: Int64, completion: @escaping (Result) -> Void) { + func referencePutString( + app: InternalStorageFirebaseApp, reference: InternalStorageReference, + data: String, format: Int64, settableMetaData: InternalSettableMetadata, + handle: Int64, completion: @escaping (Result) -> Void + ) { let r = ref(app: app, reference: reference) let d: Data if format == 1 { @@ -246,10 +274,12 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt ) } - func referencePutFile(app: InternalStorageFirebaseApp, reference: InternalStorageReference, - filePath: String, settableMetaData: InternalSettableMetadata?, - handle: Int64, - completion: @escaping (Result) -> Void) { + func referencePutFile( + app: InternalStorageFirebaseApp, reference: InternalStorageReference, + filePath: String, settableMetaData: InternalSettableMetadata?, + handle: Int64, + completion: @escaping (Result) -> Void + ) { let r = ref(app: app, reference: reference) let url = URL(fileURLWithPath: filePath) let task: StorageUploadTask @@ -270,9 +300,11 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt ) } - func referenceDownloadFile(app: InternalStorageFirebaseApp, reference: InternalStorageReference, - filePath: String, handle: Int64, - completion: @escaping (Result) -> Void) { + func referenceDownloadFile( + app: InternalStorageFirebaseApp, reference: InternalStorageReference, + filePath: String, handle: Int64, + completion: @escaping (Result) -> Void + ) { let r = ref(app: app, reference: reference) let url = URL(fileURLWithPath: filePath) let task = r.write(toFile: url) @@ -288,11 +320,13 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt ) } - func referenceUpdateMetadata(app: InternalStorageFirebaseApp, reference: InternalStorageReference, - metadata: InternalSettableMetadata, - completion: - @escaping (Result) - -> Void) { + func referenceUpdateMetadata( + app: InternalStorageFirebaseApp, reference: InternalStorageReference, + metadata: InternalSettableMetadata, + completion: + @escaping (Result) + -> Void + ) { ref(app: app, reference: reference).updateMetadata(toMeta(metadata)) { md, error in if let e = error { completion(.failure(self.toFlutterError(e))) @@ -302,8 +336,10 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt } } - func taskPause(app: InternalStorageFirebaseApp, handle: Int64, - completion: @escaping (Result<[String: Any], Error>) -> Void) { + func taskPause( + app: InternalStorageFirebaseApp, handle: Int64, + completion: @escaping (Result<[String: Any], Error>) -> Void + ) { if let task = handleToTask[handle] as? StorageUploadTask { task.pause() completion(.success(["status": true, "snapshot": currentSnapshot(handle: handle)])) @@ -315,8 +351,10 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt } } - func taskResume(app: InternalStorageFirebaseApp, handle: Int64, - completion: @escaping (Result<[String: Any], Error>) -> Void) { + func taskResume( + app: InternalStorageFirebaseApp, handle: Int64, + completion: @escaping (Result<[String: Any], Error>) -> Void + ) { if let task = handleToTask[handle] as? StorageUploadTask { task.resume() completion(.success(["status": true, "snapshot": currentSnapshot(handle: handle)])) @@ -328,8 +366,10 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt } } - func taskCancel(app: InternalStorageFirebaseApp, handle: Int64, - completion: @escaping (Result<[String: Any], Error>) -> Void) { + func taskCancel( + app: InternalStorageFirebaseApp, handle: Int64, + completion: @escaping (Result<[String: Any], Error>) -> Void + ) { if let task = handleToTask[handle] as? StorageUploadTask { task.cancel() if let id = handleToIdentifier[handle] { @@ -387,8 +427,10 @@ public final class FLTFirebaseStoragePlugin: NSObject, FlutterPlugin, FirebaseSt return InternalListResult(items: itemsOpt, pageToken: list.pageToken, prefixs: prefixesOpt) } - private func registerTask(task: StorageObservableTask, appName: String, handle: Int64, - path: String) -> String { + private func registerTask( + task: StorageObservableTask, appName: String, handle: Int64, + path: String + ) -> String { let uuid = UUID().uuidString let channelName = "plugins.flutter.io/firebase_storage/taskEvent/\(uuid)" let channel = FlutterEventChannel(name: channelName, binaryMessenger: messenger!) diff --git a/packages/firebase_storage/firebase_storage/ios/firebase_storage/Sources/firebase_storage/FirebaseStorageMessages.g.swift b/packages/firebase_storage/firebase_storage/ios/firebase_storage/Sources/firebase_storage/FirebaseStorageMessages.g.swift index 1dccb935f562..8012456b979d 100644 --- a/packages/firebase_storage/firebase_storage/ios/firebase_storage/Sources/firebase_storage/FirebaseStorageMessages.g.swift +++ b/packages/firebase_storage/firebase_storage/ios/firebase_storage/Sources/firebase_storage/FirebaseStorageMessages.g.swift @@ -297,7 +297,7 @@ struct InternalFullMetaData: Hashable { func toList() -> [Any?] { [ - metadata, + metadata ] } @@ -627,51 +627,70 @@ class FirebaseStorageMessagesPigeonCodec: FlutterStandardMessageCodec, @unchecke /// Generated protocol from Pigeon that represents a handler of messages from Flutter. protocol FirebaseStorageHostApi { - func getReferencebyPath(app: InternalStorageFirebaseApp, path: String, bucket: String?, - completion: @escaping (Result) -> Void) - func setMaxOperationRetryTime(app: InternalStorageFirebaseApp, time: Int64, - completion: @escaping (Result) -> Void) - func setMaxUploadRetryTime(app: InternalStorageFirebaseApp, time: Int64, - completion: @escaping (Result) -> Void) - func setMaxDownloadRetryTime(app: InternalStorageFirebaseApp, time: Int64, - completion: @escaping (Result) -> Void) - func useStorageEmulator(app: InternalStorageFirebaseApp, host: String, port: Int64, - completion: @escaping (Result) -> Void) - func referenceDelete(app: InternalStorageFirebaseApp, reference: InternalStorageReference, - completion: @escaping (Result) -> Void) - func referenceGetDownloadURL(app: InternalStorageFirebaseApp, reference: InternalStorageReference, - completion: @escaping (Result) -> Void) - func referenceGetMetaData(app: InternalStorageFirebaseApp, reference: InternalStorageReference, - completion: @escaping (Result) -> Void) - func referenceList(app: InternalStorageFirebaseApp, reference: InternalStorageReference, - options: InternalListOptions, - completion: @escaping (Result) -> Void) - func referenceListAll(app: InternalStorageFirebaseApp, reference: InternalStorageReference, - completion: @escaping (Result) -> Void) - func referenceGetData(app: InternalStorageFirebaseApp, reference: InternalStorageReference, - maxSize: Int64, - completion: @escaping (Result) -> Void) - func referencePutData(app: InternalStorageFirebaseApp, reference: InternalStorageReference, - data: FlutterStandardTypedData, settableMetaData: InternalSettableMetadata, - handle: Int64, completion: @escaping (Result) -> Void) - func referencePutString(app: InternalStorageFirebaseApp, reference: InternalStorageReference, - data: String, format: Int64, settableMetaData: InternalSettableMetadata, - handle: Int64, completion: @escaping (Result) -> Void) - func referencePutFile(app: InternalStorageFirebaseApp, reference: InternalStorageReference, - filePath: String, settableMetaData: InternalSettableMetadata?, - handle: Int64, completion: @escaping (Result) -> Void) - func referenceDownloadFile(app: InternalStorageFirebaseApp, reference: InternalStorageReference, - filePath: String, handle: Int64, - completion: @escaping (Result) -> Void) - func referenceUpdateMetadata(app: InternalStorageFirebaseApp, reference: InternalStorageReference, - metadata: InternalSettableMetadata, - completion: @escaping (Result) -> Void) - func taskPause(app: InternalStorageFirebaseApp, handle: Int64, - completion: @escaping (Result<[String: Any], Error>) -> Void) - func taskResume(app: InternalStorageFirebaseApp, handle: Int64, - completion: @escaping (Result<[String: Any], Error>) -> Void) - func taskCancel(app: InternalStorageFirebaseApp, handle: Int64, - completion: @escaping (Result<[String: Any], Error>) -> Void) + func getReferencebyPath( + app: InternalStorageFirebaseApp, path: String, bucket: String?, + completion: @escaping (Result) -> Void) + func setMaxOperationRetryTime( + app: InternalStorageFirebaseApp, time: Int64, + completion: @escaping (Result) -> Void) + func setMaxUploadRetryTime( + app: InternalStorageFirebaseApp, time: Int64, + completion: @escaping (Result) -> Void) + func setMaxDownloadRetryTime( + app: InternalStorageFirebaseApp, time: Int64, + completion: @escaping (Result) -> Void) + func useStorageEmulator( + app: InternalStorageFirebaseApp, host: String, port: Int64, + completion: @escaping (Result) -> Void) + func referenceDelete( + app: InternalStorageFirebaseApp, reference: InternalStorageReference, + completion: @escaping (Result) -> Void) + func referenceGetDownloadURL( + app: InternalStorageFirebaseApp, reference: InternalStorageReference, + completion: @escaping (Result) -> Void) + func referenceGetMetaData( + app: InternalStorageFirebaseApp, reference: InternalStorageReference, + completion: @escaping (Result) -> Void) + func referenceList( + app: InternalStorageFirebaseApp, reference: InternalStorageReference, + options: InternalListOptions, + completion: @escaping (Result) -> Void) + func referenceListAll( + app: InternalStorageFirebaseApp, reference: InternalStorageReference, + completion: @escaping (Result) -> Void) + func referenceGetData( + app: InternalStorageFirebaseApp, reference: InternalStorageReference, + maxSize: Int64, + completion: @escaping (Result) -> Void) + func referencePutData( + app: InternalStorageFirebaseApp, reference: InternalStorageReference, + data: FlutterStandardTypedData, settableMetaData: InternalSettableMetadata, + handle: Int64, completion: @escaping (Result) -> Void) + func referencePutString( + app: InternalStorageFirebaseApp, reference: InternalStorageReference, + data: String, format: Int64, settableMetaData: InternalSettableMetadata, + handle: Int64, completion: @escaping (Result) -> Void) + func referencePutFile( + app: InternalStorageFirebaseApp, reference: InternalStorageReference, + filePath: String, settableMetaData: InternalSettableMetadata?, + handle: Int64, completion: @escaping (Result) -> Void) + func referenceDownloadFile( + app: InternalStorageFirebaseApp, reference: InternalStorageReference, + filePath: String, handle: Int64, + completion: @escaping (Result) -> Void) + func referenceUpdateMetadata( + app: InternalStorageFirebaseApp, reference: InternalStorageReference, + metadata: InternalSettableMetadata, + completion: @escaping (Result) -> Void) + func taskPause( + app: InternalStorageFirebaseApp, handle: Int64, + completion: @escaping (Result<[String: Any], Error>) -> Void) + func taskResume( + app: InternalStorageFirebaseApp, handle: Int64, + completion: @escaping (Result<[String: Any], Error>) -> Void) + func taskCancel( + app: InternalStorageFirebaseApp, handle: Int64, + completion: @escaping (Result<[String: Any], Error>) -> Void) } /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`. @@ -682,12 +701,14 @@ class FirebaseStorageHostApiSetup { /// Sets up an instance of `FirebaseStorageHostApi` to handle messages through the /// `binaryMessenger`. - static func setUp(binaryMessenger: FlutterBinaryMessenger, api: FirebaseStorageHostApi?, - messageChannelSuffix: String = "") { + static func setUp( + binaryMessenger: FlutterBinaryMessenger, api: FirebaseStorageHostApi?, + messageChannelSuffix: String = "" + ) { let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : "" let getReferencebyPathChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.getReferencebyPath\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.getReferencebyPath\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -711,7 +732,7 @@ class FirebaseStorageHostApiSetup { } let setMaxOperationRetryTimeChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.setMaxOperationRetryTime\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.setMaxOperationRetryTime\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -734,7 +755,7 @@ class FirebaseStorageHostApiSetup { } let setMaxUploadRetryTimeChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.setMaxUploadRetryTime\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.setMaxUploadRetryTime\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -757,7 +778,7 @@ class FirebaseStorageHostApiSetup { } let setMaxDownloadRetryTimeChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.setMaxDownloadRetryTime\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.setMaxDownloadRetryTime\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -780,7 +801,7 @@ class FirebaseStorageHostApiSetup { } let useStorageEmulatorChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.useStorageEmulator\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.useStorageEmulator\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -804,7 +825,7 @@ class FirebaseStorageHostApiSetup { } let referenceDeleteChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceDelete\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceDelete\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -827,7 +848,7 @@ class FirebaseStorageHostApiSetup { } let referenceGetDownloadURLChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceGetDownloadURL\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceGetDownloadURL\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -850,7 +871,7 @@ class FirebaseStorageHostApiSetup { } let referenceGetMetaDataChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceGetMetaData\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceGetMetaData\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -873,7 +894,7 @@ class FirebaseStorageHostApiSetup { } let referenceListChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceList\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceList\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -897,7 +918,7 @@ class FirebaseStorageHostApiSetup { } let referenceListAllChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceListAll\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceListAll\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -920,7 +941,7 @@ class FirebaseStorageHostApiSetup { } let referenceGetDataChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceGetData\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceGetData\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -944,7 +965,7 @@ class FirebaseStorageHostApiSetup { } let referencePutDataChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referencePutData\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referencePutData\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -976,7 +997,7 @@ class FirebaseStorageHostApiSetup { } let referencePutStringChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referencePutString\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referencePutString\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1010,7 +1031,7 @@ class FirebaseStorageHostApiSetup { } let referencePutFileChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referencePutFile\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referencePutFile\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1042,7 +1063,7 @@ class FirebaseStorageHostApiSetup { } let referenceDownloadFileChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceDownloadFile\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceDownloadFile\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1072,7 +1093,7 @@ class FirebaseStorageHostApiSetup { } let referenceUpdateMetadataChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceUpdateMetadata\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.referenceUpdateMetadata\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1100,7 +1121,7 @@ class FirebaseStorageHostApiSetup { } let taskPauseChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.taskPause\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.taskPause\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1123,7 +1144,7 @@ class FirebaseStorageHostApiSetup { } let taskResumeChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.taskResume\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.taskResume\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) @@ -1146,7 +1167,7 @@ class FirebaseStorageHostApiSetup { } let taskCancelChannel = FlutterBasicMessageChannel( name: - "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.taskCancel\(channelSuffix)", + "dev.flutter.pigeon.firebase_storage_platform_interface.FirebaseStorageHostApi.taskCancel\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec ) diff --git a/packages/firebase_storage/firebase_storage/ios/firebase_storage/Sources/firebase_storage/TaskStateChannelStreamHandler.swift b/packages/firebase_storage/firebase_storage/ios/firebase_storage/Sources/firebase_storage/TaskStateChannelStreamHandler.swift index 9cc69b046a25..21acfcbe6f32 100644 --- a/packages/firebase_storage/firebase_storage/ios/firebase_storage/Sources/firebase_storage/TaskStateChannelStreamHandler.swift +++ b/packages/firebase_storage/firebase_storage/ios/firebase_storage/Sources/firebase_storage/TaskStateChannelStreamHandler.swift @@ -27,11 +27,13 @@ final class TaskStateChannelStreamHandler: NSObject, FlutterStreamHandler { self.identifier = identifier } - func onListen(withArguments arguments: Any?, - eventSink events: @escaping FlutterEventSink) -> FlutterError? { + func onListen( + withArguments arguments: Any?, + eventSink events: @escaping FlutterEventSink + ) -> FlutterError? { successHandle = task.observe(.success) { snapshot in events([ - "taskState": 2, // success + "taskState": 2, // success "appName": self.storage.app.name, "snapshot": self.parseTaskSnapshot(snapshot), ]) @@ -41,7 +43,7 @@ final class TaskStateChannelStreamHandler: NSObject, FlutterStreamHandler { let err = snapshot.error as NSError? let errorDict: [String: Any] = self.errorDict(err) events([ - "taskState": 4, // error (including cancellations as errors per platform contract) + "taskState": 4, // error (including cancellations as errors per platform contract) "appName": self.storage.app.name, "error": errorDict, ]) @@ -49,14 +51,14 @@ final class TaskStateChannelStreamHandler: NSObject, FlutterStreamHandler { } pausedHandle = task.observe(.pause) { snapshot in events([ - "taskState": 0, // paused + "taskState": 0, // paused "appName": self.storage.app.name, "snapshot": self.parseTaskSnapshot(snapshot), ]) } progressHandle = task.observe(.progress) { snapshot in events([ - "taskState": 1, // running + "taskState": 1, // running "appName": self.storage.app.name, "snapshot": self.parseTaskSnapshot(snapshot), ]) @@ -105,7 +107,8 @@ final class TaskStateChannelStreamHandler: NSObject, FlutterStreamHandler { } let code: String if error.domain == StorageErrorDomain, - let storageCode = StorageErrorCode(rawValue: error.code) { + let storageCode = StorageErrorCode(rawValue: error.code) + { switch storageCode { case .objectNotFound: code = "object-not-found" case .bucketNotFound: code = "bucket-not-found" 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 96faaecf35e9..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,16 +7,16 @@ 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", platforms: [ - .macOS("10.15"), + .macOS("10.15") ], products: [ - .library(name: "firebase-storage", targets: ["firebase_storage"]), + .library(name: "firebase-storage", targets: ["firebase_storage"]) ], dependencies: [ .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), @@ -30,13 +30,13 @@ let package = Package( .product(name: "firebase-core", package: "firebase_core"), ], resources: [ - .process("Resources"), + .process("Resources") ], cSettings: [ .headerSearchPath("include"), .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), .define("LIBRARY_NAME", to: "\"flutter-fire-gcs\""), ] - ), + ) ] )