From d7d2d4b93e7c00226027fffde46699f3d5388a41 Mon Sep 17 00:00:00 2001 From: Russell Wheatley Date: Wed, 25 Sep 2024 15:05:54 +0100 Subject: [PATCH] fix(all, apple): use modular headers to import (#13400) --- .../ios/Classes/FLTDocumentSnapshotStreamHandler.m | 2 +- .../ios/Classes/FLTFirebaseFirestoreExtension.m | 2 +- .../cloud_firestore/ios/Classes/FLTFirebaseFirestorePlugin.m | 2 +- .../cloud_firestore/ios/Classes/FLTFirebaseFirestoreReader.m | 2 +- .../cloud_firestore/ios/Classes/FLTFirebaseFirestoreUtils.m | 5 +++-- .../cloud_firestore/ios/Classes/FLTFirebaseFirestoreWriter.m | 2 +- .../cloud_firestore/ios/Classes/FLTLoadBundleStreamHandler.m | 2 +- .../ios/Classes/FLTQuerySnapshotStreamHandler.m | 2 +- .../ios/Classes/FLTSnapshotsInSyncStreamHandler.m | 2 +- .../ios/Classes/FLTTransactionStreamHandler.m | 2 +- .../ios/Classes/Private/FLTFirebaseFirestoreUtils.h | 2 +- .../ios/Classes/Private/FLTLoadBundleStreamHandler.h | 2 +- .../ios/Classes/Private/FLTTransactionStreamHandler.h | 2 +- .../ios/Classes/Private/FirestorePigeonParser.h | 2 +- .../cloud_functions/ios/Classes/FLTFirebaseFunctionsPlugin.m | 2 +- .../ios/Classes/FLTFirebaseAnalyticsPlugin.m | 2 +- .../firebase_app_check/ios/Classes/FLTAppCheckProvider.h | 3 +-- .../ios/Classes/FLTAppCheckProviderFactory.m | 5 +++-- .../ios/Classes/FLTFirebaseAppCheckPlugin.m | 2 +- .../firebase_auth/ios/Classes/FLTFirebaseAuthPlugin.m | 2 +- .../ios/Classes/Private/FLTAuthStateChannelStreamHandler.h | 2 +- .../ios/Classes/Private/FLTIdTokenChannelStreamHandler.h | 2 +- .../Private/FLTPhoneNumberVerificationStreamHandler.h | 2 +- .../firebase_auth/ios/Classes/Private/PigeonParser.h | 2 +- .../firebase_auth/ios/Classes/Public/FLTFirebaseAuthPlugin.h | 2 +- .../firebase_crashlytics/ios/Classes/Crashlytics_Platform.h | 2 +- .../ios/Classes/ExceptionModel_Platform.h | 2 +- .../ios/Classes/FLTFirebaseDatabaseObserveStreamHandler.h | 2 +- .../ios/Classes/FLTFirebaseDatabaseObserveStreamHandler.m | 2 +- .../ios/Classes/FLTFirebaseDatabasePlugin.h | 2 +- .../firebase_database/ios/Classes/FLTFirebaseDatabaseUtils.h | 2 +- .../ios/Classes/FLTFirebaseDynamicLinksPlugin.h | 2 +- .../ios/Classes/FLTFirebaseDynamicLinksPlugin.m | 2 +- .../ios/Classes/FLTFirebaseMessagingPlugin.h | 3 ++- .../ios/Classes/FLTFirebaseMessagingPlugin.m | 4 ++++ .../ios/Classes/FLTFirebasePerformancePlugin.h | 2 +- .../ios/Classes/FLTFirebasePerformancePlugin.m | 2 -- .../ios/Classes/FLTFirebaseRemoteConfigPlugin.m | 2 +- .../ios/Classes/FLTFirebaseRemoteConfigUtils.m | 2 +- .../firebase_storage/ios/Classes/FLTFirebaseStoragePlugin.m | 2 +- .../ios/Classes/FLTTaskStateChannelStreamHandler.h | 2 +- 41 files changed, 48 insertions(+), 44 deletions(-) diff --git a/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTDocumentSnapshotStreamHandler.m b/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTDocumentSnapshotStreamHandler.m index a2e58188ad26..280fe82f139a 100644 --- a/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTDocumentSnapshotStreamHandler.m +++ b/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTDocumentSnapshotStreamHandler.m @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import +@import FirebaseFirestore; #import #import "Private/FLTDocumentSnapshotStreamHandler.h" diff --git a/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTFirebaseFirestoreExtension.m b/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTFirebaseFirestoreExtension.m index d130a95d5553..c90dbe1f9e5f 100644 --- a/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTFirebaseFirestoreExtension.m +++ b/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTFirebaseFirestoreExtension.m @@ -1,7 +1,7 @@ // Copyright 2023 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import +@import FirebaseFirestore; #import "Private/FLTFirebaseFirestoreExtension.h" diff --git a/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTFirebaseFirestorePlugin.m b/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTFirebaseFirestorePlugin.m index b7a4b114dcf7..45baf0b4ca3b 100644 --- a/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTFirebaseFirestorePlugin.m +++ b/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTFirebaseFirestorePlugin.m @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import +@import FirebaseFirestore; #import #import diff --git a/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTFirebaseFirestoreReader.m b/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTFirebaseFirestoreReader.m index cb104640f749..e678b1cff779 100644 --- a/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTFirebaseFirestoreReader.m +++ b/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTFirebaseFirestoreReader.m @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import +@import FirebaseFirestore; #import #import "Private/FLTFirebaseFirestoreReader.h" diff --git a/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTFirebaseFirestoreUtils.m b/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTFirebaseFirestoreUtils.m index 73659a783f67..3df29f13f1fc 100644 --- a/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTFirebaseFirestoreUtils.m +++ b/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTFirebaseFirestoreUtils.m @@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import +@import FirebaseFirestore; +@import FirebaseCore; +#import "Private/FLTFirebaseFirestoreUtils.h" #import "Private/FLTFirebaseFirestoreExtension.h" #import "Private/FLTFirebaseFirestoreReader.h" -#import "Private/FLTFirebaseFirestoreUtils.h" #import "Private/FLTFirebaseFirestoreWriter.h" @implementation FLTFirebaseFirestoreReaderWriter diff --git a/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTFirebaseFirestoreWriter.m b/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTFirebaseFirestoreWriter.m index 1ea26d6f3cc9..8533a56be420 100644 --- a/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTFirebaseFirestoreWriter.m +++ b/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTFirebaseFirestoreWriter.m @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import +@import FirebaseFirestore; #import #import "Private/FLTFirebaseFirestoreUtils.h" diff --git a/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTLoadBundleStreamHandler.m b/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTLoadBundleStreamHandler.m index 723b0a5aef3a..c9e91301a798 100644 --- a/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTLoadBundleStreamHandler.m +++ b/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTLoadBundleStreamHandler.m @@ -9,7 +9,7 @@ // Created by Russell Wheatley on 05/05/2021. // -#import +@import FirebaseFirestore; #import #import "Private/FLTFirebaseFirestoreUtils.h" diff --git a/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTQuerySnapshotStreamHandler.m b/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTQuerySnapshotStreamHandler.m index e071bb501d42..86c11b3d867b 100644 --- a/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTQuerySnapshotStreamHandler.m +++ b/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTQuerySnapshotStreamHandler.m @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import +@import FirebaseFirestore; #import #import "Private/FLTFirebaseFirestoreUtils.h" diff --git a/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTSnapshotsInSyncStreamHandler.m b/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTSnapshotsInSyncStreamHandler.m index 4810470765d3..6662ad2de277 100644 --- a/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTSnapshotsInSyncStreamHandler.m +++ b/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTSnapshotsInSyncStreamHandler.m @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import +@import FirebaseFirestore; #import #import "Private/FLTFirebaseFirestoreUtils.h" diff --git a/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTTransactionStreamHandler.m b/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTTransactionStreamHandler.m index 104fa70c9226..364ff7687c1a 100644 --- a/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTTransactionStreamHandler.m +++ b/packages/cloud_firestore/cloud_firestore/ios/Classes/FLTTransactionStreamHandler.m @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import +@import FirebaseFirestore; #import #import "Private/FLTFirebaseFirestoreUtils.h" diff --git a/packages/cloud_firestore/cloud_firestore/ios/Classes/Private/FLTFirebaseFirestoreUtils.h b/packages/cloud_firestore/cloud_firestore/ios/Classes/Private/FLTFirebaseFirestoreUtils.h index 49c1387b4781..ef5dc5a47db7 100644 --- a/packages/cloud_firestore/cloud_firestore/ios/Classes/Private/FLTFirebaseFirestoreUtils.h +++ b/packages/cloud_firestore/cloud_firestore/ios/Classes/Private/FLTFirebaseFirestoreUtils.h @@ -10,7 +10,7 @@ #import #endif -#import +@import FirebaseFirestore; #import #import "FLTFirebaseFirestoreExtension.h" diff --git a/packages/cloud_firestore/cloud_firestore/ios/Classes/Private/FLTLoadBundleStreamHandler.h b/packages/cloud_firestore/cloud_firestore/ios/Classes/Private/FLTLoadBundleStreamHandler.h index 484811d2e2bb..59f018b61e17 100644 --- a/packages/cloud_firestore/cloud_firestore/ios/Classes/Private/FLTLoadBundleStreamHandler.h +++ b/packages/cloud_firestore/cloud_firestore/ios/Classes/Private/FLTLoadBundleStreamHandler.h @@ -18,7 +18,7 @@ #import #endif -#import +@import FirebaseFirestore; #import diff --git a/packages/cloud_firestore/cloud_firestore/ios/Classes/Private/FLTTransactionStreamHandler.h b/packages/cloud_firestore/cloud_firestore/ios/Classes/Private/FLTTransactionStreamHandler.h index 55cfa1ec4903..cc427a82b6a5 100644 --- a/packages/cloud_firestore/cloud_firestore/ios/Classes/Private/FLTTransactionStreamHandler.h +++ b/packages/cloud_firestore/cloud_firestore/ios/Classes/Private/FLTTransactionStreamHandler.h @@ -9,7 +9,7 @@ #import #endif -#import +@import FirebaseFirestore; #import "FirestoreMessages.g.h" #import diff --git a/packages/cloud_firestore/cloud_firestore/ios/Classes/Private/FirestorePigeonParser.h b/packages/cloud_firestore/cloud_firestore/ios/Classes/Private/FirestorePigeonParser.h index b459480bdc07..7007a0973642 100644 --- a/packages/cloud_firestore/cloud_firestore/ios/Classes/Private/FirestorePigeonParser.h +++ b/packages/cloud_firestore/cloud_firestore/ios/Classes/Private/FirestorePigeonParser.h @@ -4,7 +4,7 @@ * BSD-style license that can be found in the LICENSE file. */ -#import +@import FirebaseFirestore; #import #import "FirestoreMessages.g.h" diff --git a/packages/cloud_functions/cloud_functions/ios/Classes/FLTFirebaseFunctionsPlugin.m b/packages/cloud_functions/cloud_functions/ios/Classes/FLTFirebaseFunctionsPlugin.m index af84200b2210..a98ba143f818 100644 --- a/packages/cloud_functions/cloud_functions/ios/Classes/FLTFirebaseFunctionsPlugin.m +++ b/packages/cloud_functions/cloud_functions/ios/Classes/FLTFirebaseFunctionsPlugin.m @@ -4,7 +4,7 @@ #import "FLTFirebaseFunctionsPlugin.h" -#import +@import FirebaseFunctions; #import NSString *const kFLTFirebaseFunctionsChannelName = @"plugins.flutter.io/firebase_functions"; diff --git a/packages/firebase_analytics/firebase_analytics/ios/Classes/FLTFirebaseAnalyticsPlugin.m b/packages/firebase_analytics/firebase_analytics/ios/Classes/FLTFirebaseAnalyticsPlugin.m index e1c7107d08d8..0fce86ed96ee 100644 --- a/packages/firebase_analytics/firebase_analytics/ios/Classes/FLTFirebaseAnalyticsPlugin.m +++ b/packages/firebase_analytics/firebase_analytics/ios/Classes/FLTFirebaseAnalyticsPlugin.m @@ -4,7 +4,7 @@ #import "FLTFirebaseAnalyticsPlugin.h" -#import +@import FirebaseAnalytics; #import diff --git a/packages/firebase_app_check/firebase_app_check/ios/Classes/FLTAppCheckProvider.h b/packages/firebase_app_check/firebase_app_check/ios/Classes/FLTAppCheckProvider.h index 6f812f287c7d..87797e53def0 100644 --- a/packages/firebase_app_check/firebase_app_check/ios/Classes/FLTAppCheckProvider.h +++ b/packages/firebase_app_check/firebase_app_check/ios/Classes/FLTAppCheckProvider.h @@ -2,8 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import -#import +@import FirebaseAppCheck; @interface FLTAppCheckProvider : NSObject diff --git a/packages/firebase_app_check/firebase_app_check/ios/Classes/FLTAppCheckProviderFactory.m b/packages/firebase_app_check/firebase_app_check/ios/Classes/FLTAppCheckProviderFactory.m index ca8636fb5b2d..f6566f299321 100644 --- a/packages/firebase_app_check/firebase_app_check/ios/Classes/FLTAppCheckProviderFactory.m +++ b/packages/firebase_app_check/firebase_app_check/ios/Classes/FLTAppCheckProviderFactory.m @@ -4,8 +4,9 @@ #import -#import -#import +@import FirebaseAppCheck; +@import FirebaseCore; + #import "FLTAppCheckProviderFactory.h" #import "FLTAppCheckProvider.h" diff --git a/packages/firebase_app_check/firebase_app_check/ios/Classes/FLTFirebaseAppCheckPlugin.m b/packages/firebase_app_check/firebase_app_check/ios/Classes/FLTFirebaseAppCheckPlugin.m index b4afc4d049c3..bbd9bfca6a12 100644 --- a/packages/firebase_app_check/firebase_app_check/ios/Classes/FLTFirebaseAppCheckPlugin.m +++ b/packages/firebase_app_check/firebase_app_check/ios/Classes/FLTFirebaseAppCheckPlugin.m @@ -5,7 +5,7 @@ #import "FLTFirebaseAppCheckPlugin.h" #import "FLTTokenRefreshStreamHandler.h" -#import +@import FirebaseAppCheck; #import #import "FLTAppCheckProviderFactory.h" diff --git a/packages/firebase_auth/firebase_auth/ios/Classes/FLTFirebaseAuthPlugin.m b/packages/firebase_auth/firebase_auth/ios/Classes/FLTFirebaseAuthPlugin.m index a70675f5ee38..8e516c7a466f 100644 --- a/packages/firebase_auth/firebase_auth/ios/Classes/FLTFirebaseAuthPlugin.m +++ b/packages/firebase_auth/firebase_auth/ios/Classes/FLTFirebaseAuthPlugin.m @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import +@import FirebaseAuth; #import #import diff --git a/packages/firebase_auth/firebase_auth/ios/Classes/Private/FLTAuthStateChannelStreamHandler.h b/packages/firebase_auth/firebase_auth/ios/Classes/Private/FLTAuthStateChannelStreamHandler.h index 3b0fbb9d9b66..02dca52ceabf 100644 --- a/packages/firebase_auth/firebase_auth/ios/Classes/Private/FLTAuthStateChannelStreamHandler.h +++ b/packages/firebase_auth/firebase_auth/ios/Classes/Private/FLTAuthStateChannelStreamHandler.h @@ -10,7 +10,7 @@ #import #endif -#import +@import FirebaseAuth; #import #import "CustomPigeonHeader.h" diff --git a/packages/firebase_auth/firebase_auth/ios/Classes/Private/FLTIdTokenChannelStreamHandler.h b/packages/firebase_auth/firebase_auth/ios/Classes/Private/FLTIdTokenChannelStreamHandler.h index 0f118bec4033..8e553476cb86 100644 --- a/packages/firebase_auth/firebase_auth/ios/Classes/Private/FLTIdTokenChannelStreamHandler.h +++ b/packages/firebase_auth/firebase_auth/ios/Classes/Private/FLTIdTokenChannelStreamHandler.h @@ -10,7 +10,7 @@ #import #endif -#import +@import FirebaseAuth; #import "CustomPigeonHeader.h" #import "PigeonParser.h" diff --git a/packages/firebase_auth/firebase_auth/ios/Classes/Private/FLTPhoneNumberVerificationStreamHandler.h b/packages/firebase_auth/firebase_auth/ios/Classes/Private/FLTPhoneNumberVerificationStreamHandler.h index ec1d20ed7f31..fa0d514a6ac8 100644 --- a/packages/firebase_auth/firebase_auth/ios/Classes/Private/FLTPhoneNumberVerificationStreamHandler.h +++ b/packages/firebase_auth/firebase_auth/ios/Classes/Private/FLTPhoneNumberVerificationStreamHandler.h @@ -10,7 +10,7 @@ #import #endif -#import +@import FirebaseAuth; #import "firebase_auth_messages.g.h" #import diff --git a/packages/firebase_auth/firebase_auth/ios/Classes/Private/PigeonParser.h b/packages/firebase_auth/firebase_auth/ios/Classes/Private/PigeonParser.h index ff5519ba675d..e0f45472dd1a 100644 --- a/packages/firebase_auth/firebase_auth/ios/Classes/Private/PigeonParser.h +++ b/packages/firebase_auth/firebase_auth/ios/Classes/Private/PigeonParser.h @@ -4,7 +4,7 @@ * BSD-style license that can be found in the LICENSE file. */ -#import +@import FirebaseAuth; #import #import "firebase_auth_messages.g.h" diff --git a/packages/firebase_auth/firebase_auth/ios/Classes/Public/FLTFirebaseAuthPlugin.h b/packages/firebase_auth/firebase_auth/ios/Classes/Public/FLTFirebaseAuthPlugin.h index c9e35302d172..454692daa657 100644 --- a/packages/firebase_auth/firebase_auth/ios/Classes/Public/FLTFirebaseAuthPlugin.h +++ b/packages/firebase_auth/firebase_auth/ios/Classes/Public/FLTFirebaseAuthPlugin.h @@ -4,7 +4,7 @@ #import -#import +@import FirebaseAuth; #if TARGET_OS_OSX #import #else diff --git a/packages/firebase_crashlytics/firebase_crashlytics/ios/Classes/Crashlytics_Platform.h b/packages/firebase_crashlytics/firebase_crashlytics/ios/Classes/Crashlytics_Platform.h index d28a16534fc9..64543b515e69 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/ios/Classes/Crashlytics_Platform.h +++ b/packages/firebase_crashlytics/firebase_crashlytics/ios/Classes/Crashlytics_Platform.h @@ -18,7 +18,7 @@ // Crashlytics // -#import +@import FirebaseCrashlytics; @interface FIRCrashlytics (Platform) diff --git a/packages/firebase_crashlytics/firebase_crashlytics/ios/Classes/ExceptionModel_Platform.h b/packages/firebase_crashlytics/firebase_crashlytics/ios/Classes/ExceptionModel_Platform.h index 3f380cf3602d..685ba511f446 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/ios/Classes/ExceptionModel_Platform.h +++ b/packages/firebase_crashlytics/firebase_crashlytics/ios/Classes/ExceptionModel_Platform.h @@ -18,7 +18,7 @@ // Crashlytics // -#import +@import FirebaseCrashlytics; @interface FIRExceptionModel (Platform) diff --git a/packages/firebase_database/firebase_database/ios/Classes/FLTFirebaseDatabaseObserveStreamHandler.h b/packages/firebase_database/firebase_database/ios/Classes/FLTFirebaseDatabaseObserveStreamHandler.h index 0bb555293d7b..2529fd482847 100644 --- a/packages/firebase_database/firebase_database/ios/Classes/FLTFirebaseDatabaseObserveStreamHandler.h +++ b/packages/firebase_database/firebase_database/ios/Classes/FLTFirebaseDatabaseObserveStreamHandler.h @@ -1,7 +1,7 @@ // Copyright 2021 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import +@import FirebaseDatabase; #import #if TARGET_OS_OSX diff --git a/packages/firebase_database/firebase_database/ios/Classes/FLTFirebaseDatabaseObserveStreamHandler.m b/packages/firebase_database/firebase_database/ios/Classes/FLTFirebaseDatabaseObserveStreamHandler.m index 9a1e1fe1ab37..e1001762137c 100644 --- a/packages/firebase_database/firebase_database/ios/Classes/FLTFirebaseDatabaseObserveStreamHandler.m +++ b/packages/firebase_database/firebase_database/ios/Classes/FLTFirebaseDatabaseObserveStreamHandler.m @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import +@import FirebaseDatabase; #import #import "FLTFirebaseDatabaseObserveStreamHandler.h" diff --git a/packages/firebase_database/firebase_database/ios/Classes/FLTFirebaseDatabasePlugin.h b/packages/firebase_database/firebase_database/ios/Classes/FLTFirebaseDatabasePlugin.h index e01abbdd6433..a624e11746f0 100644 --- a/packages/firebase_database/firebase_database/ios/Classes/FLTFirebaseDatabasePlugin.h +++ b/packages/firebase_database/firebase_database/ios/Classes/FLTFirebaseDatabasePlugin.h @@ -1,7 +1,7 @@ // Copyright 2021 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import +@import FirebaseDatabase; #if TARGET_OS_OSX #import #else diff --git a/packages/firebase_database/firebase_database/ios/Classes/FLTFirebaseDatabaseUtils.h b/packages/firebase_database/firebase_database/ios/Classes/FLTFirebaseDatabaseUtils.h index aa2400e9ad85..f58a39924daa 100644 --- a/packages/firebase_database/firebase_database/ios/Classes/FLTFirebaseDatabaseUtils.h +++ b/packages/firebase_database/firebase_database/ios/Classes/FLTFirebaseDatabaseUtils.h @@ -1,7 +1,7 @@ // Copyright 2021 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import +@import FirebaseDatabase; #import @interface FLTFirebaseDatabaseUtils : NSObject diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/ios/Classes/FLTFirebaseDynamicLinksPlugin.h b/packages/firebase_dynamic_links/firebase_dynamic_links/ios/Classes/FLTFirebaseDynamicLinksPlugin.h index 749b1fc6004a..360e6ef8494e 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/ios/Classes/FLTFirebaseDynamicLinksPlugin.h +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/ios/Classes/FLTFirebaseDynamicLinksPlugin.h @@ -1,7 +1,7 @@ // Copyright 2021 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import +@import FirebaseDynamicLinks; #import #import diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/ios/Classes/FLTFirebaseDynamicLinksPlugin.m b/packages/firebase_dynamic_links/firebase_dynamic_links/ios/Classes/FLTFirebaseDynamicLinksPlugin.m index b59a1ba12651..99aa2430300a 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/ios/Classes/FLTFirebaseDynamicLinksPlugin.m +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/ios/Classes/FLTFirebaseDynamicLinksPlugin.m @@ -1,7 +1,7 @@ // Copyright 2021 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import +@import FirebaseDynamicLinks; #import #import diff --git a/packages/firebase_messaging/firebase_messaging/ios/Classes/FLTFirebaseMessagingPlugin.h b/packages/firebase_messaging/firebase_messaging/ios/Classes/FLTFirebaseMessagingPlugin.h index 30eece717861..144343e830fd 100644 --- a/packages/firebase_messaging/firebase_messaging/ios/Classes/FLTFirebaseMessagingPlugin.h +++ b/packages/firebase_messaging/firebase_messaging/ios/Classes/FLTFirebaseMessagingPlugin.h @@ -9,7 +9,8 @@ #import #endif -#import +@import FirebaseMessaging; + #import #import #import diff --git a/packages/firebase_messaging/firebase_messaging/ios/Classes/FLTFirebaseMessagingPlugin.m b/packages/firebase_messaging/firebase_messaging/ios/Classes/FLTFirebaseMessagingPlugin.m index 88a3ab0744bf..2b42dfdcbbdf 100644 --- a/packages/firebase_messaging/firebase_messaging/ios/Classes/FLTFirebaseMessagingPlugin.m +++ b/packages/firebase_messaging/firebase_messaging/ios/Classes/FLTFirebaseMessagingPlugin.m @@ -9,6 +9,10 @@ #import "FLTFirebaseMessagingPlugin.h" +#if __has_include() +@import FirebaseAuth; +#endif + NSString *const kFLTFirebaseMessagingChannelName = @"plugins.flutter.io/firebase_messaging"; NSString *const kMessagingArgumentCode = @"code"; diff --git a/packages/firebase_performance/firebase_performance/ios/Classes/FLTFirebasePerformancePlugin.h b/packages/firebase_performance/firebase_performance/ios/Classes/FLTFirebasePerformancePlugin.h index af5b58d471dd..72bfa30eea03 100644 --- a/packages/firebase_performance/firebase_performance/ios/Classes/FLTFirebasePerformancePlugin.h +++ b/packages/firebase_performance/firebase_performance/ios/Classes/FLTFirebasePerformancePlugin.h @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import +@import FirebasePerformance; #import #import #import diff --git a/packages/firebase_performance/firebase_performance/ios/Classes/FLTFirebasePerformancePlugin.m b/packages/firebase_performance/firebase_performance/ios/Classes/FLTFirebasePerformancePlugin.m index f538c633c93d..c5918253a5b8 100644 --- a/packages/firebase_performance/firebase_performance/ios/Classes/FLTFirebasePerformancePlugin.m +++ b/packages/firebase_performance/firebase_performance/ios/Classes/FLTFirebasePerformancePlugin.m @@ -4,8 +4,6 @@ #import "FLTFirebasePerformancePlugin.h" -#import - #import NSString *const kFLTFirebasePerformanceChannelName = @"plugins.flutter.io/firebase_performance"; diff --git a/packages/firebase_remote_config/firebase_remote_config/ios/Classes/FLTFirebaseRemoteConfigPlugin.m b/packages/firebase_remote_config/firebase_remote_config/ios/Classes/FLTFirebaseRemoteConfigPlugin.m index f9c80bbb1870..f7dbc585aeb3 100644 --- a/packages/firebase_remote_config/firebase_remote_config/ios/Classes/FLTFirebaseRemoteConfigPlugin.m +++ b/packages/firebase_remote_config/firebase_remote_config/ios/Classes/FLTFirebaseRemoteConfigPlugin.m @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import +@import FirebaseRemoteConfig; #import #import "FLTFirebaseRemoteConfigPlugin.h" diff --git a/packages/firebase_remote_config/firebase_remote_config/ios/Classes/FLTFirebaseRemoteConfigUtils.m b/packages/firebase_remote_config/firebase_remote_config/ios/Classes/FLTFirebaseRemoteConfigUtils.m index 982761c279af..8abe959ffc8c 100644 --- a/packages/firebase_remote_config/firebase_remote_config/ios/Classes/FLTFirebaseRemoteConfigUtils.m +++ b/packages/firebase_remote_config/firebase_remote_config/ios/Classes/FLTFirebaseRemoteConfigUtils.m @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import +@import FirebaseRemoteConfig; #import "FLTFirebaseRemoteConfigUtils.h" diff --git a/packages/firebase_storage/firebase_storage/ios/Classes/FLTFirebaseStoragePlugin.m b/packages/firebase_storage/firebase_storage/ios/Classes/FLTFirebaseStoragePlugin.m index 4e48432e7665..437f21cef1a4 100644 --- a/packages/firebase_storage/firebase_storage/ios/Classes/FLTFirebaseStoragePlugin.m +++ b/packages/firebase_storage/firebase_storage/ios/Classes/FLTFirebaseStoragePlugin.m @@ -3,7 +3,7 @@ // found in the LICENSE file. #import -#import +@import FirebaseStorage; #import #import "FLTFirebaseStoragePlugin.h" #import "FLTTaskStateChannelStreamHandler.h" diff --git a/packages/firebase_storage/firebase_storage/ios/Classes/FLTTaskStateChannelStreamHandler.h b/packages/firebase_storage/firebase_storage/ios/Classes/FLTTaskStateChannelStreamHandler.h index be6a8526aae6..51a3afae5128 100644 --- a/packages/firebase_storage/firebase_storage/ios/Classes/FLTTaskStateChannelStreamHandler.h +++ b/packages/firebase_storage/firebase_storage/ios/Classes/FLTTaskStateChannelStreamHandler.h @@ -10,7 +10,7 @@ #import #endif -#import +@import FirebaseStorage; #import