fix(all, apple): use modular headers to import (#13400)

russellwheatley · web-flow · commit d7d2d4b93e7c · 2024-09-25T15:05:54.000+01:00
diff --git 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 <Firebase/Firebase.h>
+@import FirebaseFirestore;
 #import <firebase_core/FLTFirebasePluginRegistry.h>
 
 #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
@@ -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 <Firebase/Firebase.h>
+@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
@@ -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 <Firebase/Firebase.h>
+@import FirebaseFirestore;
 #import <firebase_core/FLTFirebasePluginRegistry.h>
 
 #import <TargetConditionals.h>
diff --git 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 <Firebase/Firebase.h>
+@import FirebaseFirestore;
 #import <firebase_core/FLTFirebasePlugin.h>
 
 #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
@@ -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 <Firebase/Firebase.h>
+@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
@@ -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 <Firebase/Firebase.h>
+@import FirebaseFirestore;
 #import <firebase_core/FLTFirebasePlugin.h>
 
 #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
@@ -9,7 +9,7 @@
 //  Created by Russell Wheatley on 05/05/2021.
 //
 
-#import <Firebase/Firebase.h>
+@import FirebaseFirestore;
 #import <firebase_core/FLTFirebasePluginRegistry.h>
 
 #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
@@ -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 <Firebase/Firebase.h>
+@import FirebaseFirestore;
 #import <firebase_core/FLTFirebasePluginRegistry.h>
 
 #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
@@ -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 <Firebase/Firebase.h>
+@import FirebaseFirestore;
 #import <firebase_core/FLTFirebasePluginRegistry.h>
 
 #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
@@ -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 <Firebase/Firebase.h>
+@import FirebaseFirestore;
 #import <firebase_core/FLTFirebasePluginRegistry.h>
 
 #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
@@ -10,7 +10,7 @@
 #import <Flutter/Flutter.h>
 #endif
 
-#import <Firebase/Firebase.h>
+@import FirebaseFirestore;
 #import <Foundation/Foundation.h>
 #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
@@ -18,7 +18,7 @@
 #import <Flutter/Flutter.h>
 #endif
 
-#import <Firebase/Firebase.h>
+@import FirebaseFirestore;
 
 #import <Foundation/Foundation.h>
 
diff --git 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 <Flutter/Flutter.h>
 #endif
 
-#import <Firebase/Firebase.h>
+@import FirebaseFirestore;
 #import "FirestoreMessages.g.h"
 
 #import <Foundation/Foundation.h>
diff --git 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 <Firebase/Firebase.h>
+@import FirebaseFirestore;
 #import <Foundation/Foundation.h>
 #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
@@ -4,7 +4,7 @@
 
 #import "FLTFirebaseFunctionsPlugin.h"
 
-#import <Firebase/Firebase.h>
+@import FirebaseFunctions;
 #import <firebase_core/FLTFirebasePluginRegistry.h>
 
 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
@@ -4,7 +4,7 @@
 
 #import "FLTFirebaseAnalyticsPlugin.h"
 
-#import <Firebase/Firebase.h>
+@import FirebaseAnalytics;
 
 #import <firebase_core/FLTFirebasePluginRegistry.h>
 
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
@@ -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 <Firebase/Firebase.h>
-#import <FirebaseAppCheck/FIRAppCheck.h>
+@import FirebaseAppCheck;
 
 @interface FLTAppCheckProvider : NSObject <FIRAppCheckProvider>
 
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
@@ -4,8 +4,9 @@
 
 #import <FirebaseAppCheck/FIRAppCheck.h>
 
-#import <Firebase/Firebase.h>
-#import <FirebaseAppCheck/FIRAppCheck.h>
+@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
@@ -5,7 +5,7 @@
 #import "FLTFirebaseAppCheckPlugin.h"
 #import "FLTTokenRefreshStreamHandler.h"
 
-#import <Firebase/Firebase.h>
+@import FirebaseAppCheck;
 
 #import <firebase_core/FLTFirebasePluginRegistry.h>
 #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
@@ -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 <Firebase/Firebase.h>
+@import FirebaseAuth;
 #import <TargetConditionals.h>
 #import <firebase_core/FLTFirebasePluginRegistry.h>
 
diff --git 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 <Flutter/Flutter.h>
 #endif
 
-#import <Firebase/Firebase.h>
+@import FirebaseAuth;
 
 #import <Foundation/Foundation.h>
 #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
@@ -10,7 +10,7 @@
 #import <Flutter/Flutter.h>
 #endif
 
-#import <Firebase/Firebase.h>
+@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
@@ -10,7 +10,7 @@
 #import <Flutter/Flutter.h>
 #endif
 
-#import <Firebase/Firebase.h>
+@import FirebaseAuth;
 #import "firebase_auth_messages.g.h"
 
 #import <Foundation/Foundation.h>
diff --git 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 <Firebase/Firebase.h>
+@import FirebaseAuth;
 #import <Foundation/Foundation.h>
 #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
@@ -4,7 +4,7 @@
 
 #import <TargetConditionals.h>
 
-#import <Firebase/Firebase.h>
+@import FirebaseAuth;
 #if TARGET_OS_OSX
 #import <FlutterMacOS/FlutterMacOS.h>
 #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
@@ -18,7 +18,7 @@
 //  Crashlytics
 //
 
-#import <Firebase/Firebase.h>
+@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
@@ -18,7 +18,7 @@
 //  Crashlytics
 //
 
-#import <Firebase/Firebase.h>
+@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
@@ -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 <Firebase/Firebase.h>
+@import FirebaseDatabase;
 #import <TargetConditionals.h>
 
 #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
@@ -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 <Firebase/Firebase.h>
+@import FirebaseDatabase;
 #import <firebase_core/FLTFirebasePluginRegistry.h>
 
 #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
@@ -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 <Firebase/Firebase.h>
+@import FirebaseDatabase;
 #if TARGET_OS_OSX
 #import <FlutterMacOS/FlutterMacOS.h>
 #else
diff --git 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 <Firebase/Firebase.h>
+@import FirebaseDatabase;
 #import <Foundation/Foundation.h>
 
 @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
@@ -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 <Firebase/Firebase.h>
+@import FirebaseDynamicLinks;
 #import <Flutter/Flutter.h>
 #import <firebase_core/FLTFirebasePlugin.h>
 
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
@@ -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 <Firebase/Firebase.h>
+@import FirebaseDynamicLinks;
 #import <TargetConditionals.h>
 #import <firebase_core/FLTFirebasePluginRegistry.h>
 
diff --git 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 <Flutter/Flutter.h>
 #endif
 
-#import <Firebase/Firebase.h>
+@import FirebaseMessaging;
+
 #import <Foundation/Foundation.h>
 #import <UserNotifications/UserNotifications.h>
 #import <firebase_core/FLTFirebasePlugin.h>
diff --git 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(<FirebaseAuth/FirebaseAuth.h>)
+@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
@@ -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 <Firebase/Firebase.h>
+@import FirebasePerformance;
 #import <Flutter/Flutter.h>
 #import <TargetConditionals.h>
 #import <firebase_core/FLTFirebasePlugin.h>
diff --git 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 <Firebase/Firebase.h>
-
 #import <firebase_core/FLTFirebasePluginRegistry.h>
 
 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
@@ -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 <Firebase/Firebase.h>
+@import FirebaseRemoteConfig;
 #import <firebase_core/FLTFirebasePluginRegistry.h>
 
 #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
@@ -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 <Firebase/Firebase.h>
+@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
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 #import <TargetConditionals.h>
 
-#import <Firebase/Firebase.h>
+@import FirebaseStorage;
 #import <firebase_core/FLTFirebasePluginRegistry.h>
 #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
@@ -10,7 +10,7 @@
 #import <Flutter/Flutter.h>
 #endif
 
-#import <Firebase/Firebase.h>
+@import FirebaseStorage;
 
 #import <Foundation/Foundation.h>
 
