Import CoreExtension as a module

paulb777 · paulb777 · commit 07512256fa2d · 2024-10-24T14:49:41.000-07:00
diff --git a/Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionArbiter.m b/Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionArbiter.m
@@ -20,7 +20,7 @@
 #import "FBLPromises.h"
 #endif
 
-#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
+@import FirebaseCoreExtension;
 
 #import "Crashlytics/Crashlytics/FIRCLSUserDefaults/FIRCLSUserDefaults.h"
 
diff --git a/Crashlytics/Crashlytics/FIRCrashlytics.m b/Crashlytics/Crashlytics/FIRCrashlytics.m
@@ -52,7 +52,8 @@
 #import "Crashlytics/Crashlytics/Private/FIRCLSOnDemandModel_Private.h"
 #import "Crashlytics/Crashlytics/Private/FIRExceptionModel_Private.h"
 
-#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
+@import FirebaseCoreExtension;
+
 #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h"
 #import "Interop/Analytics/Public/FIRAnalyticsInterop.h"
 
diff --git a/Crashlytics/Crashlytics/Helpers/FIRCLSLogger.m b/Crashlytics/Crashlytics/Helpers/FIRCLSLogger.m
@@ -14,7 +14,7 @@
 
 #import "Crashlytics/Crashlytics/Helpers/FIRCLSLogger.h"
 
-#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
+@import FirebaseCoreExtension;
 
 FIRLoggerService kFIRLoggerCrashlytics = @"[FirebaseCrashlytics]";
 
diff --git a/Crashlytics/Shared/FIRCLSConstants.m b/Crashlytics/Shared/FIRCLSConstants.m
@@ -13,7 +13,8 @@
 // limitations under the License.
 
 #import "Crashlytics/Shared/FIRCLSConstants.h"
-#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
+
+@import FirebaseCoreExtension;
 
 #define STR_HELPER(x) #x
 #define STR(x) STR_HELPER(x)
diff --git a/Crashlytics/UnitTests/FIRCLSConstantsTest.m b/Crashlytics/UnitTests/FIRCLSConstantsTest.m
@@ -15,7 +15,8 @@
 #import <XCTest/XCTest.h>
 
 #import "Crashlytics/Shared/FIRCLSConstants.h"
-#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
+
+@import FirebaseCoreExtension;
 
 #define STR_HELPER(x) #x
 #define STR(x) STR_HELPER(x)
diff --git a/Crashlytics/UnitTests/FIRCLSMetricKitManagerTests.m b/Crashlytics/UnitTests/FIRCLSMetricKitManagerTests.m
@@ -16,7 +16,7 @@
 #import <XCTest/XCTest.h>
 
 #import "Crashlytics/Crashlytics/Controllers/FIRCLSMetricKitManager.h"
-#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
+@import FirebaseCoreExtension;
 
 #if CLS_METRICKIT_SUPPORTED
 
diff --git a/Crashlytics/UnitTests/FIRCLSReportManagerTests.m b/Crashlytics/UnitTests/FIRCLSReportManagerTests.m
@@ -15,7 +15,7 @@
 #import <Foundation/Foundation.h>
 #import <XCTest/XCTest.h>
 
-#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
+@import FirebaseCoreExtension;
 
 #if __has_include(<FBLPromises/FBLPromises.h>)
 #import <FBLPromises/FBLPromises.h>
diff --git a/Crashlytics/UnitTests/Mocks/FIRAppFake.h b/Crashlytics/UnitTests/Mocks/FIRAppFake.h
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
+@import FirebaseCoreExtension;
 
 @interface FIRAppFake : NSObject
 
diff --git a/FirebaseCrashlytics.podspec b/FirebaseCrashlytics.podspec
@@ -31,7 +31,6 @@ Pod::Spec.new do |s|
     'Crashlytics/Protogen/**/*.{c,h,m,mm}',
     'Crashlytics/Shared/**/*.{c,h,m,mm}',
     'Crashlytics/third_party/**/*.{c,h,m,mm}',
-    'FirebaseCore/Extension/*.h',
     'FirebaseInstallations/Source/Library/Private/*.h',
     'Interop/Analytics/Public/*.h',
   ]
@@ -60,6 +59,7 @@ Pod::Spec.new do |s|
   PREPARE_COMMAND_END
 
   s.dependency 'FirebaseCore', '11.5'
+  s.dependency 'FirebaseCoreExtension', '11.5'
   s.dependency 'FirebaseInstallations', '~> 11.0'
   s.dependency 'FirebaseSessions', '~> 11.0'
   s.dependency 'FirebaseRemoteConfigInterop', '~> 11.0'
diff --git a/FirebaseInstallations.podspec b/FirebaseInstallations.podspec
@@ -35,7 +35,6 @@ Pod::Spec.new do |s|
   base_dir = "FirebaseInstallations/Source/"
   s.source_files = [
     base_dir + 'Library/**/*.[mh]',
-    'FirebaseCore/Extension/*.h',
   ]
   s.public_header_files = [
     base_dir + 'Library/Public/FirebaseInstallations/*.h',
@@ -46,6 +45,7 @@ Pod::Spec.new do |s|
 
   s.framework = 'Security'
   s.dependency 'FirebaseCore', '11.5'
+  s.dependency 'FirebaseCoreExtension', '11.5'
   s.dependency 'PromisesObjC', '~> 2.4'
   s.dependency 'GoogleUtilities/Environment', '~> 8.0'
   s.dependency 'GoogleUtilities/UserDefaults', '~> 8.0'
diff --git a/FirebaseInstallations/Source/Library/FIRInstallations.m b/FirebaseInstallations/Source/Library/FIRInstallations.m
@@ -22,7 +22,7 @@
 #import "FBLPromises.h"
 #endif
 
-#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
+@import FirebaseCoreExtension;
 
 #import "FirebaseInstallations/Source/Library/FIRInstallationsAuthTokenResultInternal.h"
 
diff --git a/FirebaseInstallations/Source/Library/FIRInstallationsLogger.h b/FirebaseInstallations/Source/Library/FIRInstallationsLogger.h
@@ -16,9 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
-
-extern FIRLoggerService kFIRLoggerInstallations;
+extern NSString *kFIRLoggerInstallations;
 
 // FIRInstallationsAPIService.m
 extern NSString *const kFIRInstallationsMessageCodeSendAPIRequest;
diff --git a/FirebaseInstallations/Source/Library/FIRInstallationsLogger.m b/FirebaseInstallations/Source/Library/FIRInstallationsLogger.m
@@ -16,7 +16,7 @@
 
 #import "FirebaseInstallations/Source/Library/FIRInstallationsLogger.h"
 
-FIRLoggerService kFIRLoggerInstallations = @"[FirebaseInstallations]";
+NSString *kFIRLoggerInstallations = @"[FirebaseInstallations]";
 
 // FIRInstallationsAPIService.m
 NSString *const kFIRInstallationsMessageCodeSendAPIRequest = @"I-FIS001001";
diff --git a/FirebaseInstallations/Source/Library/InstallationsAPI/FIRInstallationsAPIService.m b/FirebaseInstallations/Source/Library/InstallationsAPI/FIRInstallationsAPIService.m
@@ -22,7 +22,8 @@
 #import "FBLPromises.h"
 #endif
 
-#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
+@import FirebaseCoreExtension;
+
 #import "FirebaseInstallations/Source/Library/Errors/FIRInstallationsErrorUtil.h"
 #import "FirebaseInstallations/Source/Library/Errors/FIRInstallationsHTTPError.h"
 #import "FirebaseInstallations/Source/Library/FIRInstallationsLogger.h"
diff --git a/FirebaseInstallations/Source/Library/InstallationsIDController/FIRInstallationsIDController.m b/FirebaseInstallations/Source/Library/InstallationsIDController/FIRInstallationsIDController.m
@@ -23,7 +23,6 @@
 #endif
 
 #import <GoogleUtilities/GULKeychainStorage.h>
-#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
 
 #import "FirebaseInstallations/Source/Library/Errors/FIRInstallationsErrorUtil.h"
 #import "FirebaseInstallations/Source/Library/FIRInstallationsItem.h"
@@ -38,6 +37,8 @@
 #import "FirebaseInstallations/Source/Library/Errors/FIRInstallationsHTTPError.h"
 #import "FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStoredAuthToken.h"
 
+@import FirebaseCoreExtension;
+
 const NSNotificationName FIRInstallationIDDidChangeNotification =
     @"FIRInstallationIDDidChangeNotification";
 NSString *const kFIRInstallationIDDidChangeNotificationAppNameKey =
diff --git a/FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStoredAuthToken.m b/FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStoredAuthToken.m
@@ -18,6 +18,8 @@
 
 #import "FirebaseInstallations/Source/Library/FIRInstallationsLogger.h"
 
+@import FirebaseCoreExtension;
+
 NSString *const kFIRInstallationsStoredAuthTokenStatusKey = @"status";
 NSString *const kFIRInstallationsStoredAuthTokenTokenKey = @"token";
 NSString *const kFIRInstallationsStoredAuthTokenExpirationDateKey = @"expirationDate";
diff --git a/FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStoredItem.m b/FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStoredItem.m
@@ -16,6 +16,8 @@
 
 #import "FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStoredItem.h"
 
+@import FirebaseCoreExtension;
+
 #import "FirebaseInstallations/Source/Library/FIRInstallationsLogger.h"
 #import "FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStoredAuthToken.h"
 
diff --git a/FirebaseInstallations/Source/Tests/Integration/FIRInstallationsIntegrationTests.m b/FirebaseInstallations/Source/Tests/Integration/FIRInstallationsIntegrationTests.m
@@ -27,8 +27,7 @@
 #import <XCTest/XCTest.h>
 
 @import FirebaseCoreInternal;
-
-#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
+@import FirebaseCoreExtension;
 
 #import "FBLPromise+Testing.h"
 #import "FirebaseInstallations/Source/Tests/Utils/FIRInstallations+Tests.h"
diff --git a/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsAPIServiceTests.m b/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsAPIServiceTests.m
@@ -19,6 +19,7 @@
 #import <OCMock/OCMock.h>
 
 @import FirebaseCoreInternal;
+@import FirebaseCoreExtension;
 
 #import "FBLPromise+Testing.h"
 #import "FirebaseInstallations/Source/Tests/Utils/FIRInstallationsItem+Tests.h"
@@ -28,8 +29,6 @@
 #import "FirebaseInstallations/Source/Library/InstallationsAPI/FIRInstallationsAPIService.h"
 #import "FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStoredAuthToken.h"
 
-#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
-
 typedef FBLPromise * (^FIRInstallationsAPIServiceTask)(void);
 
 #pragma mark - Fakes
diff --git a/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsIDControllerTests.m b/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsIDControllerTests.m
@@ -18,7 +18,7 @@
 
 #import <OCMock/OCMock.h>
 
-#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
+@import FirebaseCoreExtension;
 
 #import "FBLPromise+Testing.h"
 #import "FBLPromise+Then.h"
diff --git a/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsTests.m b/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsTests.m
@@ -19,7 +19,7 @@
 #import <OCMock/OCMock.h>
 
 #import "FBLPromise+Testing.h"
-#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
+@import FirebaseCoreExtension;
 #import "FirebaseInstallations/Source/Tests/Utils/FIRInstallations+Tests.h"
 #import "FirebaseInstallations/Source/Tests/Utils/FIRInstallationsErrorUtil+Tests.h"
 #import "FirebaseInstallations/Source/Tests/Utils/FIRInstallationsItem+Tests.h"
diff --git a/FirebaseInstallations/Source/Tests/Utils/FIRInstallationsItem+Tests.m b/FirebaseInstallations/Source/Tests/Utils/FIRInstallationsItem+Tests.m
@@ -16,7 +16,7 @@
 
 #import "FirebaseInstallations/Source/Tests/Utils/FIRInstallationsItem+Tests.h"
 
-#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
+@import FirebaseCoreExtension;
 
 #import "FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStoredAuthToken.h"
 
