diff --git a/.github/workflows/firestore.yml b/.github/workflows/firestore.yml index 8c4e1b1bd5..9cacb286e2 100644 --- a/.github/workflows/firestore.yml +++ b/.github/workflows/firestore.yml @@ -24,7 +24,7 @@ on: - 'Interop/Auth/Public/*.h' # FirebaseCore header change - - 'FirebaseCore/Sources/Private' + - 'FirebaseCore/Internal' - 'FirebaseCore/Sources/Public' # Podspec diff --git a/Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionArbiter.m b/Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionArbiter.m index 3dcce252e4..8fd1149ee6 100644 --- a/Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionArbiter.m +++ b/Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionArbiter.m @@ -20,7 +20,7 @@ #import "FBLPromises.h" #endif -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "Crashlytics/Crashlytics/FIRCLSUserDefaults/FIRCLSUserDefaults.h" diff --git a/Crashlytics/Crashlytics/FIRCrashlytics.m b/Crashlytics/Crashlytics/FIRCrashlytics.m index 6839f3b3e2..50adf87ab3 100644 --- a/Crashlytics/Crashlytics/FIRCrashlytics.m +++ b/Crashlytics/Crashlytics/FIRCrashlytics.m @@ -46,7 +46,7 @@ #import "Crashlytics/Crashlytics/Controllers/FIRCLSReportManager.h" #import "Crashlytics/Crashlytics/Controllers/FIRCLSReportUploader.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #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 index 5600895db6..49c5365cba 100644 --- a/Crashlytics/Crashlytics/Helpers/FIRCLSLogger.m +++ b/Crashlytics/Crashlytics/Helpers/FIRCLSLogger.m @@ -14,7 +14,7 @@ #import "Crashlytics/Crashlytics/Helpers/FIRCLSLogger.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" FIRLoggerService kFIRLoggerCrashlytics = @"[Firebase/Crashlytics]"; diff --git a/Crashlytics/Shared/FIRCLSConstants.m b/Crashlytics/Shared/FIRCLSConstants.m index 538b205e07..05dc60a16c 100644 --- a/Crashlytics/Shared/FIRCLSConstants.m +++ b/Crashlytics/Shared/FIRCLSConstants.m @@ -13,7 +13,7 @@ // limitations under the License. #import "Crashlytics/Shared/FIRCLSConstants.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #define STR_HELPER(x) #x #define STR(x) STR_HELPER(x) diff --git a/Crashlytics/UnitTests/FIRCLSConstantsTest.m b/Crashlytics/UnitTests/FIRCLSConstantsTest.m index 75db438812..8a69165e16 100644 --- a/Crashlytics/UnitTests/FIRCLSConstantsTest.m +++ b/Crashlytics/UnitTests/FIRCLSConstantsTest.m @@ -15,7 +15,7 @@ #import #import "Crashlytics/Shared/FIRCLSConstants.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #define STR_HELPER(x) #x #define STR(x) STR_HELPER(x) diff --git a/Crashlytics/UnitTests/FIRCLSMetricKitManagerTests.m b/Crashlytics/UnitTests/FIRCLSMetricKitManagerTests.m index b605c6290b..7faa3389e2 100644 --- a/Crashlytics/UnitTests/FIRCLSMetricKitManagerTests.m +++ b/Crashlytics/UnitTests/FIRCLSMetricKitManagerTests.m @@ -16,7 +16,7 @@ #import #import "Crashlytics/Crashlytics/Controllers/FIRCLSMetricKitManager.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #if CLS_METRICKIT_SUPPORTED diff --git a/Crashlytics/UnitTests/FIRCLSReportManagerTests.m b/Crashlytics/UnitTests/FIRCLSReportManagerTests.m index 2f8360d63d..81ac0cdbb7 100644 --- a/Crashlytics/UnitTests/FIRCLSReportManagerTests.m +++ b/Crashlytics/UnitTests/FIRCLSReportManagerTests.m @@ -15,7 +15,7 @@ #import #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #if __has_include() #import diff --git a/Crashlytics/UnitTests/Mocks/FIRAppFake.h b/Crashlytics/UnitTests/Mocks/FIRAppFake.h index b5b9e6baa1..f43605e8eb 100644 --- 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/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" @interface FIRAppFake : NSObject diff --git a/FirebaseABTesting.podspec b/FirebaseABTesting.podspec index 812099f590..fba80a5ab0 100644 --- a/FirebaseABTesting.podspec +++ b/FirebaseABTesting.podspec @@ -39,7 +39,7 @@ Firebase Cloud Messaging and Firebase Remote Config in your app. s.source_files = [ base_dir + '**/*.[mh]', 'Interop/Analytics/Public/*.h', - 'FirebaseCore/Sources/Private/*.h', + 'FirebaseCore/Internal/*.h', ] s.requires_arc = base_dir + '*.m' s.public_header_files = base_dir + 'Public/FirebaseABTesting/*.h' diff --git a/FirebaseABTesting/Sources/ABTConditionalUserPropertyController.m b/FirebaseABTesting/Sources/ABTConditionalUserPropertyController.m index 531e0284fd..e9729a5a54 100644 --- a/FirebaseABTesting/Sources/ABTConditionalUserPropertyController.m +++ b/FirebaseABTesting/Sources/ABTConditionalUserPropertyController.m @@ -16,7 +16,7 @@ #import "FirebaseABTesting/Sources/ABTConstants.h" #import "FirebaseABTesting/Sources/Public/FirebaseABTesting/FIRLifecycleEvents.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" @implementation ABTConditionalUserPropertyController { diff --git a/FirebaseABTesting/Sources/ABTConstants.h b/FirebaseABTesting/Sources/ABTConstants.h index 646228fc62..51636d30bd 100644 --- a/FirebaseABTesting/Sources/ABTConstants.h +++ b/FirebaseABTesting/Sources/ABTConstants.h @@ -13,7 +13,7 @@ // limitations under the License. #import -#import "FirebaseCore/Sources/Private/FIRLogger.h" +#import "FirebaseCore/Internal/FIRLogger.h" #define ABT_MSEC_PER_SEC 1000ull diff --git a/FirebaseABTesting/Sources/FIRExperimentController.m b/FirebaseABTesting/Sources/FIRExperimentController.m index 665e23a517..2fc46f1080 100644 --- a/FirebaseABTesting/Sources/FIRExperimentController.m +++ b/FirebaseABTesting/Sources/FIRExperimentController.m @@ -18,7 +18,7 @@ #import "FirebaseABTesting/Sources/ABTConstants.h" #import "FirebaseABTesting/Sources/Private/ABTExperimentPayload.h" #import "FirebaseABTesting/Sources/Public/FirebaseABTesting/FIRLifecycleEvents.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" diff --git a/FirebaseABTesting/Tests/Unit/ABTConditionalUserPropertyControllerTest.m b/FirebaseABTesting/Tests/Unit/ABTConditionalUserPropertyControllerTest.m index 3ae9cf9daf..f0cb531449 100644 --- a/FirebaseABTesting/Tests/Unit/ABTConditionalUserPropertyControllerTest.m +++ b/FirebaseABTesting/Tests/Unit/ABTConditionalUserPropertyControllerTest.m @@ -23,7 +23,7 @@ #import "FirebaseABTesting/Tests/Unit/ABTFakeFIRAConditionalUserPropertyController.h" #import "FirebaseABTesting/Tests/Unit/ABTTestUniversalConstants.h" #import "FirebaseABTesting/Tests/Unit/Utilities/ABTTestUtilities.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" @interface ABTConditionalUserPropertyController (ExposedForTest) - (NSInteger)maxNumberOfExperimentsOfOrigin:(NSString *)origin; diff --git a/FirebaseABTesting/Tests/Unit/FIRExperimentControllerTest.m b/FirebaseABTesting/Tests/Unit/FIRExperimentControllerTest.m index fe5f891b66..591e40c3d8 100644 --- a/FirebaseABTesting/Tests/Unit/FIRExperimentControllerTest.m +++ b/FirebaseABTesting/Tests/Unit/FIRExperimentControllerTest.m @@ -23,7 +23,7 @@ #import "FirebaseABTesting/Tests/Unit/ABTFakeFIRAConditionalUserPropertyController.h" #import "FirebaseABTesting/Tests/Unit/ABTTestUniversalConstants.h" #import "FirebaseABTesting/Tests/Unit/Utilities/ABTTestUtilities.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" extern ABTExperimentPayload *ABTDeserializeExperimentPayload(NSData *payload); diff --git a/FirebaseAppCheck.podspec b/FirebaseAppCheck.podspec index 8be212a678..2c3f53fbe2 100644 --- a/FirebaseAppCheck.podspec +++ b/FirebaseAppCheck.podspec @@ -34,7 +34,7 @@ Pod::Spec.new do |s| s.source_files = [ base_dir + 'Sources/**/*.[mh]', - 'FirebaseCore/Sources/Private/*.h', + 'FirebaseCore/Internal/*.h', ] s.public_header_files = base_dir + 'Sources/Public/FirebaseAppCheck/*.h' diff --git a/FirebaseAppCheck/Sources/AppAttestProvider/FIRAppAttestProvider.m b/FirebaseAppCheck/Sources/AppAttestProvider/FIRAppAttestProvider.m index 53b30fa93b..7991317566 100644 --- a/FirebaseAppCheck/Sources/AppAttestProvider/FIRAppAttestProvider.m +++ b/FirebaseAppCheck/Sources/AppAttestProvider/FIRAppAttestProvider.m @@ -40,7 +40,7 @@ #import "FirebaseAppCheck/Sources/Core/Errors/FIRAppCheckErrorUtil.h" #import "FirebaseAppCheck/Sources/Core/Errors/FIRAppCheckHTTPError.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseAppCheck/Sources/Core/APIService/FIRAppCheckAPIService.m b/FirebaseAppCheck/Sources/Core/APIService/FIRAppCheckAPIService.m index 77568bd0c1..0569ac947c 100644 --- a/FirebaseAppCheck/Sources/Core/APIService/FIRAppCheckAPIService.m +++ b/FirebaseAppCheck/Sources/Core/APIService/FIRAppCheckAPIService.m @@ -25,7 +25,7 @@ #import "FirebaseAppCheck/Sources/Core/Errors/FIRAppCheckErrorUtil.h" #import "FirebaseAppCheck/Sources/Core/FIRAppCheckLogger.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import #import diff --git a/FirebaseAppCheck/Sources/Core/FIRAppCheck.m b/FirebaseAppCheck/Sources/Core/FIRAppCheck.m index 4c9b317496..52dfdcfa72 100644 --- a/FirebaseAppCheck/Sources/Core/FIRAppCheck.m +++ b/FirebaseAppCheck/Sources/Core/FIRAppCheck.m @@ -38,7 +38,7 @@ #import "FirebaseAppCheck/Sources/Interop/FIRAppCheckInterop.h" #import "FirebaseAppCheck/Sources/Interop/FIRAppCheckTokenResultInterop.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseAppCheck/Sources/Core/FIRAppCheckLogger.h b/FirebaseAppCheck/Sources/Core/FIRAppCheckLogger.h index 7038388957..25c754ea6d 100644 --- a/FirebaseAppCheck/Sources/Core/FIRAppCheckLogger.h +++ b/FirebaseAppCheck/Sources/Core/FIRAppCheckLogger.h @@ -16,7 +16,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" extern FIRLoggerService kFIRLoggerAppCheck; diff --git a/FirebaseAppCheck/Sources/Core/FIRAppCheckLogger.m b/FirebaseAppCheck/Sources/Core/FIRAppCheckLogger.m index a2c411bad9..8375b15876 100644 --- a/FirebaseAppCheck/Sources/Core/FIRAppCheckLogger.m +++ b/FirebaseAppCheck/Sources/Core/FIRAppCheckLogger.m @@ -16,7 +16,7 @@ #import "FirebaseAppCheck/Sources/Core/FIRAppCheckLogger.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.m b/FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.m index 56737857f1..9a3b941994 100644 --- a/FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.m +++ b/FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.m @@ -16,7 +16,7 @@ #import "FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseAppCheck/Sources/Core/FIRAppCheckValidator.m b/FirebaseAppCheck/Sources/Core/FIRAppCheckValidator.m index 9013f259ea..26cce5602d 100644 --- a/FirebaseAppCheck/Sources/Core/FIRAppCheckValidator.m +++ b/FirebaseAppCheck/Sources/Core/FIRAppCheckValidator.m @@ -16,7 +16,7 @@ #import "FirebaseAppCheck/Sources/Core/FIRAppCheckValidator.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" @implementation FIRAppCheckValidator diff --git a/FirebaseAppCheck/Sources/DebugProvider/API/FIRAppCheckDebugProviderAPIService.m b/FirebaseAppCheck/Sources/DebugProvider/API/FIRAppCheckDebugProviderAPIService.m index 3841b4324d..ed624ef2e7 100644 --- a/FirebaseAppCheck/Sources/DebugProvider/API/FIRAppCheckDebugProviderAPIService.m +++ b/FirebaseAppCheck/Sources/DebugProvider/API/FIRAppCheckDebugProviderAPIService.m @@ -31,7 +31,7 @@ #import "FirebaseAppCheck/Sources/Core/Errors/FIRAppCheckErrorUtil.h" #import "FirebaseAppCheck/Sources/Core/FIRAppCheckLogger.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseAppCheck/Sources/DebugProvider/FIRAppCheckDebugProvider.m b/FirebaseAppCheck/Sources/DebugProvider/FIRAppCheckDebugProvider.m index 87eb123916..683212acba 100644 --- a/FirebaseAppCheck/Sources/DebugProvider/FIRAppCheckDebugProvider.m +++ b/FirebaseAppCheck/Sources/DebugProvider/FIRAppCheckDebugProvider.m @@ -28,7 +28,7 @@ #import "FirebaseAppCheck/Sources/DebugProvider/API/FIRAppCheckDebugProviderAPIService.h" #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckToken.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseAppCheck/Sources/DeviceCheckProvider/API/FIRDeviceCheckAPIService.m b/FirebaseAppCheck/Sources/DeviceCheckProvider/API/FIRDeviceCheckAPIService.m index 06512cac8e..37da82fbda 100644 --- a/FirebaseAppCheck/Sources/DeviceCheckProvider/API/FIRDeviceCheckAPIService.m +++ b/FirebaseAppCheck/Sources/DeviceCheckProvider/API/FIRDeviceCheckAPIService.m @@ -30,7 +30,7 @@ #import "FirebaseAppCheck/Sources/Core/Errors/FIRAppCheckErrorUtil.h" #import "FirebaseAppCheck/Sources/Core/FIRAppCheckLogger.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseAppCheck/Sources/DeviceCheckProvider/FIRDeviceCheckProvider.m b/FirebaseAppCheck/Sources/DeviceCheckProvider/FIRDeviceCheckProvider.m index adcf84e295..23118c0e32 100644 --- a/FirebaseAppCheck/Sources/DeviceCheckProvider/FIRDeviceCheckProvider.m +++ b/FirebaseAppCheck/Sources/DeviceCheckProvider/FIRDeviceCheckProvider.m @@ -36,7 +36,7 @@ #import "FirebaseAppCheck/Sources/DeviceCheckProvider/DCDevice+FIRDeviceCheckTokenGenerator.h" #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckToken.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseAppCheck/Tests/Unit/AppAttestProvider/FIRAppAttestProviderTests.m b/FirebaseAppCheck/Tests/Unit/AppAttestProvider/FIRAppAttestProviderTests.m index 9e5653a956..1b16536ac5 100644 --- a/FirebaseAppCheck/Tests/Unit/AppAttestProvider/FIRAppAttestProviderTests.m +++ b/FirebaseAppCheck/Tests/Unit/AppAttestProvider/FIRAppAttestProviderTests.m @@ -33,7 +33,7 @@ #import "FirebaseAppCheck/Sources/Core/Errors/FIRAppCheckErrorUtil.h" #import "FirebaseAppCheck/Sources/Core/Errors/FIRAppCheckHTTPError.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "SharedTestUtilities/AppCheckBackoffWrapperFake/FIRAppCheckBackoffWrapperFake.h" diff --git a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckAPIServiceTests.m b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckAPIServiceTests.m index 1fc2b6e9c1..30bcf72075 100644 --- a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckAPIServiceTests.m +++ b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckAPIServiceTests.m @@ -31,7 +31,7 @@ #import "SharedTestUtilities/Date/FIRDateTestUtils.h" #import "SharedTestUtilities/URLSession/FIRURLSessionOCMockStub.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" @interface FIRAppCheckAPIServiceTests : XCTestCase diff --git a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckIntegrationTests.m b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckIntegrationTests.m index 366d0d362f..4335bc58a8 100644 --- a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckIntegrationTests.m +++ b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckIntegrationTests.m @@ -28,7 +28,7 @@ #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRDeviceCheckProvider.h" #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRDeviceCheckProviderFactory.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckSettingsTests.m b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckSettingsTests.m index 8fc1bc4c4e..4c34f885eb 100644 --- a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckSettingsTests.m +++ b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckSettingsTests.m @@ -20,7 +20,7 @@ #import "FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" @interface FIRAppCheckSettingsTests : XCTestCase diff --git a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckTests.m b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckTests.m index 42c946dc1b..3b91a1a207 100644 --- a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckTests.m +++ b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckTests.m @@ -36,7 +36,7 @@ #import "FirebaseAppCheck/Sources/Core/TokenRefresh/FIRAppCheckTokenRefreshResult.h" #import "FirebaseAppCheck/Sources/Core/TokenRefresh/FIRAppCheckTokenRefresher.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" // The FAC token value returned when an error occurs. static NSString *const kDummyToken = @"eyJlcnJvciI6IlVOS05PV05fRVJST1IifQ=="; diff --git a/FirebaseAppCheck/Tests/Unit/DebugProvider/FIRAppCheckDebugProviderFactoryTests.m b/FirebaseAppCheck/Tests/Unit/DebugProvider/FIRAppCheckDebugProviderFactoryTests.m index 82211c876f..9c29057069 100644 --- a/FirebaseAppCheck/Tests/Unit/DebugProvider/FIRAppCheckDebugProviderFactoryTests.m +++ b/FirebaseAppCheck/Tests/Unit/DebugProvider/FIRAppCheckDebugProviderFactoryTests.m @@ -19,7 +19,7 @@ #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckDebugProvider.h" #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckDebugProviderFactory.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" @interface FIRAppCheckDebugProviderFactoryTests : XCTestCase @end diff --git a/FirebaseAppCheck/Tests/Unit/DebugProvider/FIRAppCheckDebugProviderTests.m b/FirebaseAppCheck/Tests/Unit/DebugProvider/FIRAppCheckDebugProviderTests.m index a7f185178d..5dd7ecb3c3 100644 --- a/FirebaseAppCheck/Tests/Unit/DebugProvider/FIRAppCheckDebugProviderTests.m +++ b/FirebaseAppCheck/Tests/Unit/DebugProvider/FIRAppCheckDebugProviderTests.m @@ -23,7 +23,7 @@ #import "FirebaseAppCheck/Sources/DebugProvider/API/FIRAppCheckDebugProviderAPIService.h" #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckDebugProvider.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" static NSString *const kDebugTokenEnvKey = @"FIRAAppCheckDebugToken"; static NSString *const kDebugTokenUserDefaultsKey = @"FIRAAppCheckDebugToken"; diff --git a/FirebaseAppCheck/Tests/Unit/DeviceCheckProvider/FIRDeviceCheckAPIServiceTests.m b/FirebaseAppCheck/Tests/Unit/DeviceCheckProvider/FIRDeviceCheckAPIServiceTests.m index 28956cdf6a..38a39da0e4 100644 --- a/FirebaseAppCheck/Tests/Unit/DeviceCheckProvider/FIRDeviceCheckAPIServiceTests.m +++ b/FirebaseAppCheck/Tests/Unit/DeviceCheckProvider/FIRDeviceCheckAPIServiceTests.m @@ -30,7 +30,7 @@ #import "FirebaseAppCheck/Tests/Unit/Utils/FIRFixtureLoader.h" #import "SharedTestUtilities/URLSession/FIRURLSessionOCMockStub.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" typedef BOOL (^FIRRequestValidationBlock)(NSURLRequest *request); diff --git a/FirebaseAppCheck/Tests/Unit/DeviceCheckProvider/FIRDeviceCheckProviderTests.m b/FirebaseAppCheck/Tests/Unit/DeviceCheckProvider/FIRDeviceCheckProviderTests.m index 1c35f59b75..06118e9d10 100644 --- a/FirebaseAppCheck/Tests/Unit/DeviceCheckProvider/FIRDeviceCheckProviderTests.m +++ b/FirebaseAppCheck/Tests/Unit/DeviceCheckProvider/FIRDeviceCheckProviderTests.m @@ -24,7 +24,7 @@ #import "FirebaseAppCheck/Sources/DeviceCheckProvider/FIRDeviceCheckTokenGenerator.h" #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRDeviceCheckProvider.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "SharedTestUtilities/AppCheckBackoffWrapperFake/FIRAppCheckBackoffWrapperFake.h" diff --git a/FirebaseAppDistribution.podspec b/FirebaseAppDistribution.podspec index 369789be8c..8e8fbd5b42 100644 --- a/FirebaseAppDistribution.podspec +++ b/FirebaseAppDistribution.podspec @@ -23,7 +23,7 @@ iOS SDK for App Distribution for Firebase. base_dir = "FirebaseAppDistribution/Sources/" s.source_files = [ base_dir + '**/*.{c,h,m,mm}', - 'FirebaseCore/Sources/Private/*.h', + 'FirebaseCore/Internal/*.h', 'FirebaseInstallations/Source/Library/Private/*.h', ] s.public_header_files = base_dir + 'Public/FirebaseAppDistribution/*.h' diff --git a/FirebaseAppDistribution/Sources/FIRAppDistribution.m b/FirebaseAppDistribution/Sources/FIRAppDistribution.m index a9070ca72e..da1ff18f0a 100644 --- a/FirebaseAppDistribution/Sources/FIRAppDistribution.m +++ b/FirebaseAppDistribution/Sources/FIRAppDistribution.m @@ -15,7 +15,7 @@ #import #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h" #import "FirebaseAppDistribution/Sources/FIRAppDistributionMachO.h" diff --git a/FirebaseAppDistribution/Sources/FIRAppDistributionUIService.m b/FirebaseAppDistribution/Sources/FIRAppDistributionUIService.m index 4fabe3d15d..9041fc1ba9 100644 --- a/FirebaseAppDistribution/Sources/FIRAppDistributionUIService.m +++ b/FirebaseAppDistribution/Sources/FIRAppDistributionUIService.m @@ -15,7 +15,7 @@ #import "FirebaseAppDistribution/Sources/FIRAppDistributionUIService.h" #import "FirebaseAppDistribution/Sources/FIRFADLogger.h" #import "FirebaseAppDistribution/Sources/Public/FirebaseAppDistribution/FIRAppDistribution.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import #import diff --git a/FirebaseAppDistribution/Sources/FIRFADApiService.m b/FirebaseAppDistribution/Sources/FIRFADApiService.m index 3c5c0460dd..34b70206e7 100644 --- a/FirebaseAppDistribution/Sources/FIRFADApiService.m +++ b/FirebaseAppDistribution/Sources/FIRFADApiService.m @@ -14,7 +14,7 @@ #import "FirebaseAppDistribution/Sources/FIRFADApiService.h" #import #import "FirebaseAppDistribution/Sources/FIRFADLogger.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h" NSString *const kFIRFADApiErrorDomain = @"com.firebase.appdistribution.api"; diff --git a/FirebaseAppDistribution/Sources/FIRFADLogger.m b/FirebaseAppDistribution/Sources/FIRFADLogger.m index 4470a1249f..565c0fae90 100644 --- a/FirebaseAppDistribution/Sources/FIRFADLogger.m +++ b/FirebaseAppDistribution/Sources/FIRFADLogger.m @@ -13,7 +13,7 @@ // limitations under the License. #import "FirebaseAppDistribution/Sources/FIRFADLogger.h" -#import "FirebaseCore/Sources/Private/FIRLogger.h" +#import "FirebaseCore/Internal/FIRLogger.h" FIRLoggerService kFIRLoggerAppDistribution = @"[Firebase/AppDistribution]"; diff --git a/FirebaseAppDistribution/Tests/Unit/FIRAppDistributionMachOTests.m b/FirebaseAppDistribution/Tests/Unit/FIRAppDistributionMachOTests.m index db67279933..87bbbf9d57 100644 --- a/FirebaseAppDistribution/Tests/Unit/FIRAppDistributionMachOTests.m +++ b/FirebaseAppDistribution/Tests/Unit/FIRAppDistributionMachOTests.m @@ -16,7 +16,7 @@ #import #import "FirebaseAppDistribution/Sources/FIRAppDistributionMachO.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" @interface FIRAppDistributionMachOTests : XCTestCase @end diff --git a/FirebaseAppDistribution/Tests/Unit/FIRAppDistributionTests.m b/FirebaseAppDistribution/Tests/Unit/FIRAppDistributionTests.m index 41380cebf7..a4f793e524 100644 --- a/FirebaseAppDistribution/Tests/Unit/FIRAppDistributionTests.m +++ b/FirebaseAppDistribution/Tests/Unit/FIRAppDistributionTests.m @@ -22,7 +22,7 @@ #import "FirebaseAppDistribution/Sources/FIRAppDistributionUIService.h" #import "FirebaseAppDistribution/Sources/FIRFADApiService.h" #import "FirebaseAppDistribution/Sources/Private/FIRAppDistribution.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h" @interface FIRAppDistributionTests : XCTestCase diff --git a/FirebaseAppDistribution/Tests/Unit/FIRFADApiServiceTests.m b/FirebaseAppDistribution/Tests/Unit/FIRFADApiServiceTests.m index f157d58eea..83ebe92935 100644 --- a/FirebaseAppDistribution/Tests/Unit/FIRFADApiServiceTests.m +++ b/FirebaseAppDistribution/Tests/Unit/FIRFADApiServiceTests.m @@ -18,7 +18,7 @@ #import "FirebaseAppDistribution/Sources/FIRFADApiService.h" #import "FirebaseAppDistribution/Sources/FIRFADLogger.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h" NSString *const kFakeErrorDomain = @"test.failure.domain"; diff --git a/FirebaseAuth.podspec b/FirebaseAuth.podspec index decea0b7c5..6a7f67b821 100644 --- a/FirebaseAuth.podspec +++ b/FirebaseAuth.podspec @@ -35,7 +35,7 @@ supports email and password accounts, as well as several 3rd party authenticatio source = 'FirebaseAuth/Sources/' s.source_files = [ source + '**/*.[mh]', - 'FirebaseCore/Sources/Private/*.h', + 'FirebaseCore/Internal/*.h', 'Interop/Auth/Public/*.h', ] s.public_header_files = source + 'Public/FirebaseAuth/*.h' diff --git a/FirebaseAuth/Sources/Auth/FIRAuth.m b/FirebaseAuth/Sources/Auth/FIRAuth.m index 9106cda900..cbbe208298 100644 --- a/FirebaseAuth/Sources/Auth/FIRAuth.m +++ b/FirebaseAuth/Sources/Auth/FIRAuth.m @@ -26,7 +26,7 @@ #import #import #import "FirebaseAuth/Sources/Public/FirebaseAuth/FirebaseAuth.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseAuth/Sources/Auth/FIRAuthDataResult_Internal.h" #import "FirebaseAuth/Sources/Auth/FIRAuthDispatcher.h" diff --git a/FirebaseAuth/Sources/Auth/FIRAuth_Internal.h b/FirebaseAuth/Sources/Auth/FIRAuth_Internal.h index a84e57ab12..5d3182bcad 100644 --- a/FirebaseAuth/Sources/Auth/FIRAuth_Internal.h +++ b/FirebaseAuth/Sources/Auth/FIRAuth_Internal.h @@ -16,7 +16,7 @@ #import #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuth.h" -#import "FirebaseCore/Sources/Private/FIRLogger.h" +#import "FirebaseCore/Internal/FIRLogger.h" #import "Interop/Auth/Public/FIRAuthInterop.h" @class FIRAuthRequestConfiguration; diff --git a/FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthProvider.m b/FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthProvider.m index 59c6a98908..d7d2a45ab3 100644 --- a/FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthProvider.m +++ b/FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthProvider.m @@ -18,7 +18,7 @@ #include #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRFacebookAuthProvider.h" #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIROAuthCredential.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h" #import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h" diff --git a/FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthProvider.m b/FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthProvider.m index 401a83d4d2..e6989e32df 100644 --- a/FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthProvider.m +++ b/FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthProvider.m @@ -20,7 +20,7 @@ #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuthSettings.h" #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRMultiFactorResolver.h" #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRPhoneAuthProvider.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h" #import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h" diff --git a/FirebaseAuth/Sources/Backend/FIRAuthBackend.m b/FirebaseAuth/Sources/Backend/FIRAuthBackend.m index a8c3397602..64acb237f0 100644 --- a/FirebaseAuth/Sources/Backend/FIRAuthBackend.m +++ b/FirebaseAuth/Sources/Backend/FIRAuthBackend.m @@ -62,7 +62,7 @@ #import "FirebaseAuth/Sources/Backend/RPC/FIRVerifyPhoneNumberRequest.h" #import "FirebaseAuth/Sources/Backend/RPC/FIRVerifyPhoneNumberResponse.h" #import "FirebaseAuth/Sources/Utilities/FIRAuthErrorUtils.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #if TARGET_OS_IOS #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRPhoneAuthProvider.h" diff --git a/FirebaseAuth/Sources/Storage/FIRAuthKeychainServices.m b/FirebaseAuth/Sources/Storage/FIRAuthKeychainServices.m index ec657dfc9b..e1daaf2c64 100644 --- a/FirebaseAuth/Sources/Storage/FIRAuthKeychainServices.m +++ b/FirebaseAuth/Sources/Storage/FIRAuthKeychainServices.m @@ -18,7 +18,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h" #import "FirebaseAuth/Sources/Storage/FIRAuthUserDefaults.h" diff --git a/FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.m b/FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.m index 0daac97502..b2dc416e89 100644 --- a/FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.m +++ b/FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.m @@ -18,7 +18,7 @@ #if !TARGET_OS_OSX && !TARGET_OS_WATCH #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h" #import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h" diff --git a/FirebaseAuth/Sources/SystemService/FIRAuthNotificationManager.m b/FirebaseAuth/Sources/SystemService/FIRAuthNotificationManager.m index 93bb17e6a1..4af3367849 100644 --- a/FirebaseAuth/Sources/SystemService/FIRAuthNotificationManager.m +++ b/FirebaseAuth/Sources/SystemService/FIRAuthNotificationManager.m @@ -17,7 +17,7 @@ #import #if !TARGET_OS_OSX && !TARGET_OS_WATCH -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h" #import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h" diff --git a/FirebaseAuth/Sources/SystemService/FIRSecureTokenService.m b/FirebaseAuth/Sources/SystemService/FIRSecureTokenService.m index cf306d9fe5..4d72b3e6dc 100644 --- a/FirebaseAuth/Sources/SystemService/FIRSecureTokenService.m +++ b/FirebaseAuth/Sources/SystemService/FIRSecureTokenService.m @@ -26,7 +26,7 @@ #import "FirebaseAuth/Sources/Backend/RPC/FIRSecureTokenRequest.h" #import "FirebaseAuth/Sources/Backend/RPC/FIRSecureTokenResponse.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseAuth/Sources/User/FIRUser.m b/FirebaseAuth/Sources/User/FIRUser.m index 5b3659aa48..5b76ad80df 100644 --- a/FirebaseAuth/Sources/User/FIRUser.m +++ b/FirebaseAuth/Sources/User/FIRUser.m @@ -17,7 +17,7 @@ #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuth.h" #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIREmailAuthProvider.h" #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRFederatedAuthProvider.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseAuth/Sources/Auth/FIRAuthDataResult_Internal.h" #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h" diff --git a/FirebaseAuth/Tests/Unit/FIRApp+FIRAuthUnitTests.h b/FirebaseAuth/Tests/Unit/FIRApp+FIRAuthUnitTests.h index a17208c5d0..f1a10fff87 100644 --- a/FirebaseAuth/Tests/Unit/FIRApp+FIRAuthUnitTests.h +++ b/FirebaseAuth/Tests/Unit/FIRApp+FIRAuthUnitTests.h @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" /** @category FIRApp (FIRAuthUnitTests) @brief Tests for @c FIRAuth. diff --git a/FirebaseAuth/Tests/Unit/FIRApp+FIRAuthUnitTests.m b/FirebaseAuth/Tests/Unit/FIRApp+FIRAuthUnitTests.m index 8b3ba794a2..90a5d62180 100644 --- a/FirebaseAuth/Tests/Unit/FIRApp+FIRAuthUnitTests.m +++ b/FirebaseAuth/Tests/Unit/FIRApp+FIRAuthUnitTests.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseAuth/Tests/Unit/FIRApp+FIRAuthUnitTests.h" diff --git a/FirebaseAuth/Tests/Unit/FIRAuthLifeCycleTests.m b/FirebaseAuth/Tests/Unit/FIRAuthLifeCycleTests.m index ca09c5c11f..5b757a46c5 100644 --- a/FirebaseAuth/Tests/Unit/FIRAuthLifeCycleTests.m +++ b/FirebaseAuth/Tests/Unit/FIRAuthLifeCycleTests.m @@ -16,7 +16,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "Interop/Auth/Public/FIRAuthInterop.h" #import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h" diff --git a/FirebaseAuth/Tests/Unit/FIRAuthTests.m b/FirebaseAuth/Tests/Unit/FIRAuthTests.m index b5ea753e42..936716bb37 100644 --- a/FirebaseAuth/Tests/Unit/FIRAuthTests.m +++ b/FirebaseAuth/Tests/Unit/FIRAuthTests.m @@ -26,7 +26,7 @@ #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRFacebookAuthProvider.h" #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRGoogleAuthProvider.h" #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIROAuthProvider.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "Interop/Auth/Public/FIRAuthInterop.h" #import "FirebaseAuth/Sources/Auth/FIRAuthDispatcher.h" diff --git a/FirebaseAuth/Tests/Unit/FIROAuthProviderTests.m b/FirebaseAuth/Tests/Unit/FIROAuthProviderTests.m index 6fc0288c65..e03e0f2988 100644 --- a/FirebaseAuth/Tests/Unit/FIROAuthProviderTests.m +++ b/FirebaseAuth/Tests/Unit/FIROAuthProviderTests.m @@ -23,7 +23,7 @@ #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuthErrors.h" #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuthUIDelegate.h" #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIROAuthProvider.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h" #import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h" diff --git a/FirebaseAuth/Tests/Unit/FIRPhoneAuthProviderTests.m b/FirebaseAuth/Tests/Unit/FIRPhoneAuthProviderTests.m index 2533d478f2..a8ec51be87 100644 --- a/FirebaseAuth/Tests/Unit/FIRPhoneAuthProviderTests.m +++ b/FirebaseAuth/Tests/Unit/FIRPhoneAuthProviderTests.m @@ -24,7 +24,7 @@ #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuthSettings.h" #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuthUIDelegate.h" #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRPhoneAuthProvider.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h" #import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h" diff --git a/FirebaseCombineSwift/Tests/Unit/FirebaseCombine-unit-Bridging-Header.h b/FirebaseCombineSwift/Tests/Unit/FirebaseCombine-unit-Bridging-Header.h index c99d4bc58e..b097e20ee4 100644 --- a/FirebaseCombineSwift/Tests/Unit/FirebaseCombine-unit-Bridging-Header.h +++ b/FirebaseCombineSwift/Tests/Unit/FirebaseCombine-unit-Bridging-Header.h @@ -19,7 +19,7 @@ #import "FirebaseStorage/Sources/FIRStorageComponent.h" // Firebase Core -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" // Firebase Functions #import "FirebaseFunctions/Sources/FIRFunctions+Internal.h" diff --git a/FirebaseCore.podspec b/FirebaseCore.podspec index 9631b7d1d7..9d8bdc827b 100644 --- a/FirebaseCore.podspec +++ b/FirebaseCore.podspec @@ -33,13 +33,14 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration s.source_files = [ 'FirebaseCore/Sources/**/*.[mh]', + 'FirebaseCore/Internal/*.h', 'Interop/CoreDiagnostics/Public/*.h', ] s.public_header_files = [ 'FirebaseCore/Sources/Public/FirebaseCore/*.h', - 'FirebaseCore/Sources/Private/*.h', + 'FirebaseCore/Internal/*.h', ] - s.private_header_files = 'FirebaseCore/Sources/Private/*.h' + s.private_header_files = 'FirebaseCore/Internal/*.h' s.framework = 'Foundation' s.ios.framework = 'UIKit' diff --git a/FirebaseCore/Sources/Private/FIRAppInternal.h b/FirebaseCore/Internal/FIRAppInternal.h similarity index 100% rename from FirebaseCore/Sources/Private/FIRAppInternal.h rename to FirebaseCore/Internal/FIRAppInternal.h diff --git a/FirebaseCore/Sources/Private/FIRComponent.h b/FirebaseCore/Internal/FIRComponent.h similarity index 100% rename from FirebaseCore/Sources/Private/FIRComponent.h rename to FirebaseCore/Internal/FIRComponent.h diff --git a/FirebaseCore/Sources/Private/FIRComponentContainer.h b/FirebaseCore/Internal/FIRComponentContainer.h similarity index 100% rename from FirebaseCore/Sources/Private/FIRComponentContainer.h rename to FirebaseCore/Internal/FIRComponentContainer.h diff --git a/FirebaseCore/Sources/Private/FIRComponentType.h b/FirebaseCore/Internal/FIRComponentType.h similarity index 100% rename from FirebaseCore/Sources/Private/FIRComponentType.h rename to FirebaseCore/Internal/FIRComponentType.h diff --git a/FirebaseCore/Sources/Private/FIRCoreDiagnosticsConnector.h b/FirebaseCore/Internal/FIRCoreDiagnosticsConnector.h similarity index 100% rename from FirebaseCore/Sources/Private/FIRCoreDiagnosticsConnector.h rename to FirebaseCore/Internal/FIRCoreDiagnosticsConnector.h diff --git a/FirebaseCore/Sources/Private/FIRDependency.h b/FirebaseCore/Internal/FIRDependency.h similarity index 100% rename from FirebaseCore/Sources/Private/FIRDependency.h rename to FirebaseCore/Internal/FIRDependency.h diff --git a/FirebaseCore/Sources/Private/FIRHeartbeatInfo.h b/FirebaseCore/Internal/FIRHeartbeatInfo.h similarity index 100% rename from FirebaseCore/Sources/Private/FIRHeartbeatInfo.h rename to FirebaseCore/Internal/FIRHeartbeatInfo.h diff --git a/FirebaseCore/Sources/Private/FIRLibrary.h b/FirebaseCore/Internal/FIRLibrary.h similarity index 100% rename from FirebaseCore/Sources/Private/FIRLibrary.h rename to FirebaseCore/Internal/FIRLibrary.h diff --git a/FirebaseCore/Sources/Private/FIRLogger.h b/FirebaseCore/Internal/FIRLogger.h similarity index 100% rename from FirebaseCore/Sources/Private/FIRLogger.h rename to FirebaseCore/Internal/FIRLogger.h diff --git a/FirebaseCore/Sources/Private/FIROptionsInternal.h b/FirebaseCore/Internal/FIROptionsInternal.h similarity index 100% rename from FirebaseCore/Sources/Private/FIROptionsInternal.h rename to FirebaseCore/Internal/FIROptionsInternal.h diff --git a/FirebaseCore/Sources/Private/FirebaseCoreInternal.h b/FirebaseCore/Internal/FirebaseCoreInternal.h similarity index 61% rename from FirebaseCore/Sources/Private/FirebaseCoreInternal.h rename to FirebaseCore/Internal/FirebaseCoreInternal.h index 88d012bdeb..547094407a 100644 --- a/FirebaseCore/Sources/Private/FirebaseCoreInternal.h +++ b/FirebaseCore/Internal/FirebaseCoreInternal.h @@ -17,12 +17,13 @@ #import -#import "FirebaseCore/Sources/Private/FIRAppInternal.h" -#import "FirebaseCore/Sources/Private/FIRComponent.h" -#import "FirebaseCore/Sources/Private/FIRComponentContainer.h" -#import "FirebaseCore/Sources/Private/FIRComponentType.h" -#import "FirebaseCore/Sources/Private/FIRDependency.h" -#import "FirebaseCore/Sources/Private/FIRHeartbeatInfo.h" -#import "FirebaseCore/Sources/Private/FIRLibrary.h" -#import "FirebaseCore/Sources/Private/FIRLogger.h" -#import "FirebaseCore/Sources/Private/FIROptionsInternal.h" +#import "FIRAppInternal.h" +#import "FIRComponent.h" +#import "FIRComponentContainer.h" +#import "FIRComponentType.h" +#import "FIRCoreDiagnosticsConnector.h" +#import "FIRDependency.h" +#import "FIRHeartbeatInfo.h" +#import "FIRLibrary.h" +#import "FIRLogger.h" +#import "FIROptionsInternal.h" diff --git a/FirebaseCore/Internal/dummy.m b/FirebaseCore/Internal/dummy.m new file mode 100644 index 0000000000..2e503fe69d --- /dev/null +++ b/FirebaseCore/Internal/dummy.m @@ -0,0 +1,17 @@ +/* + * Copyright 2022 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// Swift Package Manager needs at least one source file. diff --git a/FirebaseCore/Sources/FIRApp.m b/FirebaseCore/Sources/FIRApp.m index 05660ac6f0..c35d62e801 100644 --- a/FirebaseCore/Sources/FIRApp.m +++ b/FirebaseCore/Sources/FIRApp.m @@ -30,11 +30,11 @@ #import "FirebaseCore/Sources/FIRConfigurationInternal.h" #import "FirebaseCore/Sources/FIRFirebaseUserAgent.h" -#import "FirebaseCore/Sources/Private/FIRAppInternal.h" -#import "FirebaseCore/Sources/Private/FIRCoreDiagnosticsConnector.h" -#import "FirebaseCore/Sources/Private/FIRLibrary.h" -#import "FirebaseCore/Sources/Private/FIRLogger.h" -#import "FirebaseCore/Sources/Private/FIROptionsInternal.h" +#import "FirebaseCore/Internal/FIRAppInternal.h" +#import "FirebaseCore/Internal/FIRCoreDiagnosticsConnector.h" +#import "FirebaseCore/Internal/FIRLibrary.h" +#import "FirebaseCore/Internal/FIRLogger.h" +#import "FirebaseCore/Internal/FIROptionsInternal.h" #import "FirebaseCore/Sources/Public/FirebaseCore/FIRVersion.h" #import diff --git a/FirebaseCore/Sources/FIRComponent.m b/FirebaseCore/Sources/FIRComponent.m index 9c1fbed3cb..f81869aa98 100644 --- a/FirebaseCore/Sources/FIRComponent.m +++ b/FirebaseCore/Sources/FIRComponent.m @@ -14,10 +14,10 @@ * limitations under the License. */ -#import "FirebaseCore/Sources/Private/FIRComponent.h" +#import "FirebaseCore/Internal/FIRComponent.h" -#import "FirebaseCore/Sources/Private/FIRComponentContainer.h" -#import "FirebaseCore/Sources/Private/FIRDependency.h" +#import "FirebaseCore/Internal/FIRComponentContainer.h" +#import "FirebaseCore/Internal/FIRDependency.h" @interface FIRComponent () diff --git a/FirebaseCore/Sources/FIRComponentContainer.m b/FirebaseCore/Sources/FIRComponentContainer.m index bbe887824f..d44a4026ca 100644 --- a/FirebaseCore/Sources/FIRComponentContainer.m +++ b/FirebaseCore/Sources/FIRComponentContainer.m @@ -14,12 +14,12 @@ * limitations under the License. */ -#import "FirebaseCore/Sources/Private/FIRComponentContainer.h" +#import "FirebaseCore/Internal/FIRComponentContainer.h" -#import "FirebaseCore/Sources/Private/FIRAppInternal.h" -#import "FirebaseCore/Sources/Private/FIRComponent.h" -#import "FirebaseCore/Sources/Private/FIRLibrary.h" -#import "FirebaseCore/Sources/Private/FIRLogger.h" +#import "FirebaseCore/Internal/FIRAppInternal.h" +#import "FirebaseCore/Internal/FIRComponent.h" +#import "FirebaseCore/Internal/FIRLibrary.h" +#import "FirebaseCore/Internal/FIRLogger.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseCore/Sources/FIRComponentContainerInternal.h b/FirebaseCore/Sources/FIRComponentContainerInternal.h index 7e76413c37..2004f3f1cf 100644 --- a/FirebaseCore/Sources/FIRComponentContainerInternal.h +++ b/FirebaseCore/Sources/FIRComponentContainerInternal.h @@ -15,8 +15,8 @@ */ #import -#import "FirebaseCore/Sources/Private/FIRComponentContainer.h" -#import "FirebaseCore/Sources/Private/FIRLibrary.h" +#import "FirebaseCore/Internal/FIRComponentContainer.h" +#import "FirebaseCore/Internal/FIRLibrary.h" @class FIRApp; diff --git a/FirebaseCore/Sources/FIRComponentType.m b/FirebaseCore/Sources/FIRComponentType.m index 9051336a61..a066a5528a 100644 --- a/FirebaseCore/Sources/FIRComponentType.m +++ b/FirebaseCore/Sources/FIRComponentType.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FirebaseCore/Sources/Private/FIRComponentType.h" +#import "FirebaseCore/Internal/FIRComponentType.h" #import "FirebaseCore/Sources/FIRComponentContainerInternal.h" diff --git a/FirebaseCore/Sources/FIRCoreDiagnosticsConnector.m b/FirebaseCore/Sources/FIRCoreDiagnosticsConnector.m index db54936a87..210fd1d66f 100644 --- a/FirebaseCore/Sources/FIRCoreDiagnosticsConnector.m +++ b/FirebaseCore/Sources/FIRCoreDiagnosticsConnector.m @@ -14,15 +14,15 @@ * limitations under the License. */ -#import "FirebaseCore/Sources/Private/FIRCoreDiagnosticsConnector.h" +#import "FirebaseCore/Internal/FIRCoreDiagnosticsConnector.h" #import "Interop/CoreDiagnostics/Public/FIRCoreDiagnosticsInterop.h" #import "FirebaseCore/Sources/Public/FirebaseCore/FIROptions.h" +#import "FirebaseCore/Internal/FIRAppInternal.h" +#import "FirebaseCore/Internal/FIROptionsInternal.h" #import "FirebaseCore/Sources/FIRDiagnosticsData.h" -#import "FirebaseCore/Sources/Private/FIRAppInternal.h" -#import "FirebaseCore/Sources/Private/FIROptionsInternal.h" // Define the interop class symbol declared as an extern in FIRCoreDiagnosticsInterop. Class FIRCoreDiagnosticsImplementation; diff --git a/FirebaseCore/Sources/FIRDependency.m b/FirebaseCore/Sources/FIRDependency.m index e1e25783ef..cdb63e29dd 100644 --- a/FirebaseCore/Sources/FIRDependency.m +++ b/FirebaseCore/Sources/FIRDependency.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FirebaseCore/Sources/Private/FIRDependency.h" +#import "FirebaseCore/Internal/FIRDependency.h" @interface FIRDependency () diff --git a/FirebaseCore/Sources/FIRDiagnosticsData.m b/FirebaseCore/Sources/FIRDiagnosticsData.m index 0beed25bda..dcbd8e6cfb 100644 --- a/FirebaseCore/Sources/FIRDiagnosticsData.m +++ b/FirebaseCore/Sources/FIRDiagnosticsData.m @@ -18,8 +18,8 @@ #import "FirebaseCore/Sources/Public/FirebaseCore/FIRApp.h" -#import "FirebaseCore/Sources/Private/FIRAppInternal.h" -#import "FirebaseCore/Sources/Private/FIROptionsInternal.h" +#import "FirebaseCore/Internal/FIRAppInternal.h" +#import "FirebaseCore/Internal/FIROptionsInternal.h" @implementation FIRDiagnosticsData { /** Backing ivar for the diagnosticObjects property. */ diff --git a/FirebaseCore/Sources/FIRHeartbeatInfo.m b/FirebaseCore/Sources/FIRHeartbeatInfo.m index ef6b363962..1ef1121909 100644 --- a/FirebaseCore/Sources/FIRHeartbeatInfo.m +++ b/FirebaseCore/Sources/FIRHeartbeatInfo.m @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "FirebaseCore/Sources/Private/FIRHeartbeatInfo.h" +#import "FirebaseCore/Internal/FIRHeartbeatInfo.h" #import #import #import #import -#import "FirebaseCore/Sources/Private/FIRAppInternal.h" +#import "FirebaseCore/Internal/FIRAppInternal.h" const static long secondsInDay = 86400; @implementation FIRHeartbeatInfo : NSObject diff --git a/FirebaseCore/Sources/FIRLogger.m b/FirebaseCore/Sources/FIRLogger.m index 6707a96374..d18bd63ae7 100644 --- a/FirebaseCore/Sources/FIRLogger.m +++ b/FirebaseCore/Sources/FIRLogger.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "FirebaseCore/Sources/Private/FIRLogger.h" +#import "FirebaseCore/Internal/FIRLogger.h" #import #import diff --git a/FirebaseCore/Sources/FIROptions.m b/FirebaseCore/Sources/FIROptions.m index e66b4e64d2..d7c92b1c4e 100644 --- a/FirebaseCore/Sources/FIROptions.m +++ b/FirebaseCore/Sources/FIROptions.m @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. +#import "FirebaseCore/Internal/FIRAppInternal.h" +#import "FirebaseCore/Internal/FIRLogger.h" +#import "FirebaseCore/Internal/FIROptionsInternal.h" #import "FirebaseCore/Sources/FIRBundleUtil.h" -#import "FirebaseCore/Sources/Private/FIRAppInternal.h" -#import "FirebaseCore/Sources/Private/FIRLogger.h" -#import "FirebaseCore/Sources/Private/FIROptionsInternal.h" #import "FirebaseCore/Sources/Public/FirebaseCore/FIRVersion.h" // Keys for the strings in the plist file. diff --git a/FirebaseCore/Tests/SwiftUnit/FirebaseCore-unit-Bridging-Header.h b/FirebaseCore/Tests/SwiftUnit/FirebaseCore-unit-Bridging-Header.h index 4816efda40..297ebbbd9d 100644 --- a/FirebaseCore/Tests/SwiftUnit/FirebaseCore-unit-Bridging-Header.h +++ b/FirebaseCore/Tests/SwiftUnit/FirebaseCore-unit-Bridging-Header.h @@ -12,6 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseCore/Tests/SwiftUnit/SwiftTestingUtilities/ExceptionCatcher.h" #import "SharedTestUtilities/FIROptionsMock.h" diff --git a/FirebaseCore/Tests/Unit/FIRAppTest.m b/FirebaseCore/Tests/Unit/FIRAppTest.m index 1d128c44d5..4ca6b5e154 100644 --- a/FirebaseCore/Tests/Unit/FIRAppTest.m +++ b/FirebaseCore/Tests/Unit/FIRAppTest.m @@ -16,11 +16,11 @@ #import "FirebaseCore/Tests/Unit/FIRTestComponents.h" #import +#import "FirebaseCore/Internal/FIRAppInternal.h" +#import "FirebaseCore/Internal/FIRComponentType.h" +#import "FirebaseCore/Internal/FIRCoreDiagnosticsConnector.h" +#import "FirebaseCore/Internal/FIROptionsInternal.h" #import "FirebaseCore/Sources/FIRAnalyticsConfiguration.h" -#import "FirebaseCore/Sources/Private/FIRAppInternal.h" -#import "FirebaseCore/Sources/Private/FIRComponentType.h" -#import "FirebaseCore/Sources/Private/FIRCoreDiagnosticsConnector.h" -#import "FirebaseCore/Sources/Private/FIROptionsInternal.h" #import "SharedTestUtilities/FIROptionsMock.h" NSString *const kFIRTestAppName1 = @"test_app_name_1"; diff --git a/FirebaseCore/Tests/Unit/FIRComponentContainerTest.m b/FirebaseCore/Tests/Unit/FIRComponentContainerTest.m index b2510d22ed..7b0f63aea9 100644 --- a/FirebaseCore/Tests/Unit/FIRComponentContainerTest.m +++ b/FirebaseCore/Tests/Unit/FIRComponentContainerTest.m @@ -14,9 +14,9 @@ #import "FirebaseCore/Tests/Unit/FIRTestCase.h" +#import "FirebaseCore/Internal/FIRComponentType.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseCore/Sources/FIRComponentContainerInternal.h" -#import "FirebaseCore/Sources/Private/FIRComponentType.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" #import "FirebaseCore/Tests/Unit/FIRTestComponents.h" #import "SharedTestUtilities/FIROptionsMock.h" diff --git a/FirebaseCore/Tests/Unit/FIRComponentTypeTest.m b/FirebaseCore/Tests/Unit/FIRComponentTypeTest.m index 8197942df5..23b450921a 100644 --- a/FirebaseCore/Tests/Unit/FIRComponentTypeTest.m +++ b/FirebaseCore/Tests/Unit/FIRComponentTypeTest.m @@ -14,8 +14,8 @@ #import "FirebaseCore/Tests/Unit/FIRTestCase.h" +#import "FirebaseCore/Internal/FIRComponentType.h" #import "FirebaseCore/Sources/FIRComponentContainerInternal.h" -#import "FirebaseCore/Sources/Private/FIRComponentType.h" #import "FirebaseCore/Tests/Unit/FIRTestComponents.h" diff --git a/FirebaseCore/Tests/Unit/FIRHeartbeatInfoTest.m b/FirebaseCore/Tests/Unit/FIRHeartbeatInfoTest.m index bba69d1a9e..ee52c11a55 100644 --- a/FirebaseCore/Tests/Unit/FIRHeartbeatInfoTest.m +++ b/FirebaseCore/Tests/Unit/FIRHeartbeatInfoTest.m @@ -16,7 +16,7 @@ #import #import #import -#import "FirebaseCore/Sources/Private/FIRHeartbeatInfo.h" +#import "FirebaseCore/Internal/FIRHeartbeatInfo.h" /// Taken from the implementation of `FIRHeartbeatInfo.m`. NSString *const kFIRCoreSuiteName = @"com.firebase.core"; diff --git a/FirebaseCore/Tests/Unit/FIRLoggerTest.m b/FirebaseCore/Tests/Unit/FIRLoggerTest.m index 6a9774b6e9..12137a8aaa 100644 --- a/FirebaseCore/Tests/Unit/FIRLoggerTest.m +++ b/FirebaseCore/Tests/Unit/FIRLoggerTest.m @@ -20,7 +20,7 @@ // TODO - FIRLoggerTest should be split into a separate FIRLoggerTest and GULLoggerTest. // No test should include both includes. #import -#import "FirebaseCore/Sources/Private/FIRLogger.h" +#import "FirebaseCore/Internal/FIRLogger.h" #import diff --git a/FirebaseCore/Tests/Unit/FIROptionsTest.m b/FirebaseCore/Tests/Unit/FIROptionsTest.m index eaf664a874..8dea3b1fcc 100644 --- a/FirebaseCore/Tests/Unit/FIROptionsTest.m +++ b/FirebaseCore/Tests/Unit/FIROptionsTest.m @@ -14,9 +14,9 @@ #import "FirebaseCore/Tests/Unit/FIRTestCase.h" +#import "FirebaseCore/Internal/FIRAppInternal.h" +#import "FirebaseCore/Internal/FIROptionsInternal.h" #import "FirebaseCore/Sources/FIRBundleUtil.h" -#import "FirebaseCore/Sources/Private/FIRAppInternal.h" -#import "FirebaseCore/Sources/Private/FIROptionsInternal.h" #import "FirebaseCore/Sources/Public/FirebaseCore/FIRVersion.h" #import "SharedTestUtilities/FIROptionsMock.h" diff --git a/FirebaseCore/Tests/Unit/FIRTestComponents.h b/FirebaseCore/Tests/Unit/FIRTestComponents.h index ef1e63db28..3462474655 100644 --- a/FirebaseCore/Tests/Unit/FIRTestComponents.h +++ b/FirebaseCore/Tests/Unit/FIRTestComponents.h @@ -14,9 +14,9 @@ #import -#import "FirebaseCore/Sources/Private/FIRComponent.h" -#import "FirebaseCore/Sources/Private/FIRComponentContainer.h" -#import "FirebaseCore/Sources/Private/FIRLibrary.h" +#import "FirebaseCore/Internal/FIRComponent.h" +#import "FirebaseCore/Internal/FIRComponentContainer.h" +#import "FirebaseCore/Internal/FIRLibrary.h" @protocol FIRComponentRegistrant; diff --git a/FirebaseCore/Tests/Unit/FIRTestComponents.m b/FirebaseCore/Tests/Unit/FIRTestComponents.m index 30ac0f8f74..f45325ca62 100644 --- a/FirebaseCore/Tests/Unit/FIRTestComponents.m +++ b/FirebaseCore/Tests/Unit/FIRTestComponents.m @@ -14,8 +14,8 @@ #import "FirebaseCore/Tests/Unit/FIRTestComponents.h" -#import "FirebaseCore/Sources/Private/FIRComponentType.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FIRComponentType.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #pragma mark - Standard Component diff --git a/FirebaseCrashlytics.podspec b/FirebaseCrashlytics.podspec index 242c1a0277..2acac2288d 100644 --- a/FirebaseCrashlytics.podspec +++ b/FirebaseCrashlytics.podspec @@ -29,7 +29,7 @@ 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/Sources/Private/*.h', + 'FirebaseCore/Internal/*.h', 'FirebaseInstallations/Source/Library/Private/*.h', 'Interop/Analytics/Public/*.h', ] diff --git a/FirebaseDatabase.podspec b/FirebaseDatabase.podspec index ac6f9e4097..9aed00914c 100644 --- a/FirebaseDatabase.podspec +++ b/FirebaseDatabase.podspec @@ -37,7 +37,7 @@ Simplify your iOS development, grow your user base, and monetize more effectivel base_dir + 'third_party/SocketRocket/fbase64.c', 'Interop/Auth/Public/*.h', 'FirebaseAppCheck/Sources/Interop/*.h', - 'FirebaseCore/Sources/Private/*.h', + 'FirebaseCore/Internal/*.h', ] s.public_header_files = base_dir + 'Public/FirebaseDatabase/*.h' s.libraries = ['c++', 'icucore'] diff --git a/FirebaseDatabase/Sources/Api/FIRDatabase.m b/FirebaseDatabase/Sources/Api/FIRDatabase.m index 7ba88b1692..a1b04cbf56 100644 --- a/FirebaseDatabase/Sources/Api/FIRDatabase.m +++ b/FirebaseDatabase/Sources/Api/FIRDatabase.m @@ -16,7 +16,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "Interop/Auth/Public/FIRAuthInterop.h" #import "FirebaseDatabase/Sources/Api/FIRDatabaseComponent.h" diff --git a/FirebaseDatabase/Sources/Api/FIRDatabaseComponent.m b/FirebaseDatabase/Sources/Api/FIRDatabaseComponent.m index 33bb032b51..ba8b53f9c1 100644 --- a/FirebaseDatabase/Sources/Api/FIRDatabaseComponent.m +++ b/FirebaseDatabase/Sources/Api/FIRDatabaseComponent.m @@ -21,7 +21,7 @@ #import "FirebaseDatabase/Sources/FIRDatabaseConfig_Private.h" #import "FirebaseAppCheck/Sources/Interop/FIRAppCheckInterop.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "Interop/Auth/Public/FIRAuthInterop.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseDatabase/Sources/Core/FPersistentConnection.m b/FirebaseDatabase/Sources/Core/FPersistentConnection.m index 60f1d19cc1..3314d53ac0 100644 --- a/FirebaseDatabase/Sources/Core/FPersistentConnection.m +++ b/FirebaseDatabase/Sources/Core/FPersistentConnection.m @@ -15,7 +15,7 @@ */ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseDatabase/Sources/Api/FIRDatabaseConfig.h" #import "FirebaseDatabase/Sources/Constants/FConstants.h" #import "FirebaseDatabase/Sources/Core/FCompoundHash.h" diff --git a/FirebaseDatabase/Sources/Core/FRepo.m b/FirebaseDatabase/Sources/Core/FRepo.m index f041b57f3f..b8a996d535 100644 --- a/FirebaseDatabase/Sources/Core/FRepo.m +++ b/FirebaseDatabase/Sources/Core/FRepo.m @@ -16,7 +16,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseDatabase/Sources/Api/Private/FIRDataSnapshot_Private.h" #import "FirebaseDatabase/Sources/Api/Private/FIRDatabaseQuery_Private.h" #import "FirebaseDatabase/Sources/Api/Private/FIRDatabase_Private.h" diff --git a/FirebaseDatabase/Sources/Core/FRepoManager.m b/FirebaseDatabase/Sources/Core/FRepoManager.m index b22cd25499..0e6cbf566d 100644 --- a/FirebaseDatabase/Sources/Core/FRepoManager.m +++ b/FirebaseDatabase/Sources/Core/FRepoManager.m @@ -15,7 +15,7 @@ */ #import "FirebaseDatabase/Sources/Core/FRepoManager.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseDatabase/Sources/Api/Private/FIRDatabaseQuery_Private.h" #import "FirebaseDatabase/Sources/Api/Private/FIRDatabase_Private.h" #import "FirebaseDatabase/Sources/Core/FRepo.h" diff --git a/FirebaseDatabase/Sources/Core/FSyncTree.m b/FirebaseDatabase/Sources/Core/FSyncTree.m index 864e96edfc..9a4f6e41e6 100644 --- a/FirebaseDatabase/Sources/Core/FSyncTree.m +++ b/FirebaseDatabase/Sources/Core/FSyncTree.m @@ -15,7 +15,7 @@ */ #import "FirebaseDatabase/Sources/Core/FSyncTree.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseDatabase/Sources/Core/FCompoundHash.h" #import "FirebaseDatabase/Sources/Core/FListenProvider.h" #import "FirebaseDatabase/Sources/Core/FQueryParams.h" diff --git a/FirebaseDatabase/Sources/Core/Utilities/FIRRetryHelper.m b/FirebaseDatabase/Sources/Core/Utilities/FIRRetryHelper.m index 810a047914..2d0bad35fd 100644 --- a/FirebaseDatabase/Sources/Core/Utilities/FIRRetryHelper.m +++ b/FirebaseDatabase/Sources/Core/Utilities/FIRRetryHelper.m @@ -15,7 +15,7 @@ */ #import "FirebaseDatabase/Sources/Core/Utilities/FIRRetryHelper.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseDatabase/Sources/Utilities/FUtilities.h" @interface FIRRetryHelperTask : NSObject diff --git a/FirebaseDatabase/Sources/Core/View/FChildEventRegistration.m b/FirebaseDatabase/Sources/Core/View/FChildEventRegistration.m index eb25430e28..a1b4fcf1f6 100644 --- a/FirebaseDatabase/Sources/Core/View/FChildEventRegistration.m +++ b/FirebaseDatabase/Sources/Core/View/FChildEventRegistration.m @@ -15,7 +15,7 @@ */ #import "FirebaseDatabase/Sources/Core/View/FChildEventRegistration.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseDatabase/Sources/Api/Private/FIRDataSnapshot_Private.h" #import "FirebaseDatabase/Sources/Api/Private/FIRDatabaseQuery_Private.h" #import "FirebaseDatabase/Sources/Core/FQueryParams.h" diff --git a/FirebaseDatabase/Sources/Core/View/FValueEventRegistration.m b/FirebaseDatabase/Sources/Core/View/FValueEventRegistration.m index c839f0100b..deb4aa2186 100644 --- a/FirebaseDatabase/Sources/Core/View/FValueEventRegistration.m +++ b/FirebaseDatabase/Sources/Core/View/FValueEventRegistration.m @@ -15,7 +15,7 @@ */ #import "FirebaseDatabase/Sources/Core/View/FValueEventRegistration.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseDatabase/Sources/Api/Private/FIRDataSnapshot_Private.h" #import "FirebaseDatabase/Sources/Api/Private/FIRDatabaseQuery_Private.h" #import "FirebaseDatabase/Sources/Core/FQueryParams.h" diff --git a/FirebaseDatabase/Sources/FIRDatabaseReference.m b/FirebaseDatabase/Sources/FIRDatabaseReference.m index bb0ed6d5c2..a41a4ab6a6 100644 --- a/FirebaseDatabase/Sources/FIRDatabaseReference.m +++ b/FirebaseDatabase/Sources/FIRDatabaseReference.m @@ -15,7 +15,7 @@ */ #import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseReference.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseDatabase/Sources/Api/FIRDatabaseConfig.h" #import "FirebaseDatabase/Sources/Api/Private/FIRDatabaseQuery_Private.h" #import "FirebaseDatabase/Sources/Api/Private/FIRDatabaseReference_Private.h" diff --git a/FirebaseDatabase/Sources/Login/FIRDatabaseConnectionContextProvider.m b/FirebaseDatabase/Sources/Login/FIRDatabaseConnectionContextProvider.m index e6260f5ee1..c237c8f64e 100644 --- a/FirebaseDatabase/Sources/Login/FIRDatabaseConnectionContextProvider.m +++ b/FirebaseDatabase/Sources/Login/FIRDatabaseConnectionContextProvider.m @@ -16,7 +16,7 @@ #import "FirebaseDatabase/Sources/Login/FIRDatabaseConnectionContextProvider.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseAppCheck/Sources/Interop/FIRAppCheckInterop.h" #import "FirebaseAppCheck/Sources/Interop/FIRAppCheckTokenResultInterop.h" diff --git a/FirebaseDatabase/Sources/Persistence/FLevelDBStorageEngine.m b/FirebaseDatabase/Sources/Persistence/FLevelDBStorageEngine.m index f23dcec98c..c05d99175f 100644 --- a/FirebaseDatabase/Sources/Persistence/FLevelDBStorageEngine.m +++ b/FirebaseDatabase/Sources/Persistence/FLevelDBStorageEngine.m @@ -18,7 +18,7 @@ #import "FirebaseDatabase/Sources/Persistence/FLevelDBStorageEngine.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseDatabase/Sources/Core/FQueryParams.h" #import "FirebaseDatabase/Sources/Core/FWriteRecord.h" #import "FirebaseDatabase/Sources/Persistence/FPendingPut.h" diff --git a/FirebaseDatabase/Sources/Persistence/FPersistenceManager.m b/FirebaseDatabase/Sources/Persistence/FPersistenceManager.m index 1b6ae1196d..8c33692381 100644 --- a/FirebaseDatabase/Sources/Persistence/FPersistenceManager.m +++ b/FirebaseDatabase/Sources/Persistence/FPersistenceManager.m @@ -15,7 +15,7 @@ */ #import "FirebaseDatabase/Sources/Persistence/FPersistenceManager.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseDatabase/Sources/Core/View/FCacheNode.h" #import "FirebaseDatabase/Sources/FClock.h" #import "FirebaseDatabase/Sources/Persistence/FLevelDBStorageEngine.h" diff --git a/FirebaseDatabase/Sources/Persistence/FTrackedQueryManager.m b/FirebaseDatabase/Sources/Persistence/FTrackedQueryManager.m index c3af1e1f3d..a12351e946 100644 --- a/FirebaseDatabase/Sources/Persistence/FTrackedQueryManager.m +++ b/FirebaseDatabase/Sources/Persistence/FTrackedQueryManager.m @@ -15,7 +15,7 @@ */ #import "FirebaseDatabase/Sources/Persistence/FTrackedQueryManager.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseDatabase/Sources/Core/Utilities/FImmutableTree.h" #import "FirebaseDatabase/Sources/FClock.h" #import "FirebaseDatabase/Sources/Persistence/FCachePolicy.h" diff --git a/FirebaseDatabase/Sources/Realtime/FConnection.m b/FirebaseDatabase/Sources/Realtime/FConnection.m index f52088876b..5cea373dd6 100644 --- a/FirebaseDatabase/Sources/Realtime/FConnection.m +++ b/FirebaseDatabase/Sources/Realtime/FConnection.m @@ -15,7 +15,7 @@ */ #import "FirebaseDatabase/Sources/Realtime/FConnection.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseDatabase/Sources/Constants/FConstants.h" typedef enum { diff --git a/FirebaseDatabase/Sources/Realtime/FWebSocketConnection.m b/FirebaseDatabase/Sources/Realtime/FWebSocketConnection.m index 3b873c2cb8..bafcae8e99 100644 --- a/FirebaseDatabase/Sources/Realtime/FWebSocketConnection.m +++ b/FirebaseDatabase/Sources/Realtime/FWebSocketConnection.m @@ -19,7 +19,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseDatabase/Sources/Api/Private/FIRDatabase_Private.h" #import "FirebaseDatabase/Sources/Constants/FConstants.h" #import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseReference.h" diff --git a/FirebaseDatabase/Sources/Utilities/FUtilities.h b/FirebaseDatabase/Sources/Utilities/FUtilities.h index f166c3dbe4..129789598b 100644 --- a/FirebaseDatabase/Sources/Utilities/FUtilities.h +++ b/FirebaseDatabase/Sources/Utilities/FUtilities.h @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import #import "FirebaseDatabase/Sources/Utilities/FParsedUrl.h" diff --git a/FirebaseDatabase/Sources/Utilities/FUtilities.m b/FirebaseDatabase/Sources/Utilities/FUtilities.m index a672686577..cc457bf00b 100644 --- a/FirebaseDatabase/Sources/Utilities/FUtilities.m +++ b/FirebaseDatabase/Sources/Utilities/FUtilities.m @@ -15,7 +15,7 @@ */ #import "FirebaseDatabase/Sources/Utilities/FUtilities.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseDatabase/Sources/Constants/FConstants.h" #import "FirebaseDatabase/Sources/Utilities/FAtomicNumber.h" #import "FirebaseDatabase/Sources/Utilities/FStringUtilities.h" diff --git a/FirebaseDatabase/Tests/Helpers/FTestBase.m b/FirebaseDatabase/Tests/Helpers/FTestBase.m index 9935cf2d04..2c89974f6d 100644 --- a/FirebaseDatabase/Tests/Helpers/FTestBase.m +++ b/FirebaseDatabase/Tests/Helpers/FTestBase.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseDatabase/Sources/Api/Private/FIRDatabaseQuery_Private.h" #import "FirebaseDatabase/Tests/Helpers/FTestBase.h" diff --git a/FirebaseDatabase/Tests/Helpers/FTestHelpers.m b/FirebaseDatabase/Tests/Helpers/FTestHelpers.m index 8dda35cebb..5a224a6df1 100644 --- a/FirebaseDatabase/Tests/Helpers/FTestHelpers.m +++ b/FirebaseDatabase/Tests/Helpers/FTestHelpers.m @@ -16,7 +16,7 @@ #import "FirebaseDatabase/Tests/Helpers/FTestHelpers.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "Interop/Auth/Public/FIRAuthInterop.h" #import "FirebaseDatabase/Sources/Api/Private/FIRDatabase_Private.h" diff --git a/FirebaseDatabase/Tests/Integration/FConnectionTest.m b/FirebaseDatabase/Tests/Integration/FConnectionTest.m index f6ef127354..383485c8b1 100644 --- a/FirebaseDatabase/Tests/Integration/FConnectionTest.m +++ b/FirebaseDatabase/Tests/Integration/FConnectionTest.m @@ -16,7 +16,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseDatabase/Sources/Api/Private/FIRDatabaseQuery_Private.h" #import "FirebaseDatabase/Sources/Realtime/FConnection.h" diff --git a/FirebaseDatabase/Tests/Integration/FData.m b/FirebaseDatabase/Tests/Integration/FData.m index 4ce436603a..70d2aed780 100644 --- a/FirebaseDatabase/Tests/Integration/FData.m +++ b/FirebaseDatabase/Tests/Integration/FData.m @@ -16,7 +16,7 @@ #import "FirebaseDatabase/Tests/Integration/FData.h" #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseDatabase/Sources/Api/Private/FIRDatabaseQuery_Private.h" #import "FirebaseDatabase/Sources/Core/FRepo_Private.h" #import "FirebaseDatabase/Sources/FIRDatabaseConfig_Private.h" diff --git a/FirebaseDatabase/Tests/Integration/FIRAuthTests.m b/FirebaseDatabase/Tests/Integration/FIRAuthTests.m index e36ea9ca1a..81e7a976d3 100644 --- a/FirebaseDatabase/Tests/Integration/FIRAuthTests.m +++ b/FirebaseDatabase/Tests/Integration/FIRAuthTests.m @@ -16,7 +16,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "Interop/Auth/Public/FIRAuthInterop.h" #import "FirebaseDatabase/Sources/FIRDatabaseConfig_Private.h" diff --git a/FirebaseDatabase/Tests/Integration/FIRDatabaseTests.m b/FirebaseDatabase/Tests/Integration/FIRDatabaseTests.m index cf4e7d1dd2..5c4e4563e8 100644 --- a/FirebaseDatabase/Tests/Integration/FIRDatabaseTests.m +++ b/FirebaseDatabase/Tests/Integration/FIRDatabaseTests.m @@ -16,7 +16,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseDatabase/Sources/Api/Private/FIRDatabaseReference_Private.h" #import "FirebaseDatabase/Sources/FIRDatabaseConfig_Private.h" diff --git a/FirebaseDatabase/Tests/Unit/FIRDatabaseConnectionContextProviderTests.m b/FirebaseDatabase/Tests/Unit/FIRDatabaseConnectionContextProviderTests.m index bf11299aff..a25cabc234 100644 --- a/FirebaseDatabase/Tests/Unit/FIRDatabaseConnectionContextProviderTests.m +++ b/FirebaseDatabase/Tests/Unit/FIRDatabaseConnectionContextProviderTests.m @@ -20,7 +20,7 @@ #import "FirebaseDatabase/Sources/Login/FIRDatabaseConnectionContextProvider.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "SharedTestUtilities/AppCheckFake/FIRAppCheckFake.h" #import "SharedTestUtilities/AppCheckFake/FIRAppCheckTokenResultFake.h" #import "SharedTestUtilities/FIRAuthInteropFake.h" diff --git a/FirebaseDatabase/Tests/Unit/FSyncPointTests.m b/FirebaseDatabase/Tests/Unit/FSyncPointTests.m index 4f08670e6a..22bf86120d 100644 --- a/FirebaseDatabase/Tests/Unit/FSyncPointTests.m +++ b/FirebaseDatabase/Tests/Unit/FSyncPointTests.m @@ -16,7 +16,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseDatabase/Sources/Api/Private/FIRDataSnapshot_Private.h" #import "FirebaseDatabase/Sources/Api/Private/FIRDatabaseQuery_Private.h" diff --git a/FirebaseDynamicLinks.podspec b/FirebaseDynamicLinks.podspec index 843cad57ec..a84cf25156 100644 --- a/FirebaseDynamicLinks.podspec +++ b/FirebaseDynamicLinks.podspec @@ -24,7 +24,7 @@ Firebase Dynamic Links are deep links that enhance user experience and increase s.source_files = [ 'FirebaseDynamicLinks/Sources/**/*.[mh]', 'Interop/Analytics/Public/*.h', - 'FirebaseCore/Sources/Private/*.h', + 'FirebaseCore/Internal/*.h', ] s.public_header_files = 'FirebaseDynamicLinks/Sources/Public/FirebaseDynamicLinks/*.h' s.frameworks = 'QuartzCore' diff --git a/FirebaseDynamicLinks/Sources/FDLURLComponents/FIRDynamicLinkComponentsKeyProvider.m b/FirebaseDynamicLinks/Sources/FDLURLComponents/FIRDynamicLinkComponentsKeyProvider.m index b1be533d26..0b3f97885e 100644 --- a/FirebaseDynamicLinks/Sources/FDLURLComponents/FIRDynamicLinkComponentsKeyProvider.m +++ b/FirebaseDynamicLinks/Sources/FDLURLComponents/FIRDynamicLinkComponentsKeyProvider.m @@ -19,7 +19,7 @@ #import "FirebaseDynamicLinks/Sources/FDLURLComponents/FIRDynamicLinkComponentsKeyProvider.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" @implementation FIRDynamicLinkComponentsKeyProvider diff --git a/FirebaseDynamicLinks/Sources/FIRDynamicLinks.m b/FirebaseDynamicLinks/Sources/FIRDynamicLinks.m index edc0241d35..e13e6e8f2c 100644 --- a/FirebaseDynamicLinks/Sources/FIRDynamicLinks.m +++ b/FirebaseDynamicLinks/Sources/FIRDynamicLinks.m @@ -22,7 +22,7 @@ #import #ifdef FIRDynamicLinks3P -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseDynamicLinks/Sources/FIRDLScionLogging.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" #else diff --git a/FirebaseDynamicLinks/Sources/Logging/FDLLogging.m b/FirebaseDynamicLinks/Sources/Logging/FDLLogging.m index 5028fa49ea..a89040c94e 100644 --- a/FirebaseDynamicLinks/Sources/Logging/FDLLogging.m +++ b/FirebaseDynamicLinks/Sources/Logging/FDLLogging.m @@ -20,7 +20,7 @@ #import "FirebaseDynamicLinks/Sources/Logging/FDLLogging.h" #ifdef GIN_SCION_LOGGING -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" FIRLoggerService kFIRLoggerDynamicLinks = @"[Firebase/DynamicLinks]"; #endif // GIN_SCION_LOGGING diff --git a/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m b/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m index bf81cf862e..6addf144ad 100644 --- a/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m +++ b/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m @@ -21,7 +21,7 @@ #import #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseDynamicLinks/Sources/FIRDLDefaultRetrievalProcessV2.h" #import "FirebaseDynamicLinks/Sources/FIRDLRetrievalProcessFactory.h" #import "FirebaseDynamicLinks/Sources/FIRDLRetrievalProcessResult+Private.h" diff --git a/FirebaseFirestore.podspec b/FirebaseFirestore.podspec index 3a250742de..14fb6be349 100644 --- a/FirebaseFirestore.podspec +++ b/FirebaseFirestore.podspec @@ -43,7 +43,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling, # that "quick open" by filename in Xcode will continue to work. s.source_files = [ 'FirebaseAppCheck/Sources/Interop/*.h', - 'FirebaseCore/Sources/Private/*.h', + 'FirebaseCore/Internal/*.h', 'Firestore/Source/Public/FirebaseFirestore/*.h', 'Firestore/Source/**/*.{m,mm}', 'Firestore/Protos/nanopb/**/*.cc', diff --git a/FirebaseFunctions.podspec b/FirebaseFunctions.podspec index 8e6018c0ff..87e5d8ff93 100644 --- a/FirebaseFunctions.podspec +++ b/FirebaseFunctions.podspec @@ -27,7 +27,7 @@ Cloud Functions for Firebase. 'FirebaseFunctions/Sources/**/*', 'Interop/Auth/Public/*.h', 'FirebaseAppCheck/Sources/Interop/*.h', - 'FirebaseCore/Sources/Private/*.h', + 'FirebaseCore/Internal/*.h', 'FirebaseMessaging/Sources/Interop/FIRMessagingInterop.h', ] s.public_header_files = 'FirebaseFunctions/Sources/Public/FirebaseFunctions/*.h' diff --git a/FirebaseFunctions/Sources/FIRFunctions.m b/FirebaseFunctions/Sources/FIRFunctions.m index 7738147fa3..1e2b045277 100644 --- a/FirebaseFunctions/Sources/FIRFunctions.m +++ b/FirebaseFunctions/Sources/FIRFunctions.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseFunctions/Sources/FIRFunctions+Internal.h" #import "FirebaseFunctions/Sources/Public/FirebaseFunctions/FIRFunctions.h" diff --git a/FirebaseFunctions/Sources/FIRFunctionsComponent.m b/FirebaseFunctions/Sources/FIRFunctionsComponent.m index d065807a80..983e1df540 100644 --- a/FirebaseFunctions/Sources/FIRFunctionsComponent.m +++ b/FirebaseFunctions/Sources/FIRFunctionsComponent.m @@ -18,7 +18,7 @@ #import "FirebaseFunctions/Sources/FIRFunctions_Private.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseAppCheck/Sources/Interop/FIRAppCheckInterop.h" #import "FirebaseMessaging/Sources/Interop/FIRMessagingInterop.h" diff --git a/FirebaseFunctions/Tests/Integration/FIRIntegrationTests.m b/FirebaseFunctions/Tests/Integration/FIRIntegrationTests.m index 80177ae3c9..485de25934 100644 --- a/FirebaseFunctions/Tests/Integration/FIRIntegrationTests.m +++ b/FirebaseFunctions/Tests/Integration/FIRIntegrationTests.m @@ -14,7 +14,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseFunctions/Sources/FIRFunctions+Internal.h" #import "FirebaseFunctions/Sources/Public/FirebaseFunctions/FIRError.h" diff --git a/FirebaseFunctionsSwift/Sources/Functions.swift b/FirebaseFunctionsSwift/Sources/Functions.swift index 1dfb4fed3d..db530b7283 100644 --- a/FirebaseFunctionsSwift/Sources/Functions.swift +++ b/FirebaseFunctionsSwift/Sources/Functions.swift @@ -14,6 +14,7 @@ import Foundation import FirebaseCore +import FirebaseCoreInternal import FirebaseSharedSwift #if COCOAPODS import GTMSessionFetcher @@ -36,11 +37,17 @@ import FirebaseSharedSwift // END PLACEHOLDERS +/// File specific constants. private enum Constants { static let appCheckTokenHeader = "X-Firebase-AppCheck" static let fcmTokenHeader = "Firebase-Instance-ID-Token" } +/// Cross SDK constants. +internal enum FunctionsConstants { + static let defaultRegion = "us-central1" +} + /** * `Functions` is the client for Cloud Functions for a Firebase project. */ @@ -51,15 +58,17 @@ private enum Constants { private let fetcherService: GTMSessionFetcherService // The projectID to use for all function references. private let projectID: String - // The region to use for all function references. - private let region: String - // The custom domain to use for all functions references (optional). - private let customDomain: String? // A serializer to encode/decode data and return values. private let serializer = FUNSerializer() // A factory for getting the metadata to include with function calls. private let contextProvider: FunctionsContextProvider + // The custom domain to use for all functions references (optional). + internal let customDomain: String? + + // The region to use for all function references. + internal let region: String + /** * The current emulator origin, or nil if it is not set. */ @@ -72,39 +81,51 @@ private enum Constants { * @param region The region for the http trigger, such as "us-central1". */ public class func functions(app: FirebaseApp = FirebaseApp.app()!, - region: String = "us-central1") -> Functions { - return Functions(app: app, region: region, customDomain: nil) + region: String) -> Functions { + let provider = ComponentType.instance(for: FunctionsProvider.self, + in: app.container) + return provider.functions(for: app, + region: region, + customDomain: nil, + type: self) } /** * Creates a Cloud Functions client with the given app and region, or returns a pre-existing * instance if one already exists. * @param app The app for the Firebase project. - * @param customDomain A custom domain for the http trigger, such as "https://mydomain.com". + * @param region The region for the http trigger, such as "us-central1". */ public class func functions(app: FirebaseApp = FirebaseApp.app()!, - customDomain: String) -> Functions { - return Functions(app: app, region: "us-central1", customDomain: customDomain) + customDomain: String? = nil) -> Functions { + let provider = ComponentType.instance(for: FunctionsProvider.self, + in: app.container) + return provider.functions(for: app, + region: FunctionsConstants.defaultRegion, + customDomain: customDomain, + type: self) } internal convenience init(app: FirebaseApp, region: String, customDomain: String?) { - // TODO: "Should be fetched from the App's component container instead. - /* - id provider = FIR_COMPONENT(FIRFunctionsProvider, app.container); - return [provider functionsForApp:app region:region customDomain:customDomain type:[self class]]; - */ + // TODO: These are not optionals, but they should be. + let auth = ComponentType.instance(for: AuthInterop.self, in: app.container) + let messaging = ComponentType.instance(for: MessagingInterop.self, + in: app.container) + let appCheck = ComponentType.instance(for: AppCheckInterop.self, + in: app.container) + guard let projectID = app.options.projectID else { fatalError("Firebase Functions requires the projectID to be set in the App's Options.") } self.init(projectID: projectID, + region: region, customDomain: customDomain, - // TODO: Get this out of the app. - auth: nil, - messaging: nil, - appCheck: nil) + auth: auth, + messaging: messaging, + appCheck: appCheck) } @objc internal init(projectID: String, @@ -163,7 +184,7 @@ private enum Constants { emulatorOrigin = origin } - // MARK: - Private Funcs + // MARK: - Private Funcs (or Internal for tests) internal func urlWithName(_ name: String) -> String { assert(!name.isEmpty, "Name cannot be empty") diff --git a/FirebaseFunctionsSwift/Sources/FunctionsComponent.swift b/FirebaseFunctionsSwift/Sources/FunctionsComponent.swift new file mode 100644 index 0000000000..7e2829c05e --- /dev/null +++ b/FirebaseFunctionsSwift/Sources/FunctionsComponent.swift @@ -0,0 +1,100 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import Foundation +import FirebaseCore +import FirebaseCoreInternal + +@objc(FIRFunctionsProvider) +protocol FunctionsProvider { + @objc func functions(for app: FirebaseApp, + region: String?, + customDomain: String?, + type: AnyClass) -> Functions + // TODO: See if we can avoid the `type` parameter by either making it a `Functions` argument to + // allow subclasses, or avoid it entirely and fix tests. This was done for FunctionsCombineUnit, + // although we may be able to now port to using `@testable` instead of using the mock. +} + +@objc class FunctionsComponent: NSObject, Library, FunctionsProvider { + // MARK: - Private Variables + + /// The app associated with all functions instances in this container. + private let app: FirebaseApp + + /// A map of active instances, grouped by app. Keys are FirebaseApp names and values are arrays + /// containing all instances of Functions associated with the given app. + private var instances: [String: [Functions]] = [:] + + /// Lock to manage access to the instances array to avoid race conditions. + private var instancesLock: os_unfair_lock = .init() + + // MARK: - Initializers + + required init(app: FirebaseApp) { + self.app = app + } + + // MARK: - Library conformance + + static func componentsToRegister() -> [Component] { + // TODO: We don't actually add a dependency on FCM or AppCheck here even though it's used.. is + // that okay? + // TODO: Get Auth Interop Working, we need the type. +// let authInterop = Dependency(with: AuthProvider.self, isRequired: false) + return [Component(FunctionsProvider.self, + instantiationTiming: .lazy, + dependencies: [ /* authInterop */ ]) { container, isCacheable in + guard let app = container.app else { return nil } + isCacheable.pointee = true + return self.init(app: app) + }] + } + + // MARK: - FunctionsProvider conformance + + func functions(for app: FirebaseApp, + region: String?, + customDomain: String?, + type: AnyClass) -> Functions { + os_unfair_lock_lock(&instancesLock) + + // Unlock before the function returns. + defer { os_unfair_lock_unlock(&instancesLock) } + + if let associatedInstances = instances[app.name] { + for instance in associatedInstances { + // Domains may be nil, so handle with care. + var equalDomains = false + if let instanceCustomDomain = instance.customDomain { + equalDomains = instanceCustomDomain == customDomain + } else { + equalDomains = customDomain == nil + } + + // Check if it's a match. + if instance.region == region, equalDomains { + return instance + } + } + } + + let newInstance = Functions(app: app, + region: region ?? FunctionsConstants.defaultRegion, + customDomain: customDomain) + let existingInstances = instances[app.name, default: []] + instances[app.name] = existingInstances + [newInstance] + return newInstance + } +} diff --git a/FirebaseFunctionsSwift/Sources/FunctionsProvider.swift b/FirebaseFunctionsSwift/Sources/FunctionsProvider.swift deleted file mode 100644 index 107c727e7e..0000000000 --- a/FirebaseFunctionsSwift/Sources/FunctionsProvider.swift +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2022 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import Foundation - -@objc protocol FunctionsProvider {} diff --git a/FirebaseFunctionsSwift/Tests/ObjCIntegration/FIRIntegrationTests.m b/FirebaseFunctionsSwift/Tests/ObjCIntegration/FIRIntegrationTests.m index 996e05cbd6..ff37f89cc0 100644 --- a/FirebaseFunctionsSwift/Tests/ObjCIntegration/FIRIntegrationTests.m +++ b/FirebaseFunctionsSwift/Tests/ObjCIntegration/FIRIntegrationTests.m @@ -14,7 +14,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseFunctionsSwift/Tests/ObjCIntegration/FIRFunctions+Internal.h" @import FirebaseFunctionsSwift; diff --git a/FirebaseInAppMessaging.podspec b/FirebaseInAppMessaging.podspec index 107547f732..51888568e3 100644 --- a/FirebaseInAppMessaging.podspec +++ b/FirebaseInAppMessaging.podspec @@ -38,7 +38,7 @@ See more product details at https://firebase.google.com/products/in-app-messagin base_dir + "Sources/Util/**/*.[cmh]", 'Interop/Analytics/Public/*.h', 'FirebaseABTesting/Sources/Private/*.h', - 'FirebaseCore/Sources/Private/*.h', + 'FirebaseCore/Internal/*.h', 'FirebaseInstallations/Source/Library/Private/*.h', ] @@ -55,7 +55,7 @@ See more product details at https://firebase.google.com/products/in-app-messagin base_dir + "Sources/Util/**/*.[cmh]", 'Interop/Analytics/Public/*.h', 'FirebaseABTesting/Sources/Private/*.h', - 'FirebaseCore/Sources/Private/*.h', + 'FirebaseCore/Internal/*.h', 'FirebaseInstallations/Source/Library/Private/*.h', ] diff --git a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.m b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.m index b457a61ed0..5d38c41ad9 100644 --- a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.m +++ b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.m @@ -19,7 +19,7 @@ #import "FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h" #import "FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClearcutLogger.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" diff --git a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutHttpRequestSender.m b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutHttpRequestSender.m index dd01e7eb6f..5ffe8bcc19 100644 --- a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutHttpRequestSender.m +++ b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutHttpRequestSender.m @@ -17,7 +17,7 @@ #import #if TARGET_OS_IOS || TARGET_OS_TV -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutHttpRequestSender.h" #import "FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.h" diff --git a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.m b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.m index 61a44f3549..d6fc626b1f 100644 --- a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.m +++ b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.m @@ -19,7 +19,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.h" #import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h" diff --git a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogger.m b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogger.m index 4709711e6e..1f1c9d5b98 100644 --- a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogger.m +++ b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogger.m @@ -17,7 +17,7 @@ #import #if TARGET_OS_IOS || TARGET_OS_TV -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.h" #import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h" diff --git a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutUploader.m b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutUploader.m index 4b06ed9e71..6679841d50 100644 --- a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutUploader.m +++ b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutUploader.m @@ -18,7 +18,7 @@ #if TARGET_OS_IOS || TARGET_OS_TV #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h" #import "FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClearcutUploader.h" diff --git a/FirebaseInAppMessaging/Sources/Data/FIRIAMFetchResponseParser.m b/FirebaseInAppMessaging/Sources/Data/FIRIAMFetchResponseParser.m index 3a087bd3cd..db1fab1343 100644 --- a/FirebaseInAppMessaging/Sources/Data/FIRIAMFetchResponseParser.m +++ b/FirebaseInAppMessaging/Sources/Data/FIRIAMFetchResponseParser.m @@ -17,7 +17,7 @@ #import #if TARGET_OS_IOS || TARGET_OS_TV -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h" #import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMFetchResponseParser.h" diff --git a/FirebaseInAppMessaging/Sources/Data/FIRIAMMessageContentDataWithImageURL.m b/FirebaseInAppMessaging/Sources/Data/FIRIAMMessageContentDataWithImageURL.m index db828981c9..15a261cdd1 100644 --- a/FirebaseInAppMessaging/Sources/Data/FIRIAMMessageContentDataWithImageURL.m +++ b/FirebaseInAppMessaging/Sources/Data/FIRIAMMessageContentDataWithImageURL.m @@ -17,7 +17,7 @@ #import #if TARGET_OS_IOS || TARGET_OS_TV -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h" #import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageContentData.h" diff --git a/FirebaseInAppMessaging/Sources/DefaultUI/FIRCore+InAppMessagingDisplay.h b/FirebaseInAppMessaging/Sources/DefaultUI/FIRCore+InAppMessagingDisplay.h index 26ea585d36..b3f08897a4 100644 --- a/FirebaseInAppMessaging/Sources/DefaultUI/FIRCore+InAppMessagingDisplay.h +++ b/FirebaseInAppMessaging/Sources/DefaultUI/FIRCore+InAppMessagingDisplay.h @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" // This file contains declarations that should go into FirebaseCore when // Firebase InAppMessagingDisplay is merged into master. Keep them separate now to help diff --git a/FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMDefaultDisplayImpl.m b/FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMDefaultDisplayImpl.m index a339ff2d2a..2ed7359cb6 100644 --- a/FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMDefaultDisplayImpl.m +++ b/FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMDefaultDisplayImpl.m @@ -17,7 +17,7 @@ #import #if TARGET_OS_IOS -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInAppMessaging/Sources/DefaultUI/Banner/FIRIAMBannerViewController.h" #import "FirebaseInAppMessaging/Sources/DefaultUI/Card/FIRIAMCardViewController.h" diff --git a/FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h b/FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h index 2d3a7a283d..46a2bd751d 100644 --- a/FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h +++ b/FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" // This file contains declarations that should go into FirebaseCore when // Firebase InAppMessaging is merged into master. Keep them separate now to help diff --git a/FirebaseInAppMessaging/Sources/FIRInAppMessaging.m b/FirebaseInAppMessaging/Sources/FIRInAppMessaging.m index 379ec11f21..44c58a31c5 100644 --- a/FirebaseInAppMessaging/Sources/FIRInAppMessaging.m +++ b/FirebaseInAppMessaging/Sources/FIRInAppMessaging.m @@ -21,7 +21,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" diff --git a/FirebaseInAppMessaging/Sources/FIRInAppMessagingPrivate.h b/FirebaseInAppMessaging/Sources/FIRInAppMessagingPrivate.h index b3f6520780..5630529aab 100644 --- a/FirebaseInAppMessaging/Sources/FIRInAppMessagingPrivate.h +++ b/FirebaseInAppMessaging/Sources/FIRInAppMessagingPrivate.h @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h" #import "FirebaseInAppMessaging/Sources/Public/FirebaseInAppMessaging/FIRInAppMessaging.h" diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMActivityLogger.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMActivityLogger.m index 9239b7dcfc..2e8fcd2bdd 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMActivityLogger.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMActivityLogger.m @@ -19,7 +19,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h" #import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMActivityLogger.h" diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMBookKeeper.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMBookKeeper.m index ef8ef03dfc..12d1fce86e 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMBookKeeper.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMBookKeeper.m @@ -17,7 +17,7 @@ #import #if TARGET_OS_IOS || TARGET_OS_TV -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h" #import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMBookKeeper.h" diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMClientInfoFetcher.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMClientInfoFetcher.m index ccaf21707b..31fdbd3bc6 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMClientInfoFetcher.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMClientInfoFetcher.m @@ -17,7 +17,7 @@ #import #if TARGET_OS_IOS || TARGET_OS_TV -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h" #import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h" diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnAnalyticEventsFlow.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnAnalyticEventsFlow.m index c9bbd24803..6bf04a072f 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnAnalyticEventsFlow.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnAnalyticEventsFlow.m @@ -17,7 +17,7 @@ #import #if TARGET_OS_IOS || TARGET_OS_TV -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" #import "Interop/Analytics/Public/FIRAnalyticsInteropListener.h" diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnAppForegroundFlow.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnAppForegroundFlow.m index bcbb3ebd9c..85fdc09edc 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnAppForegroundFlow.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnAppForegroundFlow.m @@ -17,7 +17,7 @@ #import #if TARGET_OS_IOS || TARGET_OS_TV -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h" #import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayCheckOnAppForegroundFlow.h" diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnFetchDoneNotificationFlow.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnFetchDoneNotificationFlow.m index 17fb1af37e..327d2436f6 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnFetchDoneNotificationFlow.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnFetchDoneNotificationFlow.m @@ -17,7 +17,7 @@ #import #if TARGET_OS_IOS || TARGET_OS_TV -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h" diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayExecutor.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayExecutor.m index 459db69684..8fcb8afe95 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayExecutor.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayExecutor.m @@ -18,7 +18,7 @@ #if TARGET_OS_IOS || TARGET_OS_TV #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h" #import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageContentData.h" diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMFetchFlow.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMFetchFlow.m index b0b94a9139..daa75515a2 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMFetchFlow.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMFetchFlow.m @@ -17,7 +17,7 @@ #import #if TARGET_OS_IOS || TARGET_OS_TV -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h" #import "FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClearcutLogger.h" diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMFetchOnAppForegroundFlow.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMFetchOnAppForegroundFlow.m index 4e105374dc..184d5fd05e 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMFetchOnAppForegroundFlow.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMFetchOnAppForegroundFlow.m @@ -17,7 +17,7 @@ #import #if TARGET_OS_IOS || TARGET_OS_TV -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h" #import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMFetchOnAppForegroundFlow.h" diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMMessageClientCache.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMMessageClientCache.m index 8d59ce5047..1c43d55707 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMMessageClientCache.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMMessageClientCache.m @@ -17,7 +17,7 @@ #import #if TARGET_OS_IOS || TARGET_OS_TV -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h" #import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMFetchResponseParser.h" diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMMsgFetcherUsingRestful.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMMsgFetcherUsingRestful.m index e11d1b4993..8ae14d3308 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMMsgFetcherUsingRestful.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMMsgFetcherUsingRestful.m @@ -17,7 +17,7 @@ #import #if TARGET_OS_IOS || TARGET_OS_TV -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h" #import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMFetchResponseParser.h" diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMServerMsgFetchStorage.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMServerMsgFetchStorage.m index d9153351f1..eeef4572b3 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMServerMsgFetchStorage.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMServerMsgFetchStorage.m @@ -17,7 +17,7 @@ #import #if TARGET_OS_IOS || TARGET_OS_TV -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h" #import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMServerMsgFetchStorage.h" diff --git a/FirebaseInAppMessaging/Sources/Runtime/FIRIAMRuntimeManager.m b/FirebaseInAppMessaging/Sources/Runtime/FIRIAMRuntimeManager.m index 2b96c1c9f8..995dc57adf 100644 --- a/FirebaseInAppMessaging/Sources/Runtime/FIRIAMRuntimeManager.m +++ b/FirebaseInAppMessaging/Sources/Runtime/FIRIAMRuntimeManager.m @@ -17,7 +17,7 @@ #import #if TARGET_OS_IOS || TARGET_OS_TV -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.h" #import "FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutHttpRequestSender.h" diff --git a/FirebaseInAppMessaging/Sources/Runtime/FIRIAMSDKModeManager.m b/FirebaseInAppMessaging/Sources/Runtime/FIRIAMSDKModeManager.m index c9ea7de9c8..b79da4b435 100644 --- a/FirebaseInAppMessaging/Sources/Runtime/FIRIAMSDKModeManager.m +++ b/FirebaseInAppMessaging/Sources/Runtime/FIRIAMSDKModeManager.m @@ -17,7 +17,7 @@ #import #if TARGET_OS_IOS || TARGET_OS_TV -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h" #import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMSDKModeManager.h" diff --git a/FirebaseInAppMessaging/Sources/Runtime/FIRInAppMessaging+Bootstrap.m b/FirebaseInAppMessaging/Sources/Runtime/FIRInAppMessaging+Bootstrap.m index 7e3c6103e8..0132018e58 100644 --- a/FirebaseInAppMessaging/Sources/Runtime/FIRInAppMessaging+Bootstrap.m +++ b/FirebaseInAppMessaging/Sources/Runtime/FIRInAppMessaging+Bootstrap.m @@ -20,7 +20,7 @@ #import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRInAppMessaging+Bootstrap.h" #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" #import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h" diff --git a/FirebaseInstallations.podspec b/FirebaseInstallations.podspec index 90230a65bb..4c25420b90 100644 --- a/FirebaseInstallations.podspec +++ b/FirebaseInstallations.podspec @@ -33,7 +33,7 @@ Pod::Spec.new do |s| base_dir = "FirebaseInstallations/Source/" s.source_files = [ base_dir + 'Library/**/*.[mh]', - 'FirebaseCore/Sources/Private/*.h', + 'FirebaseCore/Internal/*.h', ] s.public_header_files = [ base_dir + 'Library/Public/FirebaseInstallations/*.h', diff --git a/FirebaseInstallations/Source/Library/FIRInstallations.m b/FirebaseInstallations/Source/Library/FIRInstallations.m index 9c3b900537..ee8c236560 100644 --- a/FirebaseInstallations/Source/Library/FIRInstallations.m +++ b/FirebaseInstallations/Source/Library/FIRInstallations.m @@ -22,7 +22,7 @@ #import "FBLPromises.h" #endif -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInstallations/Source/Library/FIRInstallationsAuthTokenResultInternal.h" diff --git a/FirebaseInstallations/Source/Library/FIRInstallationsLogger.h b/FirebaseInstallations/Source/Library/FIRInstallationsLogger.h index 8e7c9b288a..36b0a2cd2b 100644 --- a/FirebaseInstallations/Source/Library/FIRInstallationsLogger.h +++ b/FirebaseInstallations/Source/Library/FIRInstallationsLogger.h @@ -16,7 +16,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" extern FIRLoggerService kFIRLoggerInstallations; diff --git a/FirebaseInstallations/Source/Library/InstallationsAPI/FIRInstallationsAPIService.m b/FirebaseInstallations/Source/Library/InstallationsAPI/FIRInstallationsAPIService.m index c520a2f9b2..fd2fffe7a1 100644 --- a/FirebaseInstallations/Source/Library/InstallationsAPI/FIRInstallationsAPIService.m +++ b/FirebaseInstallations/Source/Library/InstallationsAPI/FIRInstallationsAPIService.m @@ -22,7 +22,7 @@ #import "FBLPromises.h" #endif -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #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 index ea2128ea1f..09167b9f60 100644 --- a/FirebaseInstallations/Source/Library/InstallationsIDController/FIRInstallationsIDController.m +++ b/FirebaseInstallations/Source/Library/InstallationsIDController/FIRInstallationsIDController.m @@ -23,7 +23,7 @@ #endif #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInstallations/Source/Library/Errors/FIRInstallationsErrorUtil.h" #import "FirebaseInstallations/Source/Library/FIRInstallationsItem.h" diff --git a/FirebaseInstallations/Source/Tests/Integration/FIRInstallationsIntegrationTests.m b/FirebaseInstallations/Source/Tests/Integration/FIRInstallationsIntegrationTests.m index 4af0202fc5..35b4ec35cc 100644 --- a/FirebaseInstallations/Source/Tests/Integration/FIRInstallationsIntegrationTests.m +++ b/FirebaseInstallations/Source/Tests/Integration/FIRInstallationsIntegrationTests.m @@ -26,7 +26,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #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 index 15e9e2e112..a66686e3c5 100644 --- a/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsAPIServiceTests.m +++ b/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsAPIServiceTests.m @@ -25,7 +25,7 @@ #import "FirebaseInstallations/Source/Library/InstallationsAPI/FIRInstallationsAPIService.h" #import "FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStoredAuthToken.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" typedef FBLPromise * (^FIRInstallationsAPIServiceTask)(void); diff --git a/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsIDControllerTests.m b/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsIDControllerTests.m index 63128b5bea..325711e881 100644 --- a/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsIDControllerTests.m +++ b/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsIDControllerTests.m @@ -18,7 +18,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FBLPromise+Testing.h" #import "FBLPromise+Then.h" diff --git a/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsTests.m b/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsTests.m index 8bd9731328..31bc27e2c5 100644 --- a/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsTests.m +++ b/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsTests.m @@ -19,7 +19,7 @@ #import #import "FBLPromise+Testing.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #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 index 7635857592..fa9e308bac 100644 --- 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/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStoredAuthToken.h" diff --git a/FirebaseMessaging.podspec b/FirebaseMessaging.podspec index 338f1a5dd7..fc0cc26aaa 100644 --- a/FirebaseMessaging.podspec +++ b/FirebaseMessaging.podspec @@ -38,7 +38,7 @@ device, and it is completely free. base_dir + 'Sources/**/*', base_dir + 'Sources/Protogen/nanopb/*.h', 'Interop/Analytics/Public/*.h', - 'FirebaseCore/Sources/Private/*.h', + 'FirebaseCore/Internal/*.h', 'FirebaseInstallations/Source/Library/Private/*.h', ] s.public_header_files = base_dir + 'Sources/Public/FirebaseMessaging/*.h' diff --git a/FirebaseMessaging/Sources/FIRMessaging.m b/FirebaseMessaging/Sources/FIRMessaging.m index d969e03111..d9837f9df4 100644 --- a/FirebaseMessaging/Sources/FIRMessaging.m +++ b/FirebaseMessaging/Sources/FIRMessaging.m @@ -24,7 +24,7 @@ #import #import #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h" #import "FirebaseMessaging/Sources/FIRMessagingAnalytics.h" #import "FirebaseMessaging/Sources/FIRMessagingCode.h" diff --git a/FirebaseMessaging/Sources/FIRMessagingLogger.m b/FirebaseMessaging/Sources/FIRMessagingLogger.m index 57fb1068e2..8e63500ad7 100644 --- a/FirebaseMessaging/Sources/FIRMessagingLogger.m +++ b/FirebaseMessaging/Sources/FIRMessagingLogger.m @@ -16,7 +16,7 @@ #import "FirebaseMessaging/Sources/FIRMessagingLogger.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" FIRLoggerService kFIRLoggerMessaging = @"[Firebase/Messaging]"; diff --git a/FirebaseMessaging/Sources/FIRMessagingUtilities.m b/FirebaseMessaging/Sources/FIRMessagingUtilities.m index 3d6dfa549e..08d8f046e8 100644 --- a/FirebaseMessaging/Sources/FIRMessagingUtilities.m +++ b/FirebaseMessaging/Sources/FIRMessagingUtilities.m @@ -18,7 +18,7 @@ #import #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseMessaging/Sources/FIRMessagingLogger.h" static const uint64_t kBytesToMegabytesDivisor = 1024 * 1024LL; diff --git a/FirebaseMessaging/Sources/Token/FIRMessagingTokenFetchOperation.m b/FirebaseMessaging/Sources/Token/FIRMessagingTokenFetchOperation.m index f98a3cc8db..b0a527d324 100644 --- a/FirebaseMessaging/Sources/Token/FIRMessagingTokenFetchOperation.m +++ b/FirebaseMessaging/Sources/Token/FIRMessagingTokenFetchOperation.m @@ -25,7 +25,7 @@ #import "FirebaseMessaging/Sources/Token/FIRMessagingCheckinPreferences.h" #import "FirebaseMessaging/Sources/Token/FIRMessagingTokenOperation.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" // We can have a static int since this error should theoretically only // happen once (for the first time). If it repeats there is something diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingHandlingTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingHandlingTest.m index 0fa257acd7..500ff56a0a 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingHandlingTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingHandlingTest.m @@ -19,7 +19,7 @@ #import #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessaging.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTest.m index 303858ff98..2d3946267c 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTest.m @@ -18,7 +18,7 @@ #import #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseMessaging/Sources/FIRMessaging_Private.h" #import "FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessaging.h" #import "FirebaseMessaging/Sources/Token/FIRMessagingTokenManager.h" diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTestUtilities.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTestUtilities.m index 0c2eb524ca..9679ff28a8 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTestUtilities.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTestUtilities.m @@ -17,7 +17,7 @@ #import #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h" #import "FirebaseMessaging/Sources/FIRMessagingPubSub.h" #import "FirebaseMessaging/Sources/FIRMessagingRmqManager.h" diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenInfoTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenInfoTest.m index 78286a4d96..add12c306b 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenInfoTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenInfoTest.m @@ -19,7 +19,7 @@ #import #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseMessaging/Sources/FIRMessagingUtilities.h" #import "FirebaseMessaging/Sources/Token/FIRMessagingAPNSInfo.h" diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenOperationsTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenOperationsTest.m index e48bdeadc7..9cb96529ed 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenOperationsTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenOperationsTest.m @@ -18,7 +18,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h" #import "FirebaseMessaging/Sources/FIRMessagingConstants.h" #import "FirebaseMessaging/Sources/NSError+FIRMessaging.h" diff --git a/FirebasePerformance.podspec b/FirebasePerformance.podspec index 3331afef1a..4010e7691f 100644 --- a/FirebasePerformance.podspec +++ b/FirebasePerformance.podspec @@ -29,7 +29,7 @@ Firebase Performance library to measure performance of Mobile and Web Apps. base_dir = "FirebasePerformance/" s.source_files = [ base_dir + 'Sources/**/*.[cmh]', - 'FirebaseCore/Sources/Private/*.h', + 'FirebaseCore/Internal/*.h', 'FirebaseInstallations/Source/Library/Private/*.h', 'FirebaseRemoteConfig/Sources/Private/*.h', ] diff --git a/FirebasePerformance/Sources/Configurations/FPRConfigurations.m b/FirebasePerformance/Sources/Configurations/FPRConfigurations.m index e5a3e676d6..0996b25756 100644 --- a/FirebasePerformance/Sources/Configurations/FPRConfigurations.m +++ b/FirebasePerformance/Sources/Configurations/FPRConfigurations.m @@ -21,7 +21,7 @@ #import "FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags+Private.h" #import "FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" FPRConfigName kFPRConfigDataCollectionEnabled = @"dataCollectionEnabled"; diff --git a/FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags.m b/FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags.m index f11fb62a24..86d56879a0 100644 --- a/FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags.m +++ b/FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags.m @@ -19,7 +19,7 @@ #import "FirebasePerformance/Sources/FPRConsoleLogger.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #define ONE_DAY_SECONDS 24 * 60 * 60 diff --git a/FirebasePerformance/Sources/FPRClient.m b/FirebasePerformance/Sources/FPRClient.m index 83d4d21237..2f9bcc6879 100644 --- a/FirebasePerformance/Sources/FPRClient.m +++ b/FirebasePerformance/Sources/FPRClient.m @@ -33,7 +33,7 @@ #import "FirebasePerformance/Sources/Public/FirebasePerformance/FIRPerformance.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" @interface FPRClient () diff --git a/FirebasePerformance/Sources/FPRConsoleLogger.h b/FirebasePerformance/Sources/FPRConsoleLogger.h index 2b04824d4e..a688e5f1be 100644 --- a/FirebasePerformance/Sources/FPRConsoleLogger.h +++ b/FirebasePerformance/Sources/FPRConsoleLogger.h @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "FirebaseCore/Sources/Private/FIRLogger.h" +#import "FirebaseCore/Internal/FIRLogger.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebasePerformance/Tests/Unit/FIRPerformanceTest.m b/FirebasePerformance/Tests/Unit/FIRPerformanceTest.m index 10e7ce75a9..d885ba3968 100644 --- a/FirebasePerformance/Tests/Unit/FIRPerformanceTest.m +++ b/FirebasePerformance/Tests/Unit/FIRPerformanceTest.m @@ -26,7 +26,7 @@ #import "FirebasePerformance/Tests/Unit/FPRTestCase.h" -#import "FirebaseCore/Sources/Private/FIRAppInternal.h" +#import "FirebaseCore/Internal/FIRAppInternal.h" @interface FIRPerformanceTest : FPRTestCase diff --git a/FirebasePerformance/Tests/Unit/FPRAppActivityTrackerTest.m b/FirebasePerformance/Tests/Unit/FPRAppActivityTrackerTest.m index bed1ce0c28..727e07a333 100644 --- a/FirebasePerformance/Tests/Unit/FPRAppActivityTrackerTest.m +++ b/FirebasePerformance/Tests/Unit/FPRAppActivityTrackerTest.m @@ -20,7 +20,7 @@ #import "FirebasePerformance/Tests/Unit/FPRTestCase.h" -#import "FirebaseCore/Sources/Private/FIRAppInternal.h" +#import "FirebaseCore/Internal/FIRAppInternal.h" #import diff --git a/FirebasePerformance/Tests/Unit/Fakes/FIRAppFake.h b/FirebasePerformance/Tests/Unit/Fakes/FIRAppFake.h index 708ffbe401..8e6cdc4242 100644 --- a/FirebasePerformance/Tests/Unit/Fakes/FIRAppFake.h +++ b/FirebasePerformance/Tests/Unit/Fakes/FIRAppFake.h @@ -14,7 +14,7 @@ #import -#import "FirebaseCore/Sources/Private/FIRAppInternal.h" +#import "FirebaseCore/Internal/FIRAppInternal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebasePerformance/Tests/Unit/Fakes/FIRAppFake.m b/FirebasePerformance/Tests/Unit/Fakes/FIRAppFake.m index ba8a73d1eb..137798e763 100644 --- a/FirebasePerformance/Tests/Unit/Fakes/FIRAppFake.m +++ b/FirebasePerformance/Tests/Unit/Fakes/FIRAppFake.m @@ -14,7 +14,7 @@ #import "FirebasePerformance/Tests/Unit/Fakes/FIRAppFake.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" @implementation FIRAppFake diff --git a/FirebaseRemoteConfig.podspec b/FirebaseRemoteConfig.podspec index 8d5982959f..2e16ae480d 100644 --- a/FirebaseRemoteConfig.podspec +++ b/FirebaseRemoteConfig.podspec @@ -36,7 +36,7 @@ app update. base_dir + '**/*.[mh]', 'Interop/Analytics/Public/*.h', 'FirebaseABTesting/Sources/Private/*.h', - 'FirebaseCore/Sources/Private/*.h', + 'FirebaseCore/Internal/*.h', 'FirebaseInstallations/Source/Library/Private/*.h', ] s.public_header_files = base_dir + 'Public/FirebaseRemoteConfig/*.h' diff --git a/FirebaseRemoteConfig/Sources/FIRConfigValue.m b/FirebaseRemoteConfig/Sources/FIRConfigValue.m index 11348adbb7..33b968b0c8 100644 --- a/FirebaseRemoteConfig/Sources/FIRConfigValue.m +++ b/FirebaseRemoteConfig/Sources/FIRConfigValue.m @@ -16,7 +16,7 @@ #import "FirebaseRemoteConfig/Sources/Public/FirebaseRemoteConfig/FIRRemoteConfig.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseRemoteConfig/Sources/RCNConfigValue_Internal.h" @implementation FIRRemoteConfigValue { diff --git a/FirebaseRemoteConfig/Sources/FIRRemoteConfig.m b/FirebaseRemoteConfig/Sources/FIRRemoteConfig.m index a293ce1ee9..72e391205a 100644 --- a/FirebaseRemoteConfig/Sources/FIRRemoteConfig.m +++ b/FirebaseRemoteConfig/Sources/FIRRemoteConfig.m @@ -17,7 +17,7 @@ #import "FirebaseRemoteConfig/Sources/Public/FirebaseRemoteConfig/FIRRemoteConfig.h" #import "FirebaseABTesting/Sources/Private/FirebaseABTestingInternal.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.h" #import "FirebaseRemoteConfig/Sources/Private/FIRRemoteConfig_Private.h" #import "FirebaseRemoteConfig/Sources/Private/RCNConfigFetch.h" diff --git a/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.h b/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.h index f31d5c4e64..59d896f7c9 100644 --- a/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.h +++ b/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.h @@ -16,7 +16,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" @class FIRApp; @class FIRRemoteConfig; diff --git a/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.m b/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.m index c67242a3ed..2a696bc646 100644 --- a/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.m +++ b/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.m @@ -16,7 +16,7 @@ #import "FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseRemoteConfig/Sources/Private/FIRRemoteConfig_Private.h" #import "FirebaseRemoteConfig/Sources/RCNConfigContent.h" #import "FirebaseRemoteConfig/Sources/RCNConfigDBManager.h" diff --git a/FirebaseRemoteConfig/Sources/RCNConfigContent.m b/FirebaseRemoteConfig/Sources/RCNConfigContent.m index a4af287370..abca77fecf 100644 --- a/FirebaseRemoteConfig/Sources/RCNConfigContent.m +++ b/FirebaseRemoteConfig/Sources/RCNConfigContent.m @@ -22,7 +22,7 @@ #import "FirebaseRemoteConfig/Sources/RCNConfigDefines.h" #import "FirebaseRemoteConfig/Sources/RCNConfigValue_Internal.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" @implementation RCNConfigContent { /// Active config data that is currently used. diff --git a/FirebaseRemoteConfig/Sources/RCNConfigDBManager.m b/FirebaseRemoteConfig/Sources/RCNConfigDBManager.m index 015e63ef29..294ebe236f 100644 --- a/FirebaseRemoteConfig/Sources/RCNConfigDBManager.m +++ b/FirebaseRemoteConfig/Sources/RCNConfigDBManager.m @@ -20,7 +20,7 @@ #import "FirebaseRemoteConfig/Sources/RCNConfigDefines.h" #import "FirebaseRemoteConfig/Sources/RCNConfigValue_Internal.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" /// Using macro for securely preprocessing string concatenation in query before runtime. #define RCNTableNameMain "main" diff --git a/FirebaseRemoteConfig/Sources/RCNConfigExperiment.m b/FirebaseRemoteConfig/Sources/RCNConfigExperiment.m index a51190e46a..55b9806a46 100644 --- a/FirebaseRemoteConfig/Sources/RCNConfigExperiment.m +++ b/FirebaseRemoteConfig/Sources/RCNConfigExperiment.m @@ -17,7 +17,7 @@ #import "FirebaseRemoteConfig/Sources/RCNConfigExperiment.h" #import "FirebaseABTesting/Sources/Private/FirebaseABTestingInternal.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseRemoteConfig/Sources/RCNConfigDBManager.h" #import "FirebaseRemoteConfig/Sources/RCNConfigDefines.h" diff --git a/FirebaseRemoteConfig/Sources/RCNConfigFetch.m b/FirebaseRemoteConfig/Sources/RCNConfigFetch.m index f991662a0b..e9ca1f894f 100644 --- a/FirebaseRemoteConfig/Sources/RCNConfigFetch.m +++ b/FirebaseRemoteConfig/Sources/RCNConfigFetch.m @@ -17,7 +17,7 @@ #import "FirebaseRemoteConfig/Sources/Private/RCNConfigFetch.h" #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h" #import "FirebaseRemoteConfig/Sources/Private/RCNConfigSettings.h" #import "FirebaseRemoteConfig/Sources/RCNConfigConstants.h" diff --git a/FirebaseRemoteConfig/Sources/RCNConfigSettings.m b/FirebaseRemoteConfig/Sources/RCNConfigSettings.m index 989deda4bb..f26a404b9f 100644 --- a/FirebaseRemoteConfig/Sources/RCNConfigSettings.m +++ b/FirebaseRemoteConfig/Sources/RCNConfigSettings.m @@ -23,7 +23,7 @@ #import "FirebaseRemoteConfig/Sources/RCNUserDefaultsManager.h" #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" static NSString *const kRCNGroupPrefix = @"frc.group."; static NSString *const kRCNUserDefaultsKeyNamelastETag = @"lastETag"; diff --git a/FirebaseRemoteConfig/Sources/RCNDevice.m b/FirebaseRemoteConfig/Sources/RCNDevice.m index 29bef6b10b..c6cfee6361 100644 --- a/FirebaseRemoteConfig/Sources/RCNDevice.m +++ b/FirebaseRemoteConfig/Sources/RCNDevice.m @@ -19,7 +19,7 @@ #import #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseRemoteConfig/Sources/Private/RCNConfigSettings.h" #import "FirebaseRemoteConfig/Sources/RCNConfigConstants.h" diff --git a/FirebaseRemoteConfig/Sources/RCNUserDefaultsManager.m b/FirebaseRemoteConfig/Sources/RCNUserDefaultsManager.m index 744ed1739a..b6bdb0525f 100644 --- a/FirebaseRemoteConfig/Sources/RCNUserDefaultsManager.m +++ b/FirebaseRemoteConfig/Sources/RCNUserDefaultsManager.m @@ -15,7 +15,7 @@ */ #import "FirebaseRemoteConfig/Sources/RCNUserDefaultsManager.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseRemoteConfig/Sources/Public/FirebaseRemoteConfig/FIRRemoteConfig.h" static NSString *const kRCNGroupPrefix = @"group"; diff --git a/FirebaseRemoteConfig/Tests/Unit/FIRRemoteConfigComponentTest.m b/FirebaseRemoteConfig/Tests/Unit/FIRRemoteConfigComponentTest.m index 976ca0204f..96c1ad5414 100644 --- a/FirebaseRemoteConfig/Tests/Unit/FIRRemoteConfigComponentTest.m +++ b/FirebaseRemoteConfig/Tests/Unit/FIRRemoteConfigComponentTest.m @@ -16,7 +16,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.h" #import "FirebaseRemoteConfig/Sources/Private/FIRRemoteConfig_Private.h" #import "FirebaseRemoteConfig/Tests/Unit/RCNTestUtilities.h" diff --git a/FirebaseRemoteConfig/Tests/Unit/RCNConfigDBManagerTest.m b/FirebaseRemoteConfig/Tests/Unit/RCNConfigDBManagerTest.m index abc6424168..041b74bc56 100644 --- a/FirebaseRemoteConfig/Tests/Unit/RCNConfigDBManagerTest.m +++ b/FirebaseRemoteConfig/Tests/Unit/RCNConfigDBManagerTest.m @@ -19,7 +19,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseRemoteConfig/Sources/Private/RCNConfigSettings.h" #import "FirebaseRemoteConfig/Sources/RCNConfigConstants.h" #import "FirebaseRemoteConfig/Sources/RCNConfigContent.h" diff --git a/FirebaseRemoteConfig/Tests/Unit/RCNInstanceIDTest.m b/FirebaseRemoteConfig/Tests/Unit/RCNInstanceIDTest.m index 3500edbe6d..d98fb552d1 100644 --- a/FirebaseRemoteConfig/Tests/Unit/RCNInstanceIDTest.m +++ b/FirebaseRemoteConfig/Tests/Unit/RCNInstanceIDTest.m @@ -27,7 +27,7 @@ #import "FirebaseRemoteConfig/Tests/Unit/RCNTestUtilities.h" #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h" @interface RCNConfigFetch (ForTest) diff --git a/FirebaseRemoteConfig/Tests/Unit/RCNPersonalizationTest.m b/FirebaseRemoteConfig/Tests/Unit/RCNPersonalizationTest.m index a70764bf5c..70e9327c90 100644 --- a/FirebaseRemoteConfig/Tests/Unit/RCNPersonalizationTest.m +++ b/FirebaseRemoteConfig/Tests/Unit/RCNPersonalizationTest.m @@ -17,7 +17,7 @@ #import #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseRemoteConfig/Sources/Private/FIRRemoteConfig_Private.h" #import "FirebaseRemoteConfig/Sources/Private/RCNConfigFetch.h" #import "FirebaseRemoteConfig/Sources/RCNConfigConstants.h" diff --git a/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfig+FIRAppTest.m b/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfig+FIRAppTest.m index 79d94c8cdf..4a594d5903 100644 --- a/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfig+FIRAppTest.m +++ b/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfig+FIRAppTest.m @@ -18,7 +18,7 @@ #import //#import "FIRRemoteConfig+FIRApp.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseRemoteConfig/Sources/Private/FIRRemoteConfig_Private.h" //#import "third_party/firebase/ios/Releases/FirebaseCore/Tests/FIRTestCase.h" diff --git a/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m b/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m index 72e07a0506..d7a0c13c4e 100644 --- a/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m +++ b/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m @@ -29,7 +29,7 @@ #import "FirebaseRemoteConfig/Tests/Unit/RCNTestUtilities.h" #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" @interface RCNConfigFetch (ForTest) - (instancetype)initWithContent:(RCNConfigContent *)content diff --git a/FirebaseRemoteConfig/Tests/Unit/RCNThrottlingTests.m b/FirebaseRemoteConfig/Tests/Unit/RCNThrottlingTests.m index 7ae3b5c4e5..b3c0173e71 100644 --- a/FirebaseRemoteConfig/Tests/Unit/RCNThrottlingTests.m +++ b/FirebaseRemoteConfig/Tests/Unit/RCNThrottlingTests.m @@ -24,7 +24,7 @@ #import "FirebaseRemoteConfig/Sources/RCNConfigExperiment.h" #import "FirebaseRemoteConfig/Tests/Unit/RCNTestUtilities.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" @interface RCNThrottlingTests : XCTestCase { RCNConfigContent *_configContentMock; diff --git a/FirebaseStorage.podspec b/FirebaseStorage.podspec index 66c2d22faf..1c4289c413 100644 --- a/FirebaseStorage.podspec +++ b/FirebaseStorage.podspec @@ -33,7 +33,7 @@ Firebase Storage provides robust, secure file uploads and downloads from Firebas s.source_files = [ 'FirebaseStorage/Sources/**/*.[mh]', 'Interop/Auth/Public/*.h', - 'FirebaseCore/Sources/Private/*.h', + 'FirebaseCore/Internal/*.h', 'FirebaseAppCheck/Sources/Interop/*.h', ] s.public_header_files = 'FirebaseStorage/Sources/Public/FirebaseStorage/*.h' diff --git a/FirebaseStorage/Sources/FIRStorage.m b/FirebaseStorage/Sources/FIRStorage.m index f3826ebde6..d1b7c72769 100644 --- a/FirebaseStorage/Sources/FIRStorage.m +++ b/FirebaseStorage/Sources/FIRStorage.m @@ -24,7 +24,7 @@ #import "FirebaseStorage/Sources/FIRStorage_Private.h" #import "FirebaseAppCheck/Sources/Interop/FIRAppCheckInterop.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "Interop/Auth/Public/FIRAuthInterop.h" #if SWIFT_PACKAGE diff --git a/FirebaseStorage/Sources/FIRStorageComponent.m b/FirebaseStorage/Sources/FIRStorageComponent.m index 521ffefd1d..8b13bf3287 100644 --- a/FirebaseStorage/Sources/FIRStorageComponent.m +++ b/FirebaseStorage/Sources/FIRStorageComponent.m @@ -17,7 +17,7 @@ #import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorage.h" #import "FirebaseAppCheck/Sources/Interop/FIRAppCheckInterop.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "Interop/Auth/Public/FIRAuthInterop.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseStorage/Sources/FIRStorageLogger.h b/FirebaseStorage/Sources/FIRStorageLogger.h index dba9c93bca..4c9e7bfab5 100644 --- a/FirebaseStorage/Sources/FIRStorageLogger.h +++ b/FirebaseStorage/Sources/FIRStorageLogger.h @@ -16,7 +16,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" extern FIRLoggerService kFIRLoggerStorage; diff --git a/FirebaseStorage/Sources/FIRStorageReference.m b/FirebaseStorage/Sources/FIRStorageReference.m index c69b5ee585..88a9e5bfbb 100644 --- a/FirebaseStorage/Sources/FIRStorageReference.m +++ b/FirebaseStorage/Sources/FIRStorageReference.m @@ -31,7 +31,7 @@ #import "FirebaseStorage/Sources/FIRStorage_Private.h" #import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageTaskSnapshot.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #if SWIFT_PACKAGE @import GTMSessionFetcherCore; diff --git a/FirebaseStorage/Sources/FIRStorageTokenAuthorizer.m b/FirebaseStorage/Sources/FIRStorageTokenAuthorizer.m index 724a1a016b..b5c4ae6e7c 100644 --- a/FirebaseStorage/Sources/FIRStorageTokenAuthorizer.m +++ b/FirebaseStorage/Sources/FIRStorageTokenAuthorizer.m @@ -21,7 +21,7 @@ #import "FirebaseStorage/Sources/FIRStorageErrors.h" #import "FirebaseStorage/Sources/FIRStorageLogger.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseAppCheck/Sources/Interop/FIRAppCheckInterop.h" #import "FirebaseAppCheck/Sources/Interop/FIRAppCheckTokenResultInterop.h" diff --git a/FirebaseStorage/Tests/Integration/FIRStorageIntegrationTests.m b/FirebaseStorage/Tests/Integration/FIRStorageIntegrationTests.m index a0e5401d2f..ee4c8b55d0 100644 --- a/FirebaseStorage/Tests/Integration/FIRStorageIntegrationTests.m +++ b/FirebaseStorage/Tests/Integration/FIRStorageIntegrationTests.m @@ -18,7 +18,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseStorage/Tests/Integration/Credentials.h" diff --git a/FirebaseStorage/Tests/Unit/FIRStorageComponentTests.m b/FirebaseStorage/Tests/Unit/FIRStorageComponentTests.m index 2411a1f18e..890ee87848 100644 --- a/FirebaseStorage/Tests/Unit/FIRStorageComponentTests.m +++ b/FirebaseStorage/Tests/Unit/FIRStorageComponentTests.m @@ -17,7 +17,7 @@ #import #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseStorage/Sources/FIRStorageComponent.h" #import "SharedTestUtilities/FIRComponentTestUtilities.h" diff --git a/FirebaseStorage/Tests/Unit/FIRStorageTestHelpers.h b/FirebaseStorage/Tests/Unit/FIRStorageTestHelpers.h index ba5025a577..eceec6d3d9 100644 --- a/FirebaseStorage/Tests/Unit/FIRStorageTestHelpers.h +++ b/FirebaseStorage/Tests/Unit/FIRStorageTestHelpers.h @@ -18,7 +18,7 @@ #import #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageConstants.h" #import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageMetadata.h" diff --git a/FirebaseStorage/Tests/Unit/FIRStorageTokenAuthorizerTests.m b/FirebaseStorage/Tests/Unit/FIRStorageTokenAuthorizerTests.m index c7ead5c1c4..496a24c1f1 100644 --- a/FirebaseStorage/Tests/Unit/FIRStorageTokenAuthorizerTests.m +++ b/FirebaseStorage/Tests/Unit/FIRStorageTokenAuthorizerTests.m @@ -14,7 +14,7 @@ #import "FirebaseStorage/Tests/Unit/FIRStorageTestHelpers.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "SharedTestUtilities/AppCheckFake/FIRAppCheckFake.h" #import "SharedTestUtilities/AppCheckFake/FIRAppCheckTokenResultFake.h" diff --git a/Firestore/Example/Benchmarks/remote_document_cache_benchmark.mm b/Firestore/Example/Benchmarks/remote_document_cache_benchmark.mm index fa019e8134..0440384392 100644 --- a/Firestore/Example/Benchmarks/remote_document_cache_benchmark.mm +++ b/Firestore/Example/Benchmarks/remote_document_cache_benchmark.mm @@ -15,7 +15,7 @@ */ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #include "Firestore/core/src/util/autoid.h" #include "Firestore/core/src/util/hard_assert.h" diff --git a/Firestore/Example/Tests/API/FIRFirestoreTests.mm b/Firestore/Example/Tests/API/FIRFirestoreTests.mm index 2a566577e9..7444c90353 100644 --- a/Firestore/Example/Tests/API/FIRFirestoreTests.mm +++ b/Firestore/Example/Tests/API/FIRFirestoreTests.mm @@ -19,7 +19,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #include "Firestore/core/test/unit/testutil/app_testing.h" diff --git a/Firestore/Example/Tests/Integration/API/FIRDatabaseTests.mm b/Firestore/Example/Tests/Integration/API/FIRDatabaseTests.mm index d0ce5000d0..d390f14c69 100644 --- a/Firestore/Example/Tests/Integration/API/FIRDatabaseTests.mm +++ b/Firestore/Example/Tests/Integration/API/FIRDatabaseTests.mm @@ -18,7 +18,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "Firestore/Example/Tests/Util/FSTEventAccumulator.h" #import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h" #import "Firestore/Source/API/FIRFirestore+Internal.h" diff --git a/Firestore/Example/Tests/Integration/API/FIRValidationTests.mm b/Firestore/Example/Tests/Integration/API/FIRValidationTests.mm index f2a9e524d7..5cc7850e32 100644 --- a/Firestore/Example/Tests/Integration/API/FIRValidationTests.mm +++ b/Firestore/Example/Tests/Integration/API/FIRValidationTests.mm @@ -20,7 +20,7 @@ #include -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "Firestore/Source/API/FIRFieldValue+Internal.h" #import "Firestore/Source/API/FIRQuery+Internal.h" diff --git a/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm b/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm index b9b91bdca2..da03b62209 100644 --- a/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm +++ b/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm @@ -30,7 +30,7 @@ #include #include -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "Firestore/Example/Tests/Util/FIRFirestore+Testing.h" #import "Firestore/Example/Tests/Util/FSTEventAccumulator.h" #import "Firestore/Source/API/FIRFirestore+Internal.h" diff --git a/Firestore/Source/API/FIRFirestore.mm b/Firestore/Source/API/FIRFirestore.mm index 7e6563e6f3..14f7b84057 100644 --- a/Firestore/Source/API/FIRFirestore.mm +++ b/Firestore/Source/API/FIRFirestore.mm @@ -22,7 +22,7 @@ #import "FIRFirestoreSettings+Internal.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "Firestore/Source/API/FIRCollectionReference+Internal.h" #import "Firestore/Source/API/FIRDocumentReference+Internal.h" #import "Firestore/Source/API/FIRListenerRegistration+Internal.h" diff --git a/Firestore/Source/API/FSTFirestoreComponent.mm b/Firestore/Source/API/FSTFirestoreComponent.mm index f69eab1996..ada3eaf80c 100644 --- a/Firestore/Source/API/FSTFirestoreComponent.mm +++ b/Firestore/Source/API/FSTFirestoreComponent.mm @@ -21,7 +21,7 @@ #include #import "FirebaseAppCheck/Sources/Interop/FIRAppCheckInterop.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "Firestore/Source/API/FIRFirestore+Internal.h" #import "Interop/Auth/Public/FIRAuthInterop.h" diff --git a/Firestore/core/src/credentials/firebase_app_check_credentials_provider_apple.mm b/Firestore/core/src/credentials/firebase_app_check_credentials_provider_apple.mm index 32ac5acc80..c3b671b7f1 100644 --- a/Firestore/core/src/credentials/firebase_app_check_credentials_provider_apple.mm +++ b/Firestore/core/src/credentials/firebase_app_check_credentials_provider_apple.mm @@ -18,7 +18,7 @@ #import "FirebaseAppCheck/Sources/Interop/FIRAppCheckInterop.h" #import "FirebaseAppCheck/Sources/Interop/FIRAppCheckTokenResultInterop.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #include "Firestore/core/src/util/error_apple.h" #include "Firestore/core/src/util/hard_assert.h" diff --git a/Firestore/core/src/credentials/firebase_auth_credentials_provider_apple.mm b/Firestore/core/src/credentials/firebase_auth_credentials_provider_apple.mm index 7e39056851..86ed012717 100644 --- a/Firestore/core/src/credentials/firebase_auth_credentials_provider_apple.mm +++ b/Firestore/core/src/credentials/firebase_auth_credentials_provider_apple.mm @@ -16,7 +16,7 @@ #include "Firestore/core/src/credentials/firebase_auth_credentials_provider_apple.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "Interop/Auth/Public/FIRAuthInterop.h" #include "Firestore/core/src/util/error_apple.h" diff --git a/Firestore/core/src/remote/firebase_metadata_provider_apple.mm b/Firestore/core/src/remote/firebase_metadata_provider_apple.mm index 23d78e987d..a83e35fb90 100644 --- a/Firestore/core/src/remote/firebase_metadata_provider_apple.mm +++ b/Firestore/core/src/remote/firebase_metadata_provider_apple.mm @@ -16,9 +16,9 @@ #include "Firestore/core/src/remote/firebase_metadata_provider_apple.h" -#import "FirebaseCore/Sources/Private/FIRAppInternal.h" -#import "FirebaseCore/Sources/Private/FIRHeartbeatInfo.h" -#import "FirebaseCore/Sources/Private/FIROptionsInternal.h" +#import "FirebaseCore/Internal/FIRAppInternal.h" +#import "FirebaseCore/Internal/FIRHeartbeatInfo.h" +#import "FirebaseCore/Internal/FIROptionsInternal.h" #include "Firestore/core/src/util/string_apple.h" diff --git a/Firestore/core/src/util/log_apple.mm b/Firestore/core/src/util/log_apple.mm index 006fabccec..d594a2f787 100644 --- a/Firestore/core/src/util/log_apple.mm +++ b/Firestore/core/src/util/log_apple.mm @@ -23,7 +23,7 @@ #include #include -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #include "Firestore/core/src/util/string_apple.h" diff --git a/Firestore/core/test/unit/credentials/firebase_app_check_credentials_provider_test.mm b/Firestore/core/test/unit/credentials/firebase_app_check_credentials_provider_test.mm index 1a626c7a08..d03404349f 100644 --- a/Firestore/core/test/unit/credentials/firebase_app_check_credentials_provider_test.mm +++ b/Firestore/core/test/unit/credentials/firebase_app_check_credentials_provider_test.mm @@ -21,7 +21,7 @@ #import "FirebaseAppCheck/Sources/Interop/FIRAppCheckInterop.h" #import "FirebaseAppCheck/Sources/Interop/FIRAppCheckTokenResultInterop.h" -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #include "Firestore/core/test/unit/testutil/app_testing.h" diff --git a/Firestore/core/test/unit/credentials/firebase_auth_credentials_provider_test.mm b/Firestore/core/test/unit/credentials/firebase_auth_credentials_provider_test.mm index 0c7144f25a..ef6f2deff3 100644 --- a/Firestore/core/test/unit/credentials/firebase_auth_credentials_provider_test.mm +++ b/Firestore/core/test/unit/credentials/firebase_auth_credentials_provider_test.mm @@ -20,7 +20,7 @@ #include // NOLINT(build/c++11) #include -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #import "Interop/Auth/Public/FIRAuthInterop.h" #include "Firestore/core/src/util/statusor.h" diff --git a/Firestore/core/test/unit/testutil/app_testing.mm b/Firestore/core/test/unit/testutil/app_testing.mm index 7856e981c1..d4c6681b36 100644 --- a/Firestore/core/test/unit/testutil/app_testing.mm +++ b/Firestore/core/test/unit/testutil/app_testing.mm @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" #include "Firestore/core/src/util/string_apple.h" #include "Firestore/core/test/unit/testutil/app_testing.h" diff --git a/HeadersImports.md b/HeadersImports.md index 3b285a0cd3..37a2307db8 100644 --- a/HeadersImports.md +++ b/HeadersImports.md @@ -47,12 +47,12 @@ In Swift Package Manager, it's a library target. import like `#import "publicHeader.h"` to avoid public module collisions. * *Private Headers from other Libraries* - Import a private umbrella header like - `FirebaseCore/Sources/Private/FirebaseCoreInternal.h`. For CocoaPods, these files should be + `FirebaseCore/Internal/FirebaseCoreInternal.h`. For CocoaPods, these files should be added to the podspec in the `source_files` attribute like: ``` s.source_files = [ 'FirebaseFoo/Sources/**/*.[mh]' 'Interop/Auth/Public/*.h', - 'FirebaseCore/Sources/Private/*.h', + 'FirebaseCore/Internal/*.h', ] ``` diff --git a/Interop/FirebaseComponentSystem.md b/Interop/FirebaseComponentSystem.md index 61f284e18a..6a23df29bf 100644 --- a/Interop/FirebaseComponentSystem.md +++ b/Interop/FirebaseComponentSystem.md @@ -90,7 +90,7 @@ Each Firebase framework should register with Core in the `+load` method of the c dependencies before a class has a chance to be called by a developer (if called at all). ```obj-c -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" @interface FIRFoo @end diff --git a/Package.swift b/Package.swift index 4c121128e0..cdbe5bbc0d 100644 --- a/Package.swift +++ b/Package.swift @@ -238,6 +238,15 @@ let package = Package( .headerSearchPath("../../.."), ] ), + // Interal headers only for consuming from Swift. + .target( + name: "FirebaseCoreInternal", + path: "FirebaseCore/Internal", + publicHeadersPath: ".", + cSettings: [ + .headerSearchPath("../../"), + ] + ), .target( name: "FirebaseCoreDiagnostics", dependencies: [ @@ -692,6 +701,7 @@ let package = Package( name: "FirebaseFunctionsSwift", dependencies: [ "FirebaseCore", + "FirebaseCoreInternal", "FirebaseSharedSwift", .product(name: "GTMSessionFetcherCore", package: "GTMSessionFetcher"), ], diff --git a/SharedTestUtilities/FIRComponentTestUtilities.h b/SharedTestUtilities/FIRComponentTestUtilities.h index 1779cdf413..bf34f57b26 100644 --- a/SharedTestUtilities/FIRComponentTestUtilities.h +++ b/SharedTestUtilities/FIRComponentTestUtilities.h @@ -16,7 +16,7 @@ #import -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/SharedTestUtilities/FIROptionsMock.m b/SharedTestUtilities/FIROptionsMock.m index 5b809ddcef..3675f9b0e1 100644 --- a/SharedTestUtilities/FIROptionsMock.m +++ b/SharedTestUtilities/FIROptionsMock.m @@ -14,7 +14,7 @@ #import -#import "FirebaseCore/Sources/Private/FIROptionsInternal.h" +#import "FirebaseCore/Internal/FIROptionsInternal.h" #import "SharedTestUtilities/FIROptionsMock.h" NSString *const kAndroidClientID = @"correct_android_client_id"; diff --git a/SharedTestUtilities/FIRSampleAppUtilities.m b/SharedTestUtilities/FIRSampleAppUtilities.m index 0d8a2d086c..1b19d203fc 100644 --- a/SharedTestUtilities/FIRSampleAppUtilities.m +++ b/SharedTestUtilities/FIRSampleAppUtilities.m @@ -22,7 +22,7 @@ #import #endif -#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h" +#import "FirebaseCore/Internal/FirebaseCoreInternal.h" NSString *const kGoogleAppIDPlistKey = @"GOOGLE_APP_ID"; // Dummy plist GOOGLE_APP_ID diff --git a/scripts/check_imports.swift b/scripts/check_imports.swift index 2967dd5842..6fe74300f6 100755 --- a/scripts/check_imports.swift +++ b/scripts/check_imports.swift @@ -39,7 +39,7 @@ let skipDirPatterns = ["/Sample/", "/Pods/", "FirebaseStorage/Tests/Integration" // The following are temporary skips pending working through a first pass of the repo: [ "FirebaseAppDistribution", - "FirebaseCore/Sources/Private", // TODO: work through adding this back. + "FirebaseCore/Internal", // TODO: work through adding this back. "Firebase/CoreDiagnostics", "FirebaseDatabase/Sources/third_party/Wrap-leveldb", // Pending SwiftPM for leveldb. "Example", diff --git a/scripts/health_metrics/file_patterns.json b/scripts/health_metrics/file_patterns.json index 32a937f572..b8806430e4 100644 --- a/scripts/health_metrics/file_patterns.json +++ b/scripts/health_metrics/file_patterns.json @@ -101,7 +101,7 @@ "^Firestore/.*", "FirebaseAppCheck/Sources/Interop/[^/]+\\.h", "Interop/Auth/Public/[^/]+\\.h", - "FirebaseCore/Sources/Private", + "FirebaseCore/Internal", "FirebaseCore/Sources/Public", "FirebaseFirestore\\.podspec", "CMakeLists\\.txt",