checkpoint

Author: paulb777

Crashlytics/Crashlytics/FIRCrashlytics.m

@@ -52,7 +52,11 @@
 #import "Crashlytics/Crashlytics/Private/FIRCLSOnDemandModel_Private.h"
 #import "Crashlytics/Crashlytics/Private/FIRExceptionModel_Private.h"
 
+@import FirebaseCoreInternal;
 @import FirebaseCoreExtension;
+#if SWIFT_PACKAGE
+@import FirebaseCoreInternalObjC;
+#endif
 
 #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h"
 #import "Interop/Analytics/Public/FIRAnalyticsInterop.h"

Crashlytics/Crashlytics/Helpers/FIRCLSLogger.m

@@ -14,7 +14,11 @@
 
 #import "Crashlytics/Crashlytics/Helpers/FIRCLSLogger.h"
 
+@import FirebaseCoreInternal;
 @import FirebaseCoreExtension;
+#if SWIFT_PACKAGE
+@import FirebaseCoreInternalObjC;
+#endif
 
 FIRLoggerService kFIRLoggerCrashlytics = @"[FirebaseCrashlytics]";
 

Crashlytics/UnitTests/FIRCLSMetricKitManagerTests.m

@@ -16,7 +16,7 @@
 #import <XCTest/XCTest.h>
 
 #import "Crashlytics/Crashlytics/Controllers/FIRCLSMetricKitManager.h"
-@import FirebaseCoreExtension;
+@import FirebaseCoreInternal;
 
 #if CLS_METRICKIT_SUPPORTED
 

Crashlytics/UnitTests/FIRCLSOnDemandModelTests.m

@@ -33,6 +33,8 @@
 #import "Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionToken.h"
 #import "Crashlytics/Crashlytics/Settings/Models/FIRCLSApplicationIdentifierModel.h"
 
+@import FirebaseCoreInternal;
+
 #define TEST_GOOGLE_APP_ID (@"1:632950151350:ios:d5b0d08d4f00f4b1")
 
 @interface FIRCLSOnDemandModelTests : XCTestCase

Crashlytics/UnitTests/FIRCLSReportManagerTests.m

@@ -15,7 +15,7 @@
 #import <Foundation/Foundation.h>
 #import <XCTest/XCTest.h>
 
-@import FirebaseCoreExtension;
+@import FirebaseCoreInternal;
 
 #if __has_include(<FBLPromises/FBLPromises.h>)
 #import <FBLPromises/FBLPromises.h>

FirebaseABTesting/Sources/ABTConditionalUserPropertyController.m

@@ -16,9 +16,13 @@
 
 #import "FirebaseABTesting/Sources/ABTConstants.h"
 #import "FirebaseABTesting/Sources/Public/FirebaseABTesting/FIRLifecycleEvents.h"
-#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
 #import "Interop/Analytics/Public/FIRAnalyticsInterop.h"
 
+@import FirebaseCoreInternal;
+#if SWIFT_PACKAGE
+@import FirebaseCoreInternalObjC;
+#endif
+
 @implementation ABTConditionalUserPropertyController {
   dispatch_queue_t _analyticOperationQueue;
   id<FIRAnalyticsInterop> _Nullable _analytics;

FirebaseABTesting/Sources/ABTConstants.h

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 #import <Foundation/Foundation.h>
-#import "FirebaseCore/Extension/FIRLogger.h"
 
 #define ABT_MSEC_PER_SEC 1000ull
 
@@ -47,4 +46,4 @@ typedef NS_ENUM(NSUInteger, ABTInternalErrorCode) {
 
 #pragma mark - Logger Service String
 
-extern FIRLoggerService kFIRLoggerABTesting;
+extern NSString *kFIRLoggerABTesting;

FirebaseABTesting/Sources/FIRExperimentController.m

@@ -18,12 +18,18 @@
 #import "FirebaseABTesting/Sources/ABTConstants.h"
 #import "FirebaseABTesting/Sources/Private/ABTExperimentPayload.h"
 #import "FirebaseABTesting/Sources/Public/FirebaseABTesting/FIRLifecycleEvents.h"
-#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
 
 #import "Interop/Analytics/Public/FIRAnalyticsInterop.h"
 
+@import FirebaseCore;
+@import FirebaseCoreExtension;
+@import FirebaseCoreInternal;
+#if SWIFT_PACKAGE
+@import FirebaseCoreInternalObjC;
+#endif
+
 /// Logger Service String.
-FIRLoggerService kFIRLoggerABTesting = @"[FirebaseABTesting]";
+NSString *kFIRLoggerABTesting = @"[FirebaseABTesting]";
 
 /// Default experiment overflow policy.
 const ABTExperimentPayloadExperimentOverflowPolicy FIRDefaultExperimentOverflowPolicy =

FirebaseABTesting/Tests/Unit/ABTConditionalUserPropertyControllerTest.m

@@ -23,7 +23,9 @@
 #import "FirebaseABTesting/Tests/Unit/ABTFakeFIRAConditionalUserPropertyController.h"
 #import "FirebaseABTesting/Tests/Unit/ABTTestUniversalConstants.h"
 #import "FirebaseABTesting/Tests/Unit/Utilities/ABTTestUtilities.h"
-#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
+
+@import FirebaseCore;
+@import FirebaseCoreExtension;
 
 @interface ABTConditionalUserPropertyController (ExposedForTest)
 - (NSInteger)maxNumberOfExperimentsOfOrigin:(NSString *)origin;

FirebaseABTesting/Tests/Unit/FIRExperimentControllerTest.m

@@ -23,7 +23,6 @@
 #import "FirebaseABTesting/Tests/Unit/ABTFakeFIRAConditionalUserPropertyController.h"
 #import "FirebaseABTesting/Tests/Unit/ABTTestUniversalConstants.h"
 #import "FirebaseABTesting/Tests/Unit/Utilities/ABTTestUtilities.h"
-#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
 #import "Interop/Analytics/Public/FIRAnalyticsInterop.h"
 
 extern ABTExperimentPayload *ABTDeserializeExperimentPayload(NSData *payload);