From a09083f9d00854d7fe26a37b0f6a01b28a37771d Mon Sep 17 00:00:00 2001 From: Nick Cooke <36927374+ncooke3@users.noreply.github.com> Date: Tue, 22 Mar 2022 13:36:33 -0400 Subject: [PATCH] [v9] Reorganize `FirebaseCore*` modules (#9482) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [skip ci] [will revert] Add debug printing to `pod_lib_lint.rb` * Reorganize FirebaseCore libraries for SPM and CP * [skip ci] Revert "[skip ci] [will revert] Add debug printing to `pod_lib_lint.rb`" This reverts commit 2a837e39708c21b0a324743ab226bd6c01047de7. * Review and fix CI * Remove `heartbeat_logging.yml` and add `core_internal.yml` * Remove trailing whitespace * Fix more whitespace 😞 * Fix `core_internal.yml` scheme name * Update `check_imports.swift` and TODO * Review * Add FirebaseCoreInternal pod to Firestore example's Podfile * [skip ci] Review - remove TODOs * [skip ci] Remove duplicate `XCTest` import --- .github/workflows/core.yml | 1 - .github/workflows/core_extension.yml | 49 ++++++++++++ .github/workflows/core_internal.yml | 79 +++++++++++++++++++ .github/workflows/heartbeat_logging.yml | 28 ------- CoreOnly/Tests/FirebasePodTest/Podfile | 1 + .../FIRCLSDataCollectionArbiter.m | 2 +- Crashlytics/Crashlytics/FIRCrashlytics.m | 2 +- .../Crashlytics/Helpers/FIRCLSLogger.m | 2 +- Crashlytics/Shared/FIRCLSConstants.m | 2 +- Crashlytics/UnitTests/FIRCLSConstantsTest.m | 2 +- .../UnitTests/FIRCLSMetricKitManagerTests.m | 2 +- .../UnitTests/FIRCLSReportManagerTests.m | 2 +- Crashlytics/UnitTests/Mocks/FIRAppFake.h | 2 +- Example/watchOSSample/Podfile | 1 + .../ABTConditionalUserPropertyController.m | 2 +- FirebaseABTesting/Sources/ABTConstants.h | 2 +- .../Sources/FIRExperimentController.m | 2 +- ...ABTConditionalUserPropertyControllerTest.m | 2 +- .../Tests/Unit/FIRExperimentControllerTest.m | 2 +- .../AppAttestProvider/FIRAppAttestProvider.m | 2 +- .../Core/APIService/FIRAppCheckAPIService.m | 2 +- FirebaseAppCheck/Sources/Core/FIRAppCheck.m | 2 +- .../Sources/Core/FIRAppCheckLogger.h | 2 +- .../Sources/Core/FIRAppCheckLogger.m | 2 +- .../Sources/Core/FIRAppCheckSettings.m | 2 +- .../Sources/Core/FIRAppCheckValidator.m | 2 +- .../API/FIRAppCheckDebugProviderAPIService.m | 2 +- .../DebugProvider/FIRAppCheckDebugProvider.m | 2 +- .../API/FIRDeviceCheckAPIService.m | 2 +- .../FIRDeviceCheckProvider.m | 2 +- .../FIRAppAttestProviderTests.m | 2 +- .../Unit/Core/FIRAppCheckAPIServiceTests.m | 2 +- .../Unit/Core/FIRAppCheckIntegrationTests.m | 2 +- .../Unit/Core/FIRAppCheckSettingsTests.m | 2 +- .../Tests/Unit/Core/FIRAppCheckTests.m | 2 +- .../FIRAppCheckDebugProviderFactoryTests.m | 2 +- .../FIRAppCheckDebugProviderTests.m | 2 +- .../FIRDeviceCheckAPIServiceTests.m | 2 +- .../FIRDeviceCheckProviderTests.m | 2 +- .../Sources/FIRAppDistribution.m | 2 +- .../Sources/FIRAppDistributionUIService.m | 2 +- .../Sources/FIRFADApiService.m | 2 +- .../Sources/FIRFADLogger.m | 2 +- .../Tests/Unit/FIRAppDistributionMachOTests.m | 2 +- .../Tests/Unit/FIRAppDistributionTests.m | 2 +- .../Tests/Unit/FIRFADApiServiceTests.m | 2 +- FirebaseAuth/Sources/Auth/FIRAuth.m | 2 +- FirebaseAuth/Sources/Auth/FIRAuth_Internal.h | 2 +- .../AuthProvider/OAuth/FIROAuthProvider.m | 2 +- .../AuthProvider/Phone/FIRPhoneAuthProvider.m | 2 +- FirebaseAuth/Sources/Backend/FIRAuthBackend.m | 2 +- .../Sources/Storage/FIRAuthKeychainServices.m | 2 +- .../SystemService/FIRAuthAPNSTokenManager.m | 2 +- .../FIRAuthNotificationManager.m | 2 +- .../SystemService/FIRSecureTokenService.m | 2 +- FirebaseAuth/Sources/User/FIRUser.m | 2 +- FirebaseAuth/Tests/Sample/Podfile | 1 + .../Tests/Unit/FIRApp+FIRAuthUnitTests.h | 2 +- .../Tests/Unit/FIRApp+FIRAuthUnitTests.m | 2 +- .../Tests/Unit/FIRAuthLifeCycleTests.m | 2 +- FirebaseAuth/Tests/Unit/FIRAuthTests.m | 2 +- .../Tests/Unit/FIROAuthProviderTests.m | 2 +- .../Tests/Unit/FIRPhoneAuthProviderTests.m | 2 +- .../FirebaseCombine-unit-Bridging-Header.h | 2 +- FirebaseCore.podspec | 13 ++- .../{Internal => Extension}/FIRAppInternal.h | 0 .../{Internal => Extension}/FIRComponent.h | 0 .../FIRComponentContainer.h | 0 .../FIRComponentType.h | 0 .../FIRCoreDiagnosticsConnector.h | 0 .../{Internal => Extension}/FIRDependency.h | 0 .../FIRHeartbeatInfo.h | 0 .../FIRHeartbeatLogger.h | 0 .../{Internal => Extension}/FIRLibrary.h | 0 .../{Internal => Extension}/FIRLogger.h | 0 .../FIROptionsInternal.h | 0 .../FirebaseCoreInternal.h | 0 FirebaseCore/{Internal => Extension}/dummy.m | 0 .../Sources/HeartbeatLogging}/Heartbeat.swift | 0 .../HeartbeatController.swift | 0 .../HeartbeatLogging}/HeartbeatStorage.swift | 0 .../HeartbeatLogging}/HeartbeatsBundle.swift | 0 .../HeartbeatLogging}/HeartbeatsPayload.swift | 0 .../HeartbeatLogging}/RingBuffer.swift | 0 .../Sources/HeartbeatLogging}/Storage.swift | 0 .../HeartbeatLogging}/StorageFactory.swift | 0 .../HeartbeatLogging}/WeakContainer.swift | 0 .../_ObjC_HeartbeatController.swift | 0 .../_ObjC_HeartbeatsPayload.swift | 0 .../Internal/Tests/Common/Assertions.swift | 30 +++++++ .../HeartbeatLoggingIntegrationTests.swift | 2 +- .../Tests/Unit/HeartbeatControllerTests.swift | 15 +--- .../Tests/Unit/HeartbeatStorageTests.swift | 3 +- .../Internal}/Tests/Unit/HeartbeatTests.swift | 2 +- .../Tests/Unit/HeartbeatsBundleTests.swift | 2 +- .../Tests/Unit/HeartbeatsPayloadTests.swift | 2 +- .../Tests/Unit/RingBufferTests.swift | 2 +- .../Internal}/Tests/Unit/StorageTests.swift | 2 +- .../Tests/Unit/WeakContainerTests.swift | 2 +- FirebaseCore/Sources/FIRApp.m | 10 +-- FirebaseCore/Sources/FIRComponent.m | 6 +- FirebaseCore/Sources/FIRComponentContainer.m | 10 +-- .../Sources/FIRComponentContainerInternal.h | 4 +- FirebaseCore/Sources/FIRComponentType.m | 2 +- .../Sources/FIRCoreDiagnosticsConnector.m | 6 +- FirebaseCore/Sources/FIRDependency.m | 2 +- FirebaseCore/Sources/FIRDiagnosticsData.m | 4 +- FirebaseCore/Sources/FIRHeartbeatInfo.m | 4 +- FirebaseCore/Sources/FIRHeartbeatLogger.m | 10 +-- FirebaseCore/Sources/FIRLogger.m | 2 +- FirebaseCore/Sources/FIROptions.m | 6 +- .../FirebaseCore-unit-Bridging-Header.h | 2 +- FirebaseCore/Tests/Unit/FIRAppTest.m | 8 +- .../Tests/Unit/FIRComponentContainerTest.m | 4 +- .../Tests/Unit/FIRComponentTypeTest.m | 2 +- .../Tests/Unit/FIRHeartbeatInfoTest.m | 2 +- .../Tests/Unit/FIRHeartbeatLoggerTest.m | 6 +- FirebaseCore/Tests/Unit/FIRLoggerTest.m | 2 +- FirebaseCore/Tests/Unit/FIROptionsTest.m | 4 +- FirebaseCore/Tests/Unit/FIRTestComponents.h | 6 +- FirebaseCore/Tests/Unit/FIRTestComponents.m | 4 +- FirebaseCoreExtension.podspec | 32 ++++++++ FirebaseCoreInternal.podspec | 65 ++++++++++++--- FirebaseDatabase/Sources/Api/FIRDatabase.m | 2 +- .../Sources/Api/FIRDatabaseComponent.m | 2 +- .../Sources/Core/FPersistentConnection.m | 2 +- FirebaseDatabase/Sources/Core/FRepo.m | 2 +- FirebaseDatabase/Sources/Core/FRepoManager.m | 2 +- FirebaseDatabase/Sources/Core/FSyncTree.m | 2 +- .../Sources/Core/Utilities/FIRRetryHelper.m | 2 +- .../Core/View/FChildEventRegistration.m | 2 +- .../Core/View/FValueEventRegistration.m | 2 +- .../Sources/FIRDatabaseReference.m | 2 +- .../FIRDatabaseConnectionContextProvider.m | 2 +- .../Persistence/FLevelDBStorageEngine.m | 2 +- .../Sources/Persistence/FPersistenceManager.m | 2 +- .../Persistence/FTrackedQueryManager.m | 2 +- .../Sources/Realtime/FConnection.m | 2 +- .../Sources/Realtime/FWebSocketConnection.m | 2 +- .../Sources/Utilities/FUtilities.h | 2 +- .../Sources/Utilities/FUtilities.m | 2 +- FirebaseDatabase/Tests/Helpers/FTestBase.m | 2 +- FirebaseDatabase/Tests/Helpers/FTestHelpers.m | 2 +- .../Tests/Integration/FConnectionTest.m | 2 +- FirebaseDatabase/Tests/Integration/FData.m | 2 +- .../Tests/Integration/FIRAuthTests.m | 2 +- .../Tests/Integration/FIRDatabaseTests.m | 2 +- ...IRDatabaseConnectionContextProviderTests.m | 2 +- FirebaseDatabase/Tests/Unit/FSyncPointTests.m | 2 +- .../FIRDynamicLinkComponentsKeyProvider.m | 2 +- .../Sources/FIRDynamicLinks.m | 2 +- .../Sources/Logging/FDLLogging.m | 2 +- .../Tests/Unit/FIRDynamicLinksTest.m | 2 +- FirebaseFunctions.podspec | 2 +- FirebaseFunctions/Sources/Functions.swift | 2 +- .../Sources/Internal/FunctionsComponent.swift | 2 +- .../ObjCIntegration/FIRIntegrationTests.m | 2 +- .../FIRIAMAnalyticsEventLoggerImpl.m | 2 +- .../FIRIAMClearcutHttpRequestSender.m | 2 +- .../Analytics/FIRIAMClearcutLogStorage.m | 2 +- .../Sources/Analytics/FIRIAMClearcutLogger.m | 2 +- .../Analytics/FIRIAMClearcutUploader.m | 2 +- .../Sources/Data/FIRIAMFetchResponseParser.m | 2 +- .../FIRIAMMessageContentDataWithImageURL.m | 2 +- .../DefaultUI/FIRCore+InAppMessagingDisplay.h | 2 +- .../DefaultUI/FIRIAMDefaultDisplayImpl.m | 2 +- .../Sources/FIRCore+InAppMessaging.h | 2 +- .../Sources/FIRInAppMessaging.m | 2 +- .../Sources/FIRInAppMessagingPrivate.h | 2 +- .../Sources/Flows/FIRIAMActivityLogger.m | 2 +- .../Sources/Flows/FIRIAMBookKeeper.m | 2 +- .../Sources/Flows/FIRIAMClientInfoFetcher.m | 2 +- .../FIRIAMDisplayCheckOnAnalyticEventsFlow.m | 2 +- .../FIRIAMDisplayCheckOnAppForegroundFlow.m | 2 +- ...MDisplayCheckOnFetchDoneNotificationFlow.m | 2 +- .../Sources/Flows/FIRIAMDisplayExecutor.m | 2 +- .../Sources/Flows/FIRIAMFetchFlow.m | 2 +- .../Flows/FIRIAMFetchOnAppForegroundFlow.m | 2 +- .../Sources/Flows/FIRIAMMessageClientCache.m | 2 +- .../Flows/FIRIAMMsgFetcherUsingRestful.m | 2 +- .../Flows/FIRIAMServerMsgFetchStorage.m | 2 +- .../Sources/Runtime/FIRIAMRuntimeManager.m | 2 +- .../Sources/Runtime/FIRIAMSDKModeManager.m | 2 +- .../Runtime/FIRInAppMessaging+Bootstrap.m | 2 +- .../Integration/DefaultUITestApp/Podfile | 1 + .../Source/Library/FIRInstallations.m | 2 +- .../Source/Library/FIRInstallationsLogger.h | 2 +- .../FIRInstallationsAPIService.m | 2 +- .../FIRInstallationsIDController.m | 2 +- .../FIRInstallationsIntegrationTests.m | 2 +- .../Unit/FIRInstallationsAPIServiceTests.m | 2 +- .../Unit/FIRInstallationsIDControllerTests.m | 2 +- .../Source/Tests/Unit/FIRInstallationsTests.m | 2 +- .../Tests/Utils/FIRInstallationsItem+Tests.m | 2 +- FirebaseMessaging/Apps/Sample/Podfile | 1 + FirebaseMessaging/Apps/SwiftUISample/Podfile | 1 + FirebaseMessaging/Sources/FIRMessaging.m | 2 +- .../Sources/FIRMessagingLogger.m | 2 +- .../Sources/FIRMessagingUtilities.m | 2 +- .../Token/FIRMessagingTokenFetchOperation.m | 2 +- .../UnitTests/FIRMessagingHandlingTest.m | 2 +- .../Tests/UnitTests/FIRMessagingTest.m | 2 +- .../UnitTests/FIRMessagingTestUtilities.m | 2 +- .../UnitTests/FIRMessagingTokenInfoTest.m | 2 +- .../FIRMessagingTokenOperationsTest.m | 2 +- .../Configurations/FPRConfigurations.m | 2 +- .../Configurations/FPRRemoteConfigFlags.m | 2 +- FirebasePerformance/Sources/FPRClient.m | 2 +- .../Sources/FPRConsoleLogger.h | 2 +- .../Tests/Unit/FIRPerformanceTest.m | 2 +- .../Tests/Unit/FPRAppActivityTrackerTest.m | 2 +- .../Tests/Unit/Fakes/FIRAppFake.h | 2 +- .../Tests/Unit/Fakes/FIRAppFake.m | 2 +- FirebaseRemoteConfig/Sources/FIRConfigValue.m | 2 +- .../Sources/FIRRemoteConfig.m | 2 +- .../Sources/FIRRemoteConfigComponent.h | 2 +- .../Sources/FIRRemoteConfigComponent.m | 2 +- .../Sources/RCNConfigContent.m | 2 +- .../Sources/RCNConfigDBManager.m | 2 +- .../Sources/RCNConfigExperiment.m | 2 +- FirebaseRemoteConfig/Sources/RCNConfigFetch.m | 2 +- .../Sources/RCNConfigSettings.m | 2 +- FirebaseRemoteConfig/Sources/RCNDevice.m | 2 +- .../Sources/RCNUserDefaultsManager.m | 2 +- FirebaseRemoteConfig/Tests/Sample/Podfile | 1 + .../Tests/Unit/FIRRemoteConfigComponentTest.m | 2 +- .../Tests/Unit/RCNConfigDBManagerTest.m | 2 +- .../Tests/Unit/RCNInstanceIDTest.m | 2 +- .../Tests/Unit/RCNPersonalizationTest.m | 2 +- .../Tests/Unit/RCNRemoteConfig+FIRAppTest.m | 2 +- .../Tests/Unit/RCNRemoteConfigTest.m | 2 +- .../Tests/Unit/RCNThrottlingTests.m | 2 +- FirebaseStorage/Sources/FIRStorage.m | 2 +- FirebaseStorage/Sources/FIRStorageComponent.m | 2 +- FirebaseStorage/Sources/FIRStorageLogger.h | 2 +- FirebaseStorage/Sources/FIRStorageReference.m | 2 +- .../Sources/FIRStorageTokenAuthorizer.m | 2 +- .../Integration/FIRStorageIntegrationTests.m | 2 +- .../Tests/Unit/FIRStorageComponentTests.m | 2 +- .../Tests/Unit/FIRStorageTestHelpers.h | 2 +- .../Unit/FIRStorageTokenAuthorizerTests.m | 2 +- .../remote_document_cache_benchmark.mm | 2 +- Firestore/Example/Podfile | 1 + .../Example/Tests/API/FIRFirestoreTests.mm | 2 +- .../Tests/Integration/API/FIRDatabaseTests.mm | 2 +- .../Integration/API/FIRValidationTests.mm | 2 +- .../Tests/Util/FSTIntegrationTestCase.mm | 6 +- Firestore/Source/API/FIRFirestore.mm | 6 +- Firestore/Source/API/FSTFirestoreComponent.mm | 14 ++-- ...se_app_check_credentials_provider_apple.mm | 2 +- ...irebase_auth_credentials_provider_apple.mm | 2 +- .../firebase_metadata_provider_apple.mm | 6 +- Firestore/core/src/util/log_apple.mm | 2 +- ...ase_app_check_credentials_provider_test.mm | 2 +- .../core/test/unit/testutil/app_testing.mm | 4 +- HeadersImports.md | 2 +- HeartbeatLoggingTestUtils.podspec | 28 +++---- .../Sources/HeartbeatLoggingTestUtils.swift | 7 +- Interop/FirebaseComponentSystem.md | 2 +- Package.swift | 30 ++++--- .../FIRComponentTestUtilities.h | 2 +- SharedTestUtilities/FIROptionsMock.m | 2 +- SharedTestUtilities/FIRSampleAppUtilities.m | 2 +- scripts/check_imports.swift | 2 +- scripts/localize_podfile.swift | 3 +- ...eme => FirebaseCoreInternalTests.xcscheme} | 24 +++--- 266 files changed, 562 insertions(+), 379 deletions(-) create mode 100644 .github/workflows/core_extension.yml create mode 100644 .github/workflows/core_internal.yml delete mode 100644 .github/workflows/heartbeat_logging.yml rename FirebaseCore/{Internal => Extension}/FIRAppInternal.h (100%) rename FirebaseCore/{Internal => Extension}/FIRComponent.h (100%) rename FirebaseCore/{Internal => Extension}/FIRComponentContainer.h (100%) rename FirebaseCore/{Internal => Extension}/FIRComponentType.h (100%) rename FirebaseCore/{Internal => Extension}/FIRCoreDiagnosticsConnector.h (100%) rename FirebaseCore/{Internal => Extension}/FIRDependency.h (100%) rename FirebaseCore/{Internal => Extension}/FIRHeartbeatInfo.h (100%) rename FirebaseCore/{Internal => Extension}/FIRHeartbeatLogger.h (100%) rename FirebaseCore/{Internal => Extension}/FIRLibrary.h (100%) rename FirebaseCore/{Internal => Extension}/FIRLogger.h (100%) rename FirebaseCore/{Internal => Extension}/FIROptionsInternal.h (100%) rename FirebaseCore/{Internal => Extension}/FirebaseCoreInternal.h (100%) rename FirebaseCore/{Internal => Extension}/dummy.m (100%) rename {HeartbeatLogging/Sources => FirebaseCore/Internal/Sources/HeartbeatLogging}/Heartbeat.swift (100%) rename {HeartbeatLogging/Sources => FirebaseCore/Internal/Sources/HeartbeatLogging}/HeartbeatController.swift (100%) rename {HeartbeatLogging/Sources => FirebaseCore/Internal/Sources/HeartbeatLogging}/HeartbeatStorage.swift (100%) rename {HeartbeatLogging/Sources => FirebaseCore/Internal/Sources/HeartbeatLogging}/HeartbeatsBundle.swift (100%) rename {HeartbeatLogging/Sources => FirebaseCore/Internal/Sources/HeartbeatLogging}/HeartbeatsPayload.swift (100%) rename {HeartbeatLogging/Sources => FirebaseCore/Internal/Sources/HeartbeatLogging}/RingBuffer.swift (100%) rename {HeartbeatLogging/Sources => FirebaseCore/Internal/Sources/HeartbeatLogging}/Storage.swift (100%) rename {HeartbeatLogging/Sources => FirebaseCore/Internal/Sources/HeartbeatLogging}/StorageFactory.swift (100%) rename {HeartbeatLogging/Sources => FirebaseCore/Internal/Sources/HeartbeatLogging}/WeakContainer.swift (100%) rename {HeartbeatLogging/Sources => FirebaseCore/Internal/Sources/HeartbeatLogging}/_ObjC_HeartbeatController.swift (100%) rename {HeartbeatLogging/Sources => FirebaseCore/Internal/Sources/HeartbeatLogging}/_ObjC_HeartbeatsPayload.swift (100%) create mode 100644 FirebaseCore/Internal/Tests/Common/Assertions.swift rename {HeartbeatLogging => FirebaseCore/Internal}/Tests/Integration/HeartbeatLoggingIntegrationTests.swift (99%) rename {HeartbeatLogging => FirebaseCore/Internal}/Tests/Unit/HeartbeatControllerTests.swift (96%) rename {HeartbeatLogging => FirebaseCore/Internal}/Tests/Unit/HeartbeatStorageTests.swift (99%) rename {HeartbeatLogging => FirebaseCore/Internal}/Tests/Unit/HeartbeatTests.swift (98%) rename {HeartbeatLogging => FirebaseCore/Internal}/Tests/Unit/HeartbeatsBundleTests.swift (99%) rename {HeartbeatLogging => FirebaseCore/Internal}/Tests/Unit/HeartbeatsPayloadTests.swift (98%) rename {HeartbeatLogging => FirebaseCore/Internal}/Tests/Unit/RingBufferTests.swift (99%) rename {HeartbeatLogging => FirebaseCore/Internal}/Tests/Unit/StorageTests.swift (99%) rename {HeartbeatLogging => FirebaseCore/Internal}/Tests/Unit/WeakContainerTests.swift (96%) create mode 100644 FirebaseCoreExtension.podspec rename scripts/spm_test_schemes/{HeartbeatLoggingTests.xcscheme => FirebaseCoreInternalTests.xcscheme} (77%) diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index 0a609de620..1b9dab49d3 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -5,7 +5,6 @@ on: paths: - 'FirebaseCore**' - 'Interop/CoreDiagnostics/Public/*.h' - - 'HeartbeatLogging**' - '.github/workflows/core.yml' - 'Gemfile*' schedule: diff --git a/.github/workflows/core_extension.yml b/.github/workflows/core_extension.yml new file mode 100644 index 0000000000..4b42aadcd1 --- /dev/null +++ b/.github/workflows/core_extension.yml @@ -0,0 +1,49 @@ +name: core_extension + +on: + pull_request: + paths: + - 'FirebaseCoreExtension.podspec' + - 'FirebaseCore/Extension/**' + - '.github/workflows/core_extension.yml' + - 'Gemfile*' + schedule: + # Run every day at 2am (PST) - cron uses UTC times + - cron: '0 10 * * *' + +jobs: + # Since `FirebaseCoreExtension` only contains headers, linting is sufficient for testing. + + pod-lib-lint: + # Don't run on private repo unless it is a PR. + if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' + runs-on: macos-11 + strategy: + matrix: + target: [ios, tvos, macos] + env: + POD_LIB_LINT_ONLY: 1 + steps: + - uses: actions/checkout@v2 + - name: Setup Bundler + run: scripts/setup_bundler.sh + - name: Build and test + run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseCoreExtension.podspec --platforms=${{ matrix.target }} + + core-internal-cron-only: + # Don't run on private repo. + if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk' + runs-on: macos-11 + strategy: + matrix: + target: [ios, tvos, macos] + flags: [ + '--use-static-frameworks' + ] + needs: pod-lib-lint + steps: + - uses: actions/checkout@v2 + - name: Setup Bundler + run: scripts/setup_bundler.sh + - name: PodLibLint CoreInternal Cron + run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseCoreExtension.podspec --platforms=${{ matrix.target }} ${{ matrix.flags }} diff --git a/.github/workflows/core_internal.yml b/.github/workflows/core_internal.yml new file mode 100644 index 0000000000..653a148f48 --- /dev/null +++ b/.github/workflows/core_internal.yml @@ -0,0 +1,79 @@ +name: core_internal + +on: + pull_request: + paths: + - 'FirebaseCoreInternal.podspec' + - 'FirebaseCore/Internal/**' + - '.github/workflows/core_internal.yml' + - 'Gemfile*' + schedule: + # Run every day at 2am (PST) - cron uses UTC times + - cron: '0 10 * * *' + +jobs: + pod-lib-lint: + # Don't run on private repo unless it is a PR. + if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' + runs-on: macos-11 + strategy: + matrix: + target: [ios, tvos, macos] + env: + POD_LIB_LINT_ONLY: 1 + steps: + - uses: actions/checkout@v2 + - name: Setup Bundler + run: scripts/setup_bundler.sh + - name: Build and test + run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseCoreInternal.podspec --platforms=${{ matrix.target }} + + spm: + # Don't run on private repo unless it is a PR. + if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' + runs-on: macos-11 + strategy: + matrix: + target: [iOS, tvOS, macOS, catalyst, watchOS] + steps: + - uses: actions/checkout@v2 + - name: Initialize xcodebuild + run: scripts/setup_spm_tests.sh + - name: FirebaseCoreInternalTests + run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseCoreInternalTests ${{ matrix.target }} spm + + catalyst: + # Don't run on private repo unless it is a PR. + if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' + runs-on: macos-11 + env: + POD_LIB_LINT_ONLY: 1 + steps: + - uses: actions/checkout@v2 + - uses: mikehardy/buildcache-action@50738c6c77de7f34e66b870e4f8ede333b69d077 + with: + cache_key: ${{ matrix.os }} + - name: Setup Bundler + run: scripts/setup_bundler.sh + - name: Setup Catalyst project and run unit tests + run: scripts/test_catalyst.sh FirebaseCoreInternal test FirebaseCoreInternal-Unit-Unit + - name: Setup Catalyst project and run integration tests + run: scripts/test_catalyst.sh FirebaseCoreInternal test FirebaseCoreInternal-Unit-Integration + + core-internal-cron-only: + # Don't run on private repo. + if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk' + runs-on: macos-11 + strategy: + matrix: + target: [ios, tvos, macos] + flags: [ + '--use-static-frameworks' + ] + needs: pod-lib-lint + steps: + - uses: actions/checkout@v2 + - name: Setup Bundler + run: scripts/setup_bundler.sh + - name: PodLibLint CoreInternal Cron + run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseCoreInternal.podspec --platforms=${{ matrix.target }} ${{ matrix.flags }} diff --git a/.github/workflows/heartbeat_logging.yml b/.github/workflows/heartbeat_logging.yml deleted file mode 100644 index 61992493c9..0000000000 --- a/.github/workflows/heartbeat_logging.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: heartbeat_logging - -on: - pull_request: - paths: - - 'HeartbeatLogging**' - - '.github/workflows/heartbeat_logging.yml' - - 'Gemfile*' - - # TODO(nickcooke): Schedule cron job. - -jobs: - - # TODO(nickcooke): Configure `CocoaPods` job(s). - - spm: - # Don't run on private repo unless it is a PR. - if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' - runs-on: macos-11 - strategy: - matrix: - target: [iOS, tvOS, macOS, catalyst, watchOS] - steps: - - uses: actions/checkout@v2 - - name: Initialize xcodebuild - run: scripts/setup_spm_tests.sh - - name: HeartbeatLoggingTests - run: scripts/third_party/travis/retry.sh ./scripts/build.sh HeartbeatLoggingTests ${{ matrix.target }} spm diff --git a/CoreOnly/Tests/FirebasePodTest/Podfile b/CoreOnly/Tests/FirebasePodTest/Podfile index c66a818233..4623e1edfa 100644 --- a/CoreOnly/Tests/FirebasePodTest/Podfile +++ b/CoreOnly/Tests/FirebasePodTest/Podfile @@ -37,6 +37,7 @@ target 'FirebasePodTest' do pod 'FirebaseMessagingInterop', :path => '../../../' pod 'FirebaseCoreDiagnostics', :path => '../../../' pod 'FirebaseCoreInternal', :path => '../../../' + pod 'FirebaseCoreExtension', :path => '../../../' pod 'FirebaseAnalytics' # Analytics is not open source end diff --git a/Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionArbiter.m b/Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionArbiter.m index 8fd1149ee6..834e7e8ff9 100644 --- a/Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionArbiter.m +++ b/Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionArbiter.m @@ -20,7 +20,7 @@ #import "FBLPromises.h" #endif -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "Crashlytics/Crashlytics/FIRCLSUserDefaults/FIRCLSUserDefaults.h" diff --git a/Crashlytics/Crashlytics/FIRCrashlytics.m b/Crashlytics/Crashlytics/FIRCrashlytics.m index 50adf87ab3..93878f7e32 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 49c5365cba..5cda19b992 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" FIRLoggerService kFIRLoggerCrashlytics = @"[Firebase/Crashlytics]"; diff --git a/Crashlytics/Shared/FIRCLSConstants.m b/Crashlytics/Shared/FIRCLSConstants.m index 05dc60a16c..301a57d00c 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 8a69165e16..5ea0e4a8b1 100644 --- a/Crashlytics/UnitTests/FIRCLSConstantsTest.m +++ b/Crashlytics/UnitTests/FIRCLSConstantsTest.m @@ -15,7 +15,7 @@ #import #import "Crashlytics/Shared/FIRCLSConstants.h" -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 7faa3389e2..8f0a29174a 100644 --- a/Crashlytics/UnitTests/FIRCLSMetricKitManagerTests.m +++ b/Crashlytics/UnitTests/FIRCLSMetricKitManagerTests.m @@ -16,7 +16,7 @@ #import #import "Crashlytics/Crashlytics/Controllers/FIRCLSMetricKitManager.h" -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #if CLS_METRICKIT_SUPPORTED diff --git a/Crashlytics/UnitTests/FIRCLSReportManagerTests.m b/Crashlytics/UnitTests/FIRCLSReportManagerTests.m index 81ac0cdbb7..c71e941cfa 100644 --- a/Crashlytics/UnitTests/FIRCLSReportManagerTests.m +++ b/Crashlytics/UnitTests/FIRCLSReportManagerTests.m @@ -15,7 +15,7 @@ #import #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #if __has_include() #import diff --git a/Crashlytics/UnitTests/Mocks/FIRAppFake.h b/Crashlytics/UnitTests/Mocks/FIRAppFake.h index f43605e8eb..f7fa65bcd4 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" @interface FIRAppFake : NSObject diff --git a/Example/watchOSSample/Podfile b/Example/watchOSSample/Podfile index 352e00ad5a..7f81f882cc 100644 --- a/Example/watchOSSample/Podfile +++ b/Example/watchOSSample/Podfile @@ -9,6 +9,7 @@ target 'SampleWatchAppWatchKitExtension' do pod 'FirebaseCore', :path => '../../' pod 'FirebaseMessaging', :path => '../../' + pod 'FirebaseCoreInternal', :path => '../../' pod 'FirebaseCoreDiagnostics', :path => '../../' pod 'FirebaseInstallations', :path => '../../' pod 'FirebaseStorage', :path => '../../' diff --git a/FirebaseABTesting/Sources/ABTConditionalUserPropertyController.m b/FirebaseABTesting/Sources/ABTConditionalUserPropertyController.m index e9729a5a54..6f77f04efe 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" @implementation ABTConditionalUserPropertyController { diff --git a/FirebaseABTesting/Sources/ABTConstants.h b/FirebaseABTesting/Sources/ABTConstants.h index 51636d30bd..4edca5e4a6 100644 --- a/FirebaseABTesting/Sources/ABTConstants.h +++ b/FirebaseABTesting/Sources/ABTConstants.h @@ -13,7 +13,7 @@ // limitations under the License. #import -#import "FirebaseCore/Internal/FIRLogger.h" +#import "FirebaseCore/Extension/FIRLogger.h" #define ABT_MSEC_PER_SEC 1000ull diff --git a/FirebaseABTesting/Sources/FIRExperimentController.m b/FirebaseABTesting/Sources/FIRExperimentController.m index 2fc46f1080..9dfadb9193 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" diff --git a/FirebaseABTesting/Tests/Unit/ABTConditionalUserPropertyControllerTest.m b/FirebaseABTesting/Tests/Unit/ABTConditionalUserPropertyControllerTest.m index f0cb531449..0c16a290f1 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" @interface ABTConditionalUserPropertyController (ExposedForTest) - (NSInteger)maxNumberOfExperimentsOfOrigin:(NSString *)origin; diff --git a/FirebaseABTesting/Tests/Unit/FIRExperimentControllerTest.m b/FirebaseABTesting/Tests/Unit/FIRExperimentControllerTest.m index 591e40c3d8..a3fb34c3ac 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" extern ABTExperimentPayload *ABTDeserializeExperimentPayload(NSData *payload); diff --git a/FirebaseAppCheck/Sources/AppAttestProvider/FIRAppAttestProvider.m b/FirebaseAppCheck/Sources/AppAttestProvider/FIRAppAttestProvider.m index 7991317566..a3dd4a840c 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseAppCheck/Sources/Core/APIService/FIRAppCheckAPIService.m b/FirebaseAppCheck/Sources/Core/APIService/FIRAppCheckAPIService.m index 0569ac947c..9cd7311fcb 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import #import diff --git a/FirebaseAppCheck/Sources/Core/FIRAppCheck.m b/FirebaseAppCheck/Sources/Core/FIRAppCheck.m index d2f039c02b..12bc2f4945 100644 --- a/FirebaseAppCheck/Sources/Core/FIRAppCheck.m +++ b/FirebaseAppCheck/Sources/Core/FIRAppCheck.m @@ -38,7 +38,7 @@ #import "FirebaseAppCheck/Interop/FIRAppCheckInterop.h" #import "FirebaseAppCheck/Interop/FIRAppCheckTokenResultInterop.h" -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseAppCheck/Sources/Core/FIRAppCheckLogger.h b/FirebaseAppCheck/Sources/Core/FIRAppCheckLogger.h index 25c754ea6d..28ee60d7c6 100644 --- a/FirebaseAppCheck/Sources/Core/FIRAppCheckLogger.h +++ b/FirebaseAppCheck/Sources/Core/FIRAppCheckLogger.h @@ -16,7 +16,7 @@ #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" extern FIRLoggerService kFIRLoggerAppCheck; diff --git a/FirebaseAppCheck/Sources/Core/FIRAppCheckLogger.m b/FirebaseAppCheck/Sources/Core/FIRAppCheckLogger.m index 8375b15876..587d874f91 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.m b/FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.m index 9a3b941994..2777117ddd 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseAppCheck/Sources/Core/FIRAppCheckValidator.m b/FirebaseAppCheck/Sources/Core/FIRAppCheckValidator.m index 26cce5602d..53b001e160 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" @implementation FIRAppCheckValidator diff --git a/FirebaseAppCheck/Sources/DebugProvider/API/FIRAppCheckDebugProviderAPIService.m b/FirebaseAppCheck/Sources/DebugProvider/API/FIRAppCheckDebugProviderAPIService.m index ed624ef2e7..0115032da3 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseAppCheck/Sources/DebugProvider/FIRAppCheckDebugProvider.m b/FirebaseAppCheck/Sources/DebugProvider/FIRAppCheckDebugProvider.m index 683212acba..75152a7054 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseAppCheck/Sources/DeviceCheckProvider/API/FIRDeviceCheckAPIService.m b/FirebaseAppCheck/Sources/DeviceCheckProvider/API/FIRDeviceCheckAPIService.m index 37da82fbda..5e2c1fc1cf 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseAppCheck/Sources/DeviceCheckProvider/FIRDeviceCheckProvider.m b/FirebaseAppCheck/Sources/DeviceCheckProvider/FIRDeviceCheckProvider.m index 23118c0e32..bc9d330fc6 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseAppCheck/Tests/Unit/AppAttestProvider/FIRAppAttestProviderTests.m b/FirebaseAppCheck/Tests/Unit/AppAttestProvider/FIRAppAttestProviderTests.m index 1b16536ac5..9bee32fcdd 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "SharedTestUtilities/AppCheckBackoffWrapperFake/FIRAppCheckBackoffWrapperFake.h" diff --git a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckAPIServiceTests.m b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckAPIServiceTests.m index 30bcf72075..568bea47b9 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" @interface FIRAppCheckAPIServiceTests : XCTestCase diff --git a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckIntegrationTests.m b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckIntegrationTests.m index d7a494d42d..1ad03f2066 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckSettingsTests.m b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckSettingsTests.m index 4c34f885eb..1b7862f857 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" @interface FIRAppCheckSettingsTests : XCTestCase diff --git a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckTests.m b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckTests.m index 63ccdea0d0..7cb463a4cf 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 9c29057069..8101c635a0 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" @interface FIRAppCheckDebugProviderFactoryTests : XCTestCase @end diff --git a/FirebaseAppCheck/Tests/Unit/DebugProvider/FIRAppCheckDebugProviderTests.m b/FirebaseAppCheck/Tests/Unit/DebugProvider/FIRAppCheckDebugProviderTests.m index 5dd7ecb3c3..821ab1193c 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 38a39da0e4..640b17c8fd 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" typedef BOOL (^FIRRequestValidationBlock)(NSURLRequest *request); diff --git a/FirebaseAppCheck/Tests/Unit/DeviceCheckProvider/FIRDeviceCheckProviderTests.m b/FirebaseAppCheck/Tests/Unit/DeviceCheckProvider/FIRDeviceCheckProviderTests.m index 06118e9d10..ccbfae7d20 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "SharedTestUtilities/AppCheckBackoffWrapperFake/FIRAppCheckBackoffWrapperFake.h" diff --git a/FirebaseAppDistribution/Sources/FIRAppDistribution.m b/FirebaseAppDistribution/Sources/FIRAppDistribution.m index da1ff18f0a..1d38f3fd04 100644 --- a/FirebaseAppDistribution/Sources/FIRAppDistribution.m +++ b/FirebaseAppDistribution/Sources/FIRAppDistribution.m @@ -15,7 +15,7 @@ #import #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 9041fc1ba9..0d3fcb3d9c 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import #import diff --git a/FirebaseAppDistribution/Sources/FIRFADApiService.m b/FirebaseAppDistribution/Sources/FIRFADApiService.m index 34b70206e7..43d026f275 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 565c0fae90..428a971f2b 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/Internal/FIRLogger.h" +#import "FirebaseCore/Extension/FIRLogger.h" FIRLoggerService kFIRLoggerAppDistribution = @"[Firebase/AppDistribution]"; diff --git a/FirebaseAppDistribution/Tests/Unit/FIRAppDistributionMachOTests.m b/FirebaseAppDistribution/Tests/Unit/FIRAppDistributionMachOTests.m index 87bbbf9d57..a7e5eeb738 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" @interface FIRAppDistributionMachOTests : XCTestCase @end diff --git a/FirebaseAppDistribution/Tests/Unit/FIRAppDistributionTests.m b/FirebaseAppDistribution/Tests/Unit/FIRAppDistributionTests.m index a4f793e524..18a530fa02 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 83ebe92935..4a83471132 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h" NSString *const kFakeErrorDomain = @"test.failure.domain"; diff --git a/FirebaseAuth/Sources/Auth/FIRAuth.m b/FirebaseAuth/Sources/Auth/FIRAuth.m index cbbe208298..9ba1c8c23a 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 14d8dcf05e..18e887c13d 100644 --- a/FirebaseAuth/Sources/Auth/FIRAuth_Internal.h +++ b/FirebaseAuth/Sources/Auth/FIRAuth_Internal.h @@ -17,7 +17,7 @@ #import #import "FirebaseAuth/Interop/FIRAuthInterop.h" #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuth.h" -#import "FirebaseCore/Internal/FIRLogger.h" +#import "FirebaseCore/Extension/FIRLogger.h" @class FIRAuthRequestConfiguration; @class FIRAuthURLPresenter; diff --git a/FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthProvider.m b/FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthProvider.m index d7d2a45ab3..80cd2adef6 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 e6989e32df..861102f3aa 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 64acb237f0..b2238b9445 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 e1daaf2c64..641de438bc 100644 --- a/FirebaseAuth/Sources/Storage/FIRAuthKeychainServices.m +++ b/FirebaseAuth/Sources/Storage/FIRAuthKeychainServices.m @@ -18,7 +18,7 @@ #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 b2dc416e89..0445996320 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 4af3367849..3fa4a31a7c 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 4d72b3e6dc..3950f7acc8 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseAuth/Sources/User/FIRUser.m b/FirebaseAuth/Sources/User/FIRUser.m index 5b76ad80df..61425e10a6 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseAuth/Sources/Auth/FIRAuthDataResult_Internal.h" #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h" diff --git a/FirebaseAuth/Tests/Sample/Podfile b/FirebaseAuth/Tests/Sample/Podfile index fb9f2a0b34..79dd144ab2 100644 --- a/FirebaseAuth/Tests/Sample/Podfile +++ b/FirebaseAuth/Tests/Sample/Podfile @@ -12,6 +12,7 @@ target 'AuthSample' do platform :ios, '10.0' pod 'FirebaseCore', :path => '../../../' pod 'FirebaseCoreDiagnostics', :path => '../../../' + pod 'FirebaseCoreInternal', :path => '../../../' pod 'FirebaseAuth', :path => '../../../', :testspecs => ['unit'] pod 'FirebaseInstallations', :path => '../../..' pod 'FBSDKLoginKit' diff --git a/FirebaseAuth/Tests/Unit/FIRApp+FIRAuthUnitTests.h b/FirebaseAuth/Tests/Unit/FIRApp+FIRAuthUnitTests.h index f1a10fff87..944c1b5288 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 90a5d62180..0878c56647 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseAuth/Tests/Unit/FIRApp+FIRAuthUnitTests.h" diff --git a/FirebaseAuth/Tests/Unit/FIRAuthLifeCycleTests.m b/FirebaseAuth/Tests/Unit/FIRAuthLifeCycleTests.m index 21b25255bc..f34580b699 100644 --- a/FirebaseAuth/Tests/Unit/FIRAuthLifeCycleTests.m +++ b/FirebaseAuth/Tests/Unit/FIRAuthLifeCycleTests.m @@ -17,7 +17,7 @@ #import #import "FirebaseAuth/Interop/FIRAuthInterop.h" -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h" #import "FirebaseAuth/Sources/Backend/FIRAuthRequestConfiguration.h" diff --git a/FirebaseAuth/Tests/Unit/FIRAuthTests.m b/FirebaseAuth/Tests/Unit/FIRAuthTests.m index 6110457664..989654b505 100644 --- a/FirebaseAuth/Tests/Unit/FIRAuthTests.m +++ b/FirebaseAuth/Tests/Unit/FIRAuthTests.m @@ -27,7 +27,7 @@ #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRFacebookAuthProvider.h" #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRGoogleAuthProvider.h" #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIROAuthProvider.h" -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseAuth/Sources/Auth/FIRAuthDispatcher.h" #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h" diff --git a/FirebaseAuth/Tests/Unit/FIROAuthProviderTests.m b/FirebaseAuth/Tests/Unit/FIROAuthProviderTests.m index e03e0f2988..59e7da9b70 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 a8ec51be87..e97ef2b539 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 8f359c2384..c1646765f1 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" // Firebase Auth #import diff --git a/FirebaseCore.podspec b/FirebaseCore.podspec index 8f0306edb9..837a3f39a7 100644 --- a/FirebaseCore.podspec +++ b/FirebaseCore.podspec @@ -33,18 +33,17 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration s.source_files = [ 'FirebaseCore/Sources/**/*.[mh]', - 'FirebaseCore/Internal/*.h', - 'Interop/CoreDiagnostics/Public/*.h', - 'HeartbeatLogging/Sources/**/*.swift', + 'FirebaseCore/Extension/*.h', + 'Interop/CoreDiagnostics/Public/*.h' ] s.swift_version = '5.3' s.public_header_files = [ 'FirebaseCore/Sources/Public/FirebaseCore/*.h', - 'FirebaseCore/Internal/*.h', + 'FirebaseCore/Extension/*.h', ] - s.private_header_files = 'FirebaseCore/Internal/*.h' + s.private_header_files = 'FirebaseCore/Extension/*.h' s.framework = 'Foundation' s.ios.framework = 'UIKit' @@ -54,8 +53,8 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration # Remember to also update version in `cmake/external/GoogleUtilities.cmake` s.dependency 'GoogleUtilities/Environment', '~> 7.7' s.dependency 'GoogleUtilities/Logger', '~> 7.7' - s.dependency 'GoogleUtilities/NSData+zlib', '~> 7.7' s.dependency 'FirebaseCoreDiagnostics', '~> 8.0' + s.dependency 'FirebaseCoreInternal', '~> 8.12' s.pod_target_xcconfig = { 'GCC_C_LANGUAGE_STANDARD' => 'c99', @@ -71,7 +70,7 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration unit_tests.scheme = { :code_coverage => true } unit_tests.platforms = { :ios => ios_deployment_target, - :osx => osx_deployment_target, + :osx => '10.15', :tvos => tvos_deployment_target } unit_tests.source_files = [ diff --git a/FirebaseCore/Internal/FIRAppInternal.h b/FirebaseCore/Extension/FIRAppInternal.h similarity index 100% rename from FirebaseCore/Internal/FIRAppInternal.h rename to FirebaseCore/Extension/FIRAppInternal.h diff --git a/FirebaseCore/Internal/FIRComponent.h b/FirebaseCore/Extension/FIRComponent.h similarity index 100% rename from FirebaseCore/Internal/FIRComponent.h rename to FirebaseCore/Extension/FIRComponent.h diff --git a/FirebaseCore/Internal/FIRComponentContainer.h b/FirebaseCore/Extension/FIRComponentContainer.h similarity index 100% rename from FirebaseCore/Internal/FIRComponentContainer.h rename to FirebaseCore/Extension/FIRComponentContainer.h diff --git a/FirebaseCore/Internal/FIRComponentType.h b/FirebaseCore/Extension/FIRComponentType.h similarity index 100% rename from FirebaseCore/Internal/FIRComponentType.h rename to FirebaseCore/Extension/FIRComponentType.h diff --git a/FirebaseCore/Internal/FIRCoreDiagnosticsConnector.h b/FirebaseCore/Extension/FIRCoreDiagnosticsConnector.h similarity index 100% rename from FirebaseCore/Internal/FIRCoreDiagnosticsConnector.h rename to FirebaseCore/Extension/FIRCoreDiagnosticsConnector.h diff --git a/FirebaseCore/Internal/FIRDependency.h b/FirebaseCore/Extension/FIRDependency.h similarity index 100% rename from FirebaseCore/Internal/FIRDependency.h rename to FirebaseCore/Extension/FIRDependency.h diff --git a/FirebaseCore/Internal/FIRHeartbeatInfo.h b/FirebaseCore/Extension/FIRHeartbeatInfo.h similarity index 100% rename from FirebaseCore/Internal/FIRHeartbeatInfo.h rename to FirebaseCore/Extension/FIRHeartbeatInfo.h diff --git a/FirebaseCore/Internal/FIRHeartbeatLogger.h b/FirebaseCore/Extension/FIRHeartbeatLogger.h similarity index 100% rename from FirebaseCore/Internal/FIRHeartbeatLogger.h rename to FirebaseCore/Extension/FIRHeartbeatLogger.h diff --git a/FirebaseCore/Internal/FIRLibrary.h b/FirebaseCore/Extension/FIRLibrary.h similarity index 100% rename from FirebaseCore/Internal/FIRLibrary.h rename to FirebaseCore/Extension/FIRLibrary.h diff --git a/FirebaseCore/Internal/FIRLogger.h b/FirebaseCore/Extension/FIRLogger.h similarity index 100% rename from FirebaseCore/Internal/FIRLogger.h rename to FirebaseCore/Extension/FIRLogger.h diff --git a/FirebaseCore/Internal/FIROptionsInternal.h b/FirebaseCore/Extension/FIROptionsInternal.h similarity index 100% rename from FirebaseCore/Internal/FIROptionsInternal.h rename to FirebaseCore/Extension/FIROptionsInternal.h diff --git a/FirebaseCore/Internal/FirebaseCoreInternal.h b/FirebaseCore/Extension/FirebaseCoreInternal.h similarity index 100% rename from FirebaseCore/Internal/FirebaseCoreInternal.h rename to FirebaseCore/Extension/FirebaseCoreInternal.h diff --git a/FirebaseCore/Internal/dummy.m b/FirebaseCore/Extension/dummy.m similarity index 100% rename from FirebaseCore/Internal/dummy.m rename to FirebaseCore/Extension/dummy.m diff --git a/HeartbeatLogging/Sources/Heartbeat.swift b/FirebaseCore/Internal/Sources/HeartbeatLogging/Heartbeat.swift similarity index 100% rename from HeartbeatLogging/Sources/Heartbeat.swift rename to FirebaseCore/Internal/Sources/HeartbeatLogging/Heartbeat.swift diff --git a/HeartbeatLogging/Sources/HeartbeatController.swift b/FirebaseCore/Internal/Sources/HeartbeatLogging/HeartbeatController.swift similarity index 100% rename from HeartbeatLogging/Sources/HeartbeatController.swift rename to FirebaseCore/Internal/Sources/HeartbeatLogging/HeartbeatController.swift diff --git a/HeartbeatLogging/Sources/HeartbeatStorage.swift b/FirebaseCore/Internal/Sources/HeartbeatLogging/HeartbeatStorage.swift similarity index 100% rename from HeartbeatLogging/Sources/HeartbeatStorage.swift rename to FirebaseCore/Internal/Sources/HeartbeatLogging/HeartbeatStorage.swift diff --git a/HeartbeatLogging/Sources/HeartbeatsBundle.swift b/FirebaseCore/Internal/Sources/HeartbeatLogging/HeartbeatsBundle.swift similarity index 100% rename from HeartbeatLogging/Sources/HeartbeatsBundle.swift rename to FirebaseCore/Internal/Sources/HeartbeatLogging/HeartbeatsBundle.swift diff --git a/HeartbeatLogging/Sources/HeartbeatsPayload.swift b/FirebaseCore/Internal/Sources/HeartbeatLogging/HeartbeatsPayload.swift similarity index 100% rename from HeartbeatLogging/Sources/HeartbeatsPayload.swift rename to FirebaseCore/Internal/Sources/HeartbeatLogging/HeartbeatsPayload.swift diff --git a/HeartbeatLogging/Sources/RingBuffer.swift b/FirebaseCore/Internal/Sources/HeartbeatLogging/RingBuffer.swift similarity index 100% rename from HeartbeatLogging/Sources/RingBuffer.swift rename to FirebaseCore/Internal/Sources/HeartbeatLogging/RingBuffer.swift diff --git a/HeartbeatLogging/Sources/Storage.swift b/FirebaseCore/Internal/Sources/HeartbeatLogging/Storage.swift similarity index 100% rename from HeartbeatLogging/Sources/Storage.swift rename to FirebaseCore/Internal/Sources/HeartbeatLogging/Storage.swift diff --git a/HeartbeatLogging/Sources/StorageFactory.swift b/FirebaseCore/Internal/Sources/HeartbeatLogging/StorageFactory.swift similarity index 100% rename from HeartbeatLogging/Sources/StorageFactory.swift rename to FirebaseCore/Internal/Sources/HeartbeatLogging/StorageFactory.swift diff --git a/HeartbeatLogging/Sources/WeakContainer.swift b/FirebaseCore/Internal/Sources/HeartbeatLogging/WeakContainer.swift similarity index 100% rename from HeartbeatLogging/Sources/WeakContainer.swift rename to FirebaseCore/Internal/Sources/HeartbeatLogging/WeakContainer.swift diff --git a/HeartbeatLogging/Sources/_ObjC_HeartbeatController.swift b/FirebaseCore/Internal/Sources/HeartbeatLogging/_ObjC_HeartbeatController.swift similarity index 100% rename from HeartbeatLogging/Sources/_ObjC_HeartbeatController.swift rename to FirebaseCore/Internal/Sources/HeartbeatLogging/_ObjC_HeartbeatController.swift diff --git a/HeartbeatLogging/Sources/_ObjC_HeartbeatsPayload.swift b/FirebaseCore/Internal/Sources/HeartbeatLogging/_ObjC_HeartbeatsPayload.swift similarity index 100% rename from HeartbeatLogging/Sources/_ObjC_HeartbeatsPayload.swift rename to FirebaseCore/Internal/Sources/HeartbeatLogging/_ObjC_HeartbeatsPayload.swift diff --git a/FirebaseCore/Internal/Tests/Common/Assertions.swift b/FirebaseCore/Internal/Tests/Common/Assertions.swift new file mode 100644 index 0000000000..7ba718f42e --- /dev/null +++ b/FirebaseCore/Internal/Tests/Common/Assertions.swift @@ -0,0 +1,30 @@ +// 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 XCTest +@testable import FirebaseCoreInternal +import HeartbeatLoggingTestUtils + +// MARK: - Assertions + +func assertHeartbeatControllerFlushesEmptyPayload(_ controller: HeartbeatController) { + XCTAssertEqual( + controller.flushHeartbeatFromToday().headerValue(), + HeartbeatsPayload.emptyPayload.headerValue() + ) + XCTAssertEqual( + controller.flush().headerValue(), + HeartbeatsPayload.emptyPayload.headerValue() + ) +} diff --git a/HeartbeatLogging/Tests/Integration/HeartbeatLoggingIntegrationTests.swift b/FirebaseCore/Internal/Tests/Integration/HeartbeatLoggingIntegrationTests.swift similarity index 99% rename from HeartbeatLogging/Tests/Integration/HeartbeatLoggingIntegrationTests.swift rename to FirebaseCore/Internal/Tests/Integration/HeartbeatLoggingIntegrationTests.swift index d94085ceab..5cc744a02e 100644 --- a/HeartbeatLogging/Tests/Integration/HeartbeatLoggingIntegrationTests.swift +++ b/FirebaseCore/Internal/Tests/Integration/HeartbeatLoggingIntegrationTests.swift @@ -13,7 +13,7 @@ // limitations under the License. import XCTest -@testable import HeartbeatLogging +@testable import FirebaseCoreInternal import HeartbeatLoggingTestUtils class HeartbeatLoggingIntegrationTests: XCTestCase { diff --git a/HeartbeatLogging/Tests/Unit/HeartbeatControllerTests.swift b/FirebaseCore/Internal/Tests/Unit/HeartbeatControllerTests.swift similarity index 96% rename from HeartbeatLogging/Tests/Unit/HeartbeatControllerTests.swift rename to FirebaseCore/Internal/Tests/Unit/HeartbeatControllerTests.swift index 7107200aed..f89f61ba2a 100644 --- a/HeartbeatLogging/Tests/Unit/HeartbeatControllerTests.swift +++ b/FirebaseCore/Internal/Tests/Unit/HeartbeatControllerTests.swift @@ -13,7 +13,7 @@ // limitations under the License. import XCTest -@testable import HeartbeatLogging +@testable import FirebaseCoreInternal import HeartbeatLoggingTestUtils class HeartbeatControllerTests: XCTestCase { @@ -406,16 +406,3 @@ private class HeartbeatStorageFake: HeartbeatStorageProtocol { return oldHeartbeatsBundle } } - -// MARK: - Assertions - -func assertHeartbeatControllerFlushesEmptyPayload(_ controller: HeartbeatController) { - XCTAssertEqual( - controller.flushHeartbeatFromToday().headerValue(), - HeartbeatsPayload.emptyPayload.headerValue() - ) - XCTAssertEqual( - controller.flush().headerValue(), - HeartbeatsPayload.emptyPayload.headerValue() - ) -} diff --git a/HeartbeatLogging/Tests/Unit/HeartbeatStorageTests.swift b/FirebaseCore/Internal/Tests/Unit/HeartbeatStorageTests.swift similarity index 99% rename from HeartbeatLogging/Tests/Unit/HeartbeatStorageTests.swift rename to FirebaseCore/Internal/Tests/Unit/HeartbeatStorageTests.swift index dccf788fe7..5b954e0bc7 100644 --- a/HeartbeatLogging/Tests/Unit/HeartbeatStorageTests.swift +++ b/FirebaseCore/Internal/Tests/Unit/HeartbeatStorageTests.swift @@ -13,8 +13,7 @@ // limitations under the License. import XCTest -@testable import HeartbeatLogging - +@testable import FirebaseCoreInternal class HeartbeatStorageTests: XCTestCase { // MARK: - Instance Management diff --git a/HeartbeatLogging/Tests/Unit/HeartbeatTests.swift b/FirebaseCore/Internal/Tests/Unit/HeartbeatTests.swift similarity index 98% rename from HeartbeatLogging/Tests/Unit/HeartbeatTests.swift rename to FirebaseCore/Internal/Tests/Unit/HeartbeatTests.swift index 7d9b56c136..82d48e09f6 100644 --- a/HeartbeatLogging/Tests/Unit/HeartbeatTests.swift +++ b/FirebaseCore/Internal/Tests/Unit/HeartbeatTests.swift @@ -13,7 +13,7 @@ // limitations under the License. import XCTest -@testable import HeartbeatLogging +@testable import FirebaseCoreInternal class TimePeriodTests: XCTestCase { override func setUpWithError() throws { diff --git a/HeartbeatLogging/Tests/Unit/HeartbeatsBundleTests.swift b/FirebaseCore/Internal/Tests/Unit/HeartbeatsBundleTests.swift similarity index 99% rename from HeartbeatLogging/Tests/Unit/HeartbeatsBundleTests.swift rename to FirebaseCore/Internal/Tests/Unit/HeartbeatsBundleTests.swift index b8269a9cb6..849486b586 100644 --- a/HeartbeatLogging/Tests/Unit/HeartbeatsBundleTests.swift +++ b/FirebaseCore/Internal/Tests/Unit/HeartbeatsBundleTests.swift @@ -13,7 +13,7 @@ // limitations under the License. import XCTest -@testable import HeartbeatLogging +@testable import FirebaseCoreInternal import HeartbeatLoggingTestUtils class HeartbeatsBundleTests: XCTestCase { diff --git a/HeartbeatLogging/Tests/Unit/HeartbeatsPayloadTests.swift b/FirebaseCore/Internal/Tests/Unit/HeartbeatsPayloadTests.swift similarity index 98% rename from HeartbeatLogging/Tests/Unit/HeartbeatsPayloadTests.swift rename to FirebaseCore/Internal/Tests/Unit/HeartbeatsPayloadTests.swift index d0a2c64c60..c5a198c801 100644 --- a/HeartbeatLogging/Tests/Unit/HeartbeatsPayloadTests.swift +++ b/FirebaseCore/Internal/Tests/Unit/HeartbeatsPayloadTests.swift @@ -13,7 +13,7 @@ // limitations under the License. import XCTest -@testable import HeartbeatLogging +@testable import FirebaseCoreInternal import HeartbeatLoggingTestUtils class HeartbeatsPayloadTests: XCTestCase { diff --git a/HeartbeatLogging/Tests/Unit/RingBufferTests.swift b/FirebaseCore/Internal/Tests/Unit/RingBufferTests.swift similarity index 99% rename from HeartbeatLogging/Tests/Unit/RingBufferTests.swift rename to FirebaseCore/Internal/Tests/Unit/RingBufferTests.swift index f48707b289..22f5691ed5 100644 --- a/HeartbeatLogging/Tests/Unit/RingBufferTests.swift +++ b/FirebaseCore/Internal/Tests/Unit/RingBufferTests.swift @@ -13,7 +13,7 @@ // limitations under the License. import XCTest -@testable import HeartbeatLogging +@testable import FirebaseCoreInternal class RingBufferTests: XCTestCase { // `RingBuffer` is a generic type. `String` is used for simplified testing. diff --git a/HeartbeatLogging/Tests/Unit/StorageTests.swift b/FirebaseCore/Internal/Tests/Unit/StorageTests.swift similarity index 99% rename from HeartbeatLogging/Tests/Unit/StorageTests.swift rename to FirebaseCore/Internal/Tests/Unit/StorageTests.swift index 090ae58561..baa62eaee3 100644 --- a/HeartbeatLogging/Tests/Unit/StorageTests.swift +++ b/FirebaseCore/Internal/Tests/Unit/StorageTests.swift @@ -13,7 +13,7 @@ // limitations under the License. import XCTest -@testable import HeartbeatLogging +@testable import FirebaseCoreInternal private enum Constants { static let testData = "test_data".data(using: .utf8)! diff --git a/HeartbeatLogging/Tests/Unit/WeakContainerTests.swift b/FirebaseCore/Internal/Tests/Unit/WeakContainerTests.swift similarity index 96% rename from HeartbeatLogging/Tests/Unit/WeakContainerTests.swift rename to FirebaseCore/Internal/Tests/Unit/WeakContainerTests.swift index 7b44aec4f9..68fda20e4a 100644 --- a/HeartbeatLogging/Tests/Unit/WeakContainerTests.swift +++ b/FirebaseCore/Internal/Tests/Unit/WeakContainerTests.swift @@ -13,7 +13,7 @@ // limitations under the License. import XCTest -@testable import HeartbeatLogging +@testable import FirebaseCoreInternal class WeakContainerTests: XCTestCase { func testContainersObjectIsWeaklyRetained() throws { diff --git a/FirebaseCore/Sources/FIRApp.m b/FirebaseCore/Sources/FIRApp.m index c564a76f9e..ab11177b50 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/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/Extension/FIRAppInternal.h" +#import "FirebaseCore/Extension/FIRCoreDiagnosticsConnector.h" +#import "FirebaseCore/Extension/FIRLibrary.h" +#import "FirebaseCore/Extension/FIRLogger.h" +#import "FirebaseCore/Extension/FIROptionsInternal.h" #import "FirebaseCore/Sources/Public/FirebaseCore/FIRVersion.h" #import diff --git a/FirebaseCore/Sources/FIRComponent.m b/FirebaseCore/Sources/FIRComponent.m index f81869aa98..d64d296d2d 100644 --- a/FirebaseCore/Sources/FIRComponent.m +++ b/FirebaseCore/Sources/FIRComponent.m @@ -14,10 +14,10 @@ * limitations under the License. */ -#import "FirebaseCore/Internal/FIRComponent.h" +#import "FirebaseCore/Extension/FIRComponent.h" -#import "FirebaseCore/Internal/FIRComponentContainer.h" -#import "FirebaseCore/Internal/FIRDependency.h" +#import "FirebaseCore/Extension/FIRComponentContainer.h" +#import "FirebaseCore/Extension/FIRDependency.h" @interface FIRComponent () diff --git a/FirebaseCore/Sources/FIRComponentContainer.m b/FirebaseCore/Sources/FIRComponentContainer.m index be50fe8141..771d03d38b 100644 --- a/FirebaseCore/Sources/FIRComponentContainer.m +++ b/FirebaseCore/Sources/FIRComponentContainer.m @@ -14,12 +14,12 @@ * limitations under the License. */ -#import "FirebaseCore/Internal/FIRComponentContainer.h" +#import "FirebaseCore/Extension/FIRComponentContainer.h" -#import "FirebaseCore/Internal/FIRAppInternal.h" -#import "FirebaseCore/Internal/FIRComponent.h" -#import "FirebaseCore/Internal/FIRLibrary.h" -#import "FirebaseCore/Internal/FIRLogger.h" +#import "FirebaseCore/Extension/FIRAppInternal.h" +#import "FirebaseCore/Extension/FIRComponent.h" +#import "FirebaseCore/Extension/FIRLibrary.h" +#import "FirebaseCore/Extension/FIRLogger.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseCore/Sources/FIRComponentContainerInternal.h b/FirebaseCore/Sources/FIRComponentContainerInternal.h index 2004f3f1cf..13c33e8c1d 100644 --- a/FirebaseCore/Sources/FIRComponentContainerInternal.h +++ b/FirebaseCore/Sources/FIRComponentContainerInternal.h @@ -15,8 +15,8 @@ */ #import -#import "FirebaseCore/Internal/FIRComponentContainer.h" -#import "FirebaseCore/Internal/FIRLibrary.h" +#import "FirebaseCore/Extension/FIRComponentContainer.h" +#import "FirebaseCore/Extension/FIRLibrary.h" @class FIRApp; diff --git a/FirebaseCore/Sources/FIRComponentType.m b/FirebaseCore/Sources/FIRComponentType.m index a066a5528a..c9cd2ad2c2 100644 --- a/FirebaseCore/Sources/FIRComponentType.m +++ b/FirebaseCore/Sources/FIRComponentType.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FirebaseCore/Internal/FIRComponentType.h" +#import "FirebaseCore/Extension/FIRComponentType.h" #import "FirebaseCore/Sources/FIRComponentContainerInternal.h" diff --git a/FirebaseCore/Sources/FIRCoreDiagnosticsConnector.m b/FirebaseCore/Sources/FIRCoreDiagnosticsConnector.m index 210fd1d66f..beff9e6385 100644 --- a/FirebaseCore/Sources/FIRCoreDiagnosticsConnector.m +++ b/FirebaseCore/Sources/FIRCoreDiagnosticsConnector.m @@ -14,14 +14,14 @@ * limitations under the License. */ -#import "FirebaseCore/Internal/FIRCoreDiagnosticsConnector.h" +#import "FirebaseCore/Extension/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/Extension/FIRAppInternal.h" +#import "FirebaseCore/Extension/FIROptionsInternal.h" #import "FirebaseCore/Sources/FIRDiagnosticsData.h" // Define the interop class symbol declared as an extern in FIRCoreDiagnosticsInterop. diff --git a/FirebaseCore/Sources/FIRDependency.m b/FirebaseCore/Sources/FIRDependency.m index cdb63e29dd..5c5bf7c43e 100644 --- a/FirebaseCore/Sources/FIRDependency.m +++ b/FirebaseCore/Sources/FIRDependency.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FirebaseCore/Internal/FIRDependency.h" +#import "FirebaseCore/Extension/FIRDependency.h" @interface FIRDependency () diff --git a/FirebaseCore/Sources/FIRDiagnosticsData.m b/FirebaseCore/Sources/FIRDiagnosticsData.m index dcbd8e6cfb..871e558b77 100644 --- a/FirebaseCore/Sources/FIRDiagnosticsData.m +++ b/FirebaseCore/Sources/FIRDiagnosticsData.m @@ -18,8 +18,8 @@ #import "FirebaseCore/Sources/Public/FirebaseCore/FIRApp.h" -#import "FirebaseCore/Internal/FIRAppInternal.h" -#import "FirebaseCore/Internal/FIROptionsInternal.h" +#import "FirebaseCore/Extension/FIRAppInternal.h" +#import "FirebaseCore/Extension/FIROptionsInternal.h" @implementation FIRDiagnosticsData { /** Backing ivar for the diagnosticObjects property. */ diff --git a/FirebaseCore/Sources/FIRHeartbeatInfo.m b/FirebaseCore/Sources/FIRHeartbeatInfo.m index 1ef1121909..d4d1f2b264 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/Internal/FIRHeartbeatInfo.h" +#import "FirebaseCore/Extension/FIRHeartbeatInfo.h" #import #import #import #import -#import "FirebaseCore/Internal/FIRAppInternal.h" +#import "FirebaseCore/Extension/FIRAppInternal.h" const static long secondsInDay = 86400; @implementation FIRHeartbeatInfo : NSObject diff --git a/FirebaseCore/Sources/FIRHeartbeatLogger.m b/FirebaseCore/Sources/FIRHeartbeatLogger.m index ee1e9ac4e3..0b133d3a15 100644 --- a/FirebaseCore/Sources/FIRHeartbeatLogger.m +++ b/FirebaseCore/Sources/FIRHeartbeatLogger.m @@ -14,15 +14,11 @@ #import -#import "FirebaseCore/Internal/FIRHeartbeatLogger.h" +#import "FirebaseCore/Extension/FIRHeartbeatLogger.h" -#if SWIFT_PACKAGE -@import HeartbeatLogging; -#else -#import -#endif // SWIFT_PACKAGE +@import FirebaseCoreInternal; -#import "FirebaseCore/Internal/FIRAppInternal.h" +#import "FirebaseCore/Extension/FIRAppInternal.h" NSString *_Nullable FIRHeaderValueFromHeartbeatsPayload(FIRHeartbeatsPayload *heartbeatsPayload) { if ([heartbeatsPayload isEmpty]) { diff --git a/FirebaseCore/Sources/FIRLogger.m b/FirebaseCore/Sources/FIRLogger.m index d18bd63ae7..a4811179df 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/Internal/FIRLogger.h" +#import "FirebaseCore/Extension/FIRLogger.h" #import #import diff --git a/FirebaseCore/Sources/FIROptions.m b/FirebaseCore/Sources/FIROptions.m index d7c92b1c4e..c769e97fad 100644 --- a/FirebaseCore/Sources/FIROptions.m +++ b/FirebaseCore/Sources/FIROptions.m @@ -12,9 +12,9 @@ // 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/Extension/FIRAppInternal.h" +#import "FirebaseCore/Extension/FIRLogger.h" +#import "FirebaseCore/Extension/FIROptionsInternal.h" #import "FirebaseCore/Sources/FIRBundleUtil.h" #import "FirebaseCore/Sources/Public/FirebaseCore/FIRVersion.h" diff --git a/FirebaseCore/Tests/SwiftUnit/FirebaseCore-unit-Bridging-Header.h b/FirebaseCore/Tests/SwiftUnit/FirebaseCore-unit-Bridging-Header.h index 297ebbbd9d..c1c36c6406 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 4ca6b5e154..0589e7c808 100644 --- a/FirebaseCore/Tests/Unit/FIRAppTest.m +++ b/FirebaseCore/Tests/Unit/FIRAppTest.m @@ -16,10 +16,10 @@ #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/Extension/FIRAppInternal.h" +#import "FirebaseCore/Extension/FIRComponentType.h" +#import "FirebaseCore/Extension/FIRCoreDiagnosticsConnector.h" +#import "FirebaseCore/Extension/FIROptionsInternal.h" #import "FirebaseCore/Sources/FIRAnalyticsConfiguration.h" #import "SharedTestUtilities/FIROptionsMock.h" diff --git a/FirebaseCore/Tests/Unit/FIRComponentContainerTest.m b/FirebaseCore/Tests/Unit/FIRComponentContainerTest.m index 7b0f63aea9..7b2d8cacf0 100644 --- a/FirebaseCore/Tests/Unit/FIRComponentContainerTest.m +++ b/FirebaseCore/Tests/Unit/FIRComponentContainerTest.m @@ -14,8 +14,8 @@ #import "FirebaseCore/Tests/Unit/FIRTestCase.h" -#import "FirebaseCore/Internal/FIRComponentType.h" -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FIRComponentType.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseCore/Sources/FIRComponentContainerInternal.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 23b450921a..913fecfdf1 100644 --- a/FirebaseCore/Tests/Unit/FIRComponentTypeTest.m +++ b/FirebaseCore/Tests/Unit/FIRComponentTypeTest.m @@ -14,7 +14,7 @@ #import "FirebaseCore/Tests/Unit/FIRTestCase.h" -#import "FirebaseCore/Internal/FIRComponentType.h" +#import "FirebaseCore/Extension/FIRComponentType.h" #import "FirebaseCore/Sources/FIRComponentContainerInternal.h" #import "FirebaseCore/Tests/Unit/FIRTestComponents.h" diff --git a/FirebaseCore/Tests/Unit/FIRHeartbeatInfoTest.m b/FirebaseCore/Tests/Unit/FIRHeartbeatInfoTest.m index ee52c11a55..5526a9fb2a 100644 --- a/FirebaseCore/Tests/Unit/FIRHeartbeatInfoTest.m +++ b/FirebaseCore/Tests/Unit/FIRHeartbeatInfoTest.m @@ -16,7 +16,7 @@ #import #import #import -#import "FirebaseCore/Internal/FIRHeartbeatInfo.h" +#import "FirebaseCore/Extension/FIRHeartbeatInfo.h" /// Taken from the implementation of `FIRHeartbeatInfo.m`. NSString *const kFIRCoreSuiteName = @"com.firebase.core"; diff --git a/FirebaseCore/Tests/Unit/FIRHeartbeatLoggerTest.m b/FirebaseCore/Tests/Unit/FIRHeartbeatLoggerTest.m index 6db69736c8..d9b5883666 100644 --- a/FirebaseCore/Tests/Unit/FIRHeartbeatLoggerTest.m +++ b/FirebaseCore/Tests/Unit/FIRHeartbeatLoggerTest.m @@ -14,13 +14,9 @@ #import -#if SWIFT_PACKAGE @import HeartbeatLoggingTestUtils; -#else -#import -#endif // SWIFT_PACKAGE -#import "FirebaseCore/Internal/FIRHeartbeatLogger.h" +#import "FirebaseCore/Extension/FIRHeartbeatLogger.h" @interface FIRHeartbeatLogger (Internal) - (instancetype)initWithAppID:(NSString *)appID diff --git a/FirebaseCore/Tests/Unit/FIRLoggerTest.m b/FirebaseCore/Tests/Unit/FIRLoggerTest.m index 12137a8aaa..1802c24bde 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/Internal/FIRLogger.h" +#import "FirebaseCore/Extension/FIRLogger.h" #import diff --git a/FirebaseCore/Tests/Unit/FIROptionsTest.m b/FirebaseCore/Tests/Unit/FIROptionsTest.m index 8dea3b1fcc..1e20470a92 100644 --- a/FirebaseCore/Tests/Unit/FIROptionsTest.m +++ b/FirebaseCore/Tests/Unit/FIROptionsTest.m @@ -14,8 +14,8 @@ #import "FirebaseCore/Tests/Unit/FIRTestCase.h" -#import "FirebaseCore/Internal/FIRAppInternal.h" -#import "FirebaseCore/Internal/FIROptionsInternal.h" +#import "FirebaseCore/Extension/FIRAppInternal.h" +#import "FirebaseCore/Extension/FIROptionsInternal.h" #import "FirebaseCore/Sources/FIRBundleUtil.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 3462474655..78faf6122c 100644 --- a/FirebaseCore/Tests/Unit/FIRTestComponents.h +++ b/FirebaseCore/Tests/Unit/FIRTestComponents.h @@ -14,9 +14,9 @@ #import -#import "FirebaseCore/Internal/FIRComponent.h" -#import "FirebaseCore/Internal/FIRComponentContainer.h" -#import "FirebaseCore/Internal/FIRLibrary.h" +#import "FirebaseCore/Extension/FIRComponent.h" +#import "FirebaseCore/Extension/FIRComponentContainer.h" +#import "FirebaseCore/Extension/FIRLibrary.h" @protocol FIRComponentRegistrant; diff --git a/FirebaseCore/Tests/Unit/FIRTestComponents.m b/FirebaseCore/Tests/Unit/FIRTestComponents.m index f45325ca62..c79e689e3e 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/Internal/FIRComponentType.h" -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FIRComponentType.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #pragma mark - Standard Component diff --git a/FirebaseCoreExtension.podspec b/FirebaseCoreExtension.podspec new file mode 100644 index 0000000000..2c1a9efb3c --- /dev/null +++ b/FirebaseCoreExtension.podspec @@ -0,0 +1,32 @@ +Pod::Spec.new do |s| + s.name = 'FirebaseCoreExtension' + s.version = '8.12.0' + s.summary = 'Extended FirebaseCore APIs for Firebase product SDKs' + + s.description = <<-DESC + Not for public use. + Common FirebaseCore APIs for use in Firebase product SDKs. + DESC + + s.homepage = 'https://firebase.google.com' + s.license = { :type => 'Apache', :file => 'LICENSE' } + s.authors = 'Google, Inc.' + + s.source = { + :git => 'https://github.com/firebase/firebase-ios-sdk.git', + :tag => 'CocoaPods-' + s.version.to_s + } + s.social_media_url = 'https://twitter.com/Firebase' + + s.swift_version = '5.3' + + s.ios.deployment_target = '9.0' + s.osx.deployment_target = '10.12' + s.tvos.deployment_target = '10.0' + s.watchos.deployment_target = '6.0' + + s.source_files = 'FirebaseCore/Extension/*.[hm]' + s.public_header_files = 'FirebaseCore/Extension/*.h' + + s.dependency 'FirebaseCore', '~> 8.12' + end \ No newline at end of file diff --git a/FirebaseCoreInternal.podspec b/FirebaseCoreInternal.podspec index 14ad2c81ad..d8e5affebf 100644 --- a/FirebaseCoreInternal.podspec +++ b/FirebaseCoreInternal.podspec @@ -1,11 +1,11 @@ Pod::Spec.new do |s| s.name = 'FirebaseCoreInternal' s.version = '8.13.0' - s.summary = 'APIs only for Firebase internal usage' + s.summary = 'APIs for internal FirebaseCore usage.' s.description = <<-DESC Not for public use. - Common APIs for internal Firebase usage. + Common APIs for internal FirebaseCore usage. DESC s.homepage = 'https://firebase.google.com' @@ -17,13 +17,58 @@ Pod::Spec.new do |s| :tag => 'CocoaPods-' + s.version.to_s } s.social_media_url = 'https://twitter.com/Firebase' - s.ios.deployment_target = '9.0' - s.osx.deployment_target = '10.12' - s.tvos.deployment_target = '10.0' - s.watchos.deployment_target = '6.0' - s.source_files = 'FirebaseCore/Internal/*.[hm]' - s.public_header_files = 'FirebaseCore/Internal/*.h' + ios_deployment_target = '9.0' + osx_deployment_target = '10.12' + tvos_deployment_target = '10.0' + watchos_deployment_target = '6.0' - s.dependency 'FirebaseCore', '~> 8.12' -end \ No newline at end of file + s.ios.deployment_target = ios_deployment_target + s.osx.deployment_target = osx_deployment_target + s.tvos.deployment_target = tvos_deployment_target + s.watchos.deployment_target = watchos_deployment_target + + s.source_files = [ + 'FirebaseCore/Internal/Sources/**/*.swift' + ] + + s.swift_version = '5.3' + + s.dependency 'GoogleUtilities/NSData+zlib', '~> 7.7' + + # Using environment variable because of the dependency on the unpublished + # HeartbeatLoggingTestUtils. + if ENV['POD_LIB_LINT_ONLY'] && ENV['POD_LIB_LINT_ONLY'] == '1' then + s.test_spec 'Unit' do |unit_tests| + unit_tests.scheme = { :code_coverage => true } + unit_tests.platforms = { + :ios => ios_deployment_target, + :osx => osx_deployment_target, + :tvos => tvos_deployment_target + } + unit_tests.source_files = [ + 'FirebaseCore/Internal/Tests/Unit/**/*.swift', + 'FirebaseCore/Internal/Tests/Common/**/*.swift', + ] + unit_tests.requires_app_host = true + unit_tests.dependency 'HeartbeatLoggingTestUtils' + end + + s.test_spec 'Integration' do |int_tests| + int_tests.scheme = { :code_coverage => true } + int_tests.platforms = { + :ios => ios_deployment_target, + :osx => osx_deployment_target, + :tvos => tvos_deployment_target + } + + int_tests.source_files = [ + 'FirebaseCore/Internal/Tests/Integration/**/*.swift', + 'FirebaseCore/Internal/Tests/Common/**/*.swift', + ] + int_tests.requires_app_host = true + int_tests.dependency 'HeartbeatLoggingTestUtils' + end + end + +end diff --git a/FirebaseDatabase/Sources/Api/FIRDatabase.m b/FirebaseDatabase/Sources/Api/FIRDatabase.m index 0e670da365..87dcc3ec0f 100644 --- a/FirebaseDatabase/Sources/Api/FIRDatabase.m +++ b/FirebaseDatabase/Sources/Api/FIRDatabase.m @@ -17,7 +17,7 @@ #import #import "FirebaseAuth/Interop/FIRAuthInterop.h" -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseDatabase/Sources/Api/FIRDatabaseComponent.h" #import "FirebaseDatabase/Sources/Api/Private/FIRDatabaseQuery_Private.h" diff --git a/FirebaseDatabase/Sources/Api/FIRDatabaseComponent.m b/FirebaseDatabase/Sources/Api/FIRDatabaseComponent.m index 524f929f92..d74340cebd 100644 --- a/FirebaseDatabase/Sources/Api/FIRDatabaseComponent.m +++ b/FirebaseDatabase/Sources/Api/FIRDatabaseComponent.m @@ -22,7 +22,7 @@ #import "FirebaseAppCheck/Interop/FIRAppCheckInterop.h" #import "FirebaseAuth/Interop/FIRAuthInterop.h" -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseDatabase/Sources/Core/FPersistentConnection.m b/FirebaseDatabase/Sources/Core/FPersistentConnection.m index 3314d53ac0..045405d4ae 100644 --- a/FirebaseDatabase/Sources/Core/FPersistentConnection.m +++ b/FirebaseDatabase/Sources/Core/FPersistentConnection.m @@ -15,7 +15,7 @@ */ #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 b8a996d535..c339fb42bd 100644 --- a/FirebaseDatabase/Sources/Core/FRepo.m +++ b/FirebaseDatabase/Sources/Core/FRepo.m @@ -16,7 +16,7 @@ #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 0e6cbf566d..94d54882d8 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 9a4f6e41e6..07cf036336 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 2d0bad35fd..9accc541a3 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 a1b4fcf1f6..d3b19f52f5 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 deb4aa2186..726227dcf4 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 a41a4ab6a6..5472fcdb89 100644 --- a/FirebaseDatabase/Sources/FIRDatabaseReference.m +++ b/FirebaseDatabase/Sources/FIRDatabaseReference.m @@ -15,7 +15,7 @@ */ #import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseReference.h" -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 0d4f35427a..21b50f2496 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseAppCheck/Interop/FIRAppCheckInterop.h" #import "FirebaseAppCheck/Interop/FIRAppCheckTokenResultInterop.h" diff --git a/FirebaseDatabase/Sources/Persistence/FLevelDBStorageEngine.m b/FirebaseDatabase/Sources/Persistence/FLevelDBStorageEngine.m index c05d99175f..9422d9f9b2 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 8c33692381..2610f190b8 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 a12351e946..311f153998 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 5cea373dd6..d5e4bc8770 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 bafcae8e99..16cc478062 100644 --- a/FirebaseDatabase/Sources/Realtime/FWebSocketConnection.m +++ b/FirebaseDatabase/Sources/Realtime/FWebSocketConnection.m @@ -19,7 +19,7 @@ #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 129789598b..d0718f6d10 100644 --- a/FirebaseDatabase/Sources/Utilities/FUtilities.h +++ b/FirebaseDatabase/Sources/Utilities/FUtilities.h @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import #import "FirebaseDatabase/Sources/Utilities/FParsedUrl.h" diff --git a/FirebaseDatabase/Sources/Utilities/FUtilities.m b/FirebaseDatabase/Sources/Utilities/FUtilities.m index cc457bf00b..29e536d8bc 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 2c89974f6d..3ea87e75c0 100644 --- a/FirebaseDatabase/Tests/Helpers/FTestBase.m +++ b/FirebaseDatabase/Tests/Helpers/FTestBase.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 1eb515ab97..26ba73453c 100644 --- a/FirebaseDatabase/Tests/Helpers/FTestHelpers.m +++ b/FirebaseDatabase/Tests/Helpers/FTestHelpers.m @@ -17,7 +17,7 @@ #import "FirebaseDatabase/Tests/Helpers/FTestHelpers.h" #import "FirebaseAuth/Interop/FIRAuthInterop.h" -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseDatabase/Sources/Api/Private/FIRDatabase_Private.h" #import "FirebaseDatabase/Sources/Constants/FConstants.h" diff --git a/FirebaseDatabase/Tests/Integration/FConnectionTest.m b/FirebaseDatabase/Tests/Integration/FConnectionTest.m index 383485c8b1..4cded44678 100644 --- a/FirebaseDatabase/Tests/Integration/FConnectionTest.m +++ b/FirebaseDatabase/Tests/Integration/FConnectionTest.m @@ -16,7 +16,7 @@ #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 70d2aed780..4d40ede1f9 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 2bb248330c..1bdbe2bca2 100644 --- a/FirebaseDatabase/Tests/Integration/FIRAuthTests.m +++ b/FirebaseDatabase/Tests/Integration/FIRAuthTests.m @@ -17,7 +17,7 @@ #import #import "FirebaseAuth/Interop/FIRAuthInterop.h" -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseDatabase/Sources/FIRDatabaseConfig_Private.h" #import "FirebaseDatabase/Tests/Helpers/FTestBase.h" diff --git a/FirebaseDatabase/Tests/Integration/FIRDatabaseTests.m b/FirebaseDatabase/Tests/Integration/FIRDatabaseTests.m index 5c4e4563e8..612491a655 100644 --- a/FirebaseDatabase/Tests/Integration/FIRDatabaseTests.m +++ b/FirebaseDatabase/Tests/Integration/FIRDatabaseTests.m @@ -16,7 +16,7 @@ #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 a25cabc234..9988085e5b 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 22bf86120d..0e7eef1e03 100644 --- a/FirebaseDatabase/Tests/Unit/FSyncPointTests.m +++ b/FirebaseDatabase/Tests/Unit/FSyncPointTests.m @@ -16,7 +16,7 @@ #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseDatabase/Sources/Api/Private/FIRDataSnapshot_Private.h" #import "FirebaseDatabase/Sources/Api/Private/FIRDatabaseQuery_Private.h" diff --git a/FirebaseDynamicLinks/Sources/FDLURLComponents/FIRDynamicLinkComponentsKeyProvider.m b/FirebaseDynamicLinks/Sources/FDLURLComponents/FIRDynamicLinkComponentsKeyProvider.m index 0b3f97885e..24b6c79528 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" @implementation FIRDynamicLinkComponentsKeyProvider diff --git a/FirebaseDynamicLinks/Sources/FIRDynamicLinks.m b/FirebaseDynamicLinks/Sources/FIRDynamicLinks.m index e13e6e8f2c..b4ab5f8e23 100644 --- a/FirebaseDynamicLinks/Sources/FIRDynamicLinks.m +++ b/FirebaseDynamicLinks/Sources/FIRDynamicLinks.m @@ -22,7 +22,7 @@ #import #ifdef FIRDynamicLinks3P -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 a89040c94e..f702d71708 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 588ee233b9..2414f7f674 100644 --- a/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m +++ b/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m @@ -20,7 +20,7 @@ #import #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseDynamicLinks/Sources/FIRDLDefaultRetrievalProcessV2.h" #import "FirebaseDynamicLinks/Sources/FIRDLRetrievalProcessFactory.h" #import "FirebaseDynamicLinks/Sources/FIRDLRetrievalProcessResult+Private.h" diff --git a/FirebaseFunctions.podspec b/FirebaseFunctions.podspec index aefc6f4d11..91fc7982f2 100644 --- a/FirebaseFunctions.podspec +++ b/FirebaseFunctions.podspec @@ -38,7 +38,7 @@ Cloud Functions for Firebase. ] s.dependency 'FirebaseCore', '~> 8.12' - s.dependency 'FirebaseCoreInternal', '~> 8.12' + s.dependency 'FirebaseCoreExtension', '~> 8.12' s.dependency 'FirebaseAppCheckInterop', '~> 8.12' s.dependency 'FirebaseAuthInterop', '~> 8.12' s.dependency 'FirebaseMessagingInterop', '~> 8.12' diff --git a/FirebaseFunctions/Sources/Functions.swift b/FirebaseFunctions/Sources/Functions.swift index b1156f5219..56f26d3feb 100644 --- a/FirebaseFunctions/Sources/Functions.swift +++ b/FirebaseFunctions/Sources/Functions.swift @@ -16,7 +16,7 @@ import Foundation import FirebaseAppCheckInterop import FirebaseAuthInterop import FirebaseCore -import FirebaseCoreInternal +import FirebaseCoreExtension import FirebaseMessagingInterop import FirebaseSharedSwift #if COCOAPODS diff --git a/FirebaseFunctions/Sources/Internal/FunctionsComponent.swift b/FirebaseFunctions/Sources/Internal/FunctionsComponent.swift index 569abcd93c..837a21d354 100644 --- a/FirebaseFunctions/Sources/Internal/FunctionsComponent.swift +++ b/FirebaseFunctions/Sources/Internal/FunctionsComponent.swift @@ -16,7 +16,7 @@ import Foundation import FirebaseAppCheckInterop import FirebaseAuthInterop import FirebaseCore -import FirebaseCoreInternal +import FirebaseCoreExtension import FirebaseMessagingInterop @objc(FIRFunctionsProvider) diff --git a/FirebaseFunctions/Tests/ObjCIntegration/FIRIntegrationTests.m b/FirebaseFunctions/Tests/ObjCIntegration/FIRIntegrationTests.m index 4176204d0c..1741e90fce 100644 --- a/FirebaseFunctions/Tests/ObjCIntegration/FIRIntegrationTests.m +++ b/FirebaseFunctions/Tests/ObjCIntegration/FIRIntegrationTests.m @@ -14,7 +14,7 @@ #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseFunctions/Tests/ObjCIntegration/FIRFunctions+Internal.h" @import FirebaseFunctions; diff --git a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.m b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.m index 5d38c41ad9..29b109507d 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 5ffe8bcc19..290269985c 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 d6fc626b1f..45b58e8a29 100644 --- a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.m +++ b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.m @@ -19,7 +19,7 @@ #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 1f1c9d5b98..e5bee96f90 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 6679841d50..fea1a08c6e 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 db1fab1343..3b3024ae37 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 15a261cdd1..a0b3029b01 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 b3f08897a4..83e470976a 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 2ed7359cb6..dc7bc917dd 100644 --- a/FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMDefaultDisplayImpl.m +++ b/FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMDefaultDisplayImpl.m @@ -17,7 +17,7 @@ #import #if TARGET_OS_IOS -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 46a2bd751d..d0cf5b8df5 100644 --- a/FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h +++ b/FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 44c58a31c5..a0a5d678d8 100644 --- a/FirebaseInAppMessaging/Sources/FIRInAppMessaging.m +++ b/FirebaseInAppMessaging/Sources/FIRInAppMessaging.m @@ -21,7 +21,7 @@ #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 5630529aab..1aa33c7701 100644 --- a/FirebaseInAppMessaging/Sources/FIRInAppMessagingPrivate.h +++ b/FirebaseInAppMessaging/Sources/FIRInAppMessagingPrivate.h @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 2e8fcd2bdd..cb34c51c14 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMActivityLogger.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMActivityLogger.m @@ -19,7 +19,7 @@ #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 12d1fce86e..941a18d305 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 31fdbd3bc6..f76e89cc5a 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 6bf04a072f..999de72d95 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 85fdc09edc..f7bf271c19 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 327d2436f6..27f7bf71e0 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h" diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayExecutor.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayExecutor.m index 8fcb8afe95..28ae23fb56 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 daa75515a2..0d0b882660 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 184d5fd05e..c2c198efe3 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 1c43d55707..2034c97a3a 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 8ae14d3308..83482ab461 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 eeef4572b3..120b7ee01f 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 995dc57adf..cb10732794 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 b79da4b435..bf2155bb39 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 0132018e58..7bc29c601e 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" #import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h" diff --git a/FirebaseInAppMessaging/Tests/Integration/DefaultUITestApp/Podfile b/FirebaseInAppMessaging/Tests/Integration/DefaultUITestApp/Podfile index 2e575b06ab..a600b5ee1f 100644 --- a/FirebaseInAppMessaging/Tests/Integration/DefaultUITestApp/Podfile +++ b/FirebaseInAppMessaging/Tests/Integration/DefaultUITestApp/Podfile @@ -5,6 +5,7 @@ source 'https://cdn.cocoapods.org/' use_frameworks! pod 'FirebaseCore', :path => '../../../..' +pod 'FirebaseCoreInternal', :path => '../../../..' pod 'FirebaseInstallations', :path => '../../../..' pod 'FirebaseCoreDiagnostics', :path => '../../../..' pod 'FirebaseABTesting', :path => '../../../..' diff --git a/FirebaseInstallations/Source/Library/FIRInstallations.m b/FirebaseInstallations/Source/Library/FIRInstallations.m index ee8c236560..4d2beaf396 100644 --- a/FirebaseInstallations/Source/Library/FIRInstallations.m +++ b/FirebaseInstallations/Source/Library/FIRInstallations.m @@ -22,7 +22,7 @@ #import "FBLPromises.h" #endif -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseInstallations/Source/Library/FIRInstallationsAuthTokenResultInternal.h" diff --git a/FirebaseInstallations/Source/Library/FIRInstallationsLogger.h b/FirebaseInstallations/Source/Library/FIRInstallationsLogger.h index 36b0a2cd2b..7ad99675d5 100644 --- a/FirebaseInstallations/Source/Library/FIRInstallationsLogger.h +++ b/FirebaseInstallations/Source/Library/FIRInstallationsLogger.h @@ -16,7 +16,7 @@ #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" extern FIRLoggerService kFIRLoggerInstallations; diff --git a/FirebaseInstallations/Source/Library/InstallationsAPI/FIRInstallationsAPIService.m b/FirebaseInstallations/Source/Library/InstallationsAPI/FIRInstallationsAPIService.m index fd2fffe7a1..a4f19cb850 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 09167b9f60..29e8b02559 100644 --- a/FirebaseInstallations/Source/Library/InstallationsIDController/FIRInstallationsIDController.m +++ b/FirebaseInstallations/Source/Library/InstallationsIDController/FIRInstallationsIDController.m @@ -23,7 +23,7 @@ #endif #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 35b4ec35cc..4805082081 100644 --- a/FirebaseInstallations/Source/Tests/Integration/FIRInstallationsIntegrationTests.m +++ b/FirebaseInstallations/Source/Tests/Integration/FIRInstallationsIntegrationTests.m @@ -26,7 +26,7 @@ #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 a66686e3c5..057e83930f 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" typedef FBLPromise * (^FIRInstallationsAPIServiceTask)(void); diff --git a/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsIDControllerTests.m b/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsIDControllerTests.m index 325711e881..bbbbc241b6 100644 --- a/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsIDControllerTests.m +++ b/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsIDControllerTests.m @@ -18,7 +18,7 @@ #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 31bc27e2c5..091ae9b3e7 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 fa9e308bac..e2831faf30 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStoredAuthToken.h" diff --git a/FirebaseMessaging/Apps/Sample/Podfile b/FirebaseMessaging/Apps/Sample/Podfile index 6b9f0a286f..89be2af139 100644 --- a/FirebaseMessaging/Apps/Sample/Podfile +++ b/FirebaseMessaging/Apps/Sample/Podfile @@ -8,6 +8,7 @@ target 'Sample' do platform :ios, '13.0' pod 'FirebaseCore', :path => '../../../' + pod 'FirebaseCoreInternal', :path => '../../../' pod 'FirebaseMessaging', :path => '../../../' pod 'FirebaseCoreDiagnostics', :path => '../../../' pod 'FirebaseInstallations', :path => '../../../' diff --git a/FirebaseMessaging/Apps/SwiftUISample/Podfile b/FirebaseMessaging/Apps/SwiftUISample/Podfile index 1a2654c618..14936e6526 100644 --- a/FirebaseMessaging/Apps/SwiftUISample/Podfile +++ b/FirebaseMessaging/Apps/SwiftUISample/Podfile @@ -10,6 +10,7 @@ target 'SwiftUISample' do pod 'FirebaseCore', :path => '../../../' pod 'FirebaseMessaging', :path => '../../../' pod 'FirebaseCoreDiagnostics', :path => '../../../' + pod 'FirebaseCoreInternal', :path => '../../../' pod 'FirebaseInstallations', :path => '../../../' end diff --git a/FirebaseMessaging/Sources/FIRMessaging.m b/FirebaseMessaging/Sources/FIRMessaging.m index 6918214480..e4a609f233 100644 --- a/FirebaseMessaging/Sources/FIRMessaging.m +++ b/FirebaseMessaging/Sources/FIRMessaging.m @@ -24,7 +24,7 @@ #import #import #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h" #import "FirebaseMessaging/Interop/FIRMessagingInterop.h" #import "FirebaseMessaging/Sources/FIRMessagingAnalytics.h" diff --git a/FirebaseMessaging/Sources/FIRMessagingLogger.m b/FirebaseMessaging/Sources/FIRMessagingLogger.m index 8e63500ad7..bce3e0f79c 100644 --- a/FirebaseMessaging/Sources/FIRMessagingLogger.m +++ b/FirebaseMessaging/Sources/FIRMessagingLogger.m @@ -16,7 +16,7 @@ #import "FirebaseMessaging/Sources/FIRMessagingLogger.h" -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" FIRLoggerService kFIRLoggerMessaging = @"[Firebase/Messaging]"; diff --git a/FirebaseMessaging/Sources/FIRMessagingUtilities.m b/FirebaseMessaging/Sources/FIRMessagingUtilities.m index 08d8f046e8..195239bd2e 100644 --- a/FirebaseMessaging/Sources/FIRMessagingUtilities.m +++ b/FirebaseMessaging/Sources/FIRMessagingUtilities.m @@ -18,7 +18,7 @@ #import #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 b0a527d324..24e94f6b8d 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 500ff56a0a..92509ec26a 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingHandlingTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingHandlingTest.m @@ -19,7 +19,7 @@ #import #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 2d3946267c..0790982ad3 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTest.m @@ -18,7 +18,7 @@ #import #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 9679ff28a8..545e87bc5c 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTestUtilities.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTestUtilities.m @@ -17,7 +17,7 @@ #import #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 add12c306b..b29dda1ebf 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenInfoTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenInfoTest.m @@ -19,7 +19,7 @@ #import #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 9cb96529ed..b0b14ae6af 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenOperationsTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenOperationsTest.m @@ -18,7 +18,7 @@ #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h" #import "FirebaseMessaging/Sources/FIRMessagingConstants.h" #import "FirebaseMessaging/Sources/NSError+FIRMessaging.h" diff --git a/FirebasePerformance/Sources/Configurations/FPRConfigurations.m b/FirebasePerformance/Sources/Configurations/FPRConfigurations.m index 0996b25756..4d052f3144 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" FPRConfigName kFPRConfigDataCollectionEnabled = @"dataCollectionEnabled"; diff --git a/FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags.m b/FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags.m index 86d56879a0..f7aece0946 100644 --- a/FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags.m +++ b/FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags.m @@ -19,7 +19,7 @@ #import "FirebasePerformance/Sources/FPRConsoleLogger.h" -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #define ONE_DAY_SECONDS 24 * 60 * 60 diff --git a/FirebasePerformance/Sources/FPRClient.m b/FirebasePerformance/Sources/FPRClient.m index 2f9bcc6879..f9c1b9af0c 100644 --- a/FirebasePerformance/Sources/FPRClient.m +++ b/FirebasePerformance/Sources/FPRClient.m @@ -33,7 +33,7 @@ #import "FirebasePerformance/Sources/Public/FirebasePerformance/FIRPerformance.h" -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" @interface FPRClient () diff --git a/FirebasePerformance/Sources/FPRConsoleLogger.h b/FirebasePerformance/Sources/FPRConsoleLogger.h index a688e5f1be..4341fa10ee 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/Internal/FIRLogger.h" +#import "FirebaseCore/Extension/FIRLogger.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebasePerformance/Tests/Unit/FIRPerformanceTest.m b/FirebasePerformance/Tests/Unit/FIRPerformanceTest.m index d885ba3968..947311e454 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/Internal/FIRAppInternal.h" +#import "FirebaseCore/Extension/FIRAppInternal.h" @interface FIRPerformanceTest : FPRTestCase diff --git a/FirebasePerformance/Tests/Unit/FPRAppActivityTrackerTest.m b/FirebasePerformance/Tests/Unit/FPRAppActivityTrackerTest.m index 727e07a333..9ce0f5f137 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/Internal/FIRAppInternal.h" +#import "FirebaseCore/Extension/FIRAppInternal.h" #import diff --git a/FirebasePerformance/Tests/Unit/Fakes/FIRAppFake.h b/FirebasePerformance/Tests/Unit/Fakes/FIRAppFake.h index 8e6cdc4242..3c3ab05957 100644 --- a/FirebasePerformance/Tests/Unit/Fakes/FIRAppFake.h +++ b/FirebasePerformance/Tests/Unit/Fakes/FIRAppFake.h @@ -14,7 +14,7 @@ #import -#import "FirebaseCore/Internal/FIRAppInternal.h" +#import "FirebaseCore/Extension/FIRAppInternal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebasePerformance/Tests/Unit/Fakes/FIRAppFake.m b/FirebasePerformance/Tests/Unit/Fakes/FIRAppFake.m index 137798e763..11446ffac9 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" @implementation FIRAppFake diff --git a/FirebaseRemoteConfig/Sources/FIRConfigValue.m b/FirebaseRemoteConfig/Sources/FIRConfigValue.m index 33b968b0c8..8ab2d30d77 100644 --- a/FirebaseRemoteConfig/Sources/FIRConfigValue.m +++ b/FirebaseRemoteConfig/Sources/FIRConfigValue.m @@ -16,7 +16,7 @@ #import "FirebaseRemoteConfig/Sources/Public/FirebaseRemoteConfig/FIRRemoteConfig.h" -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseRemoteConfig/Sources/RCNConfigValue_Internal.h" @implementation FIRRemoteConfigValue { diff --git a/FirebaseRemoteConfig/Sources/FIRRemoteConfig.m b/FirebaseRemoteConfig/Sources/FIRRemoteConfig.m index 72e391205a..82a7293717 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 59d896f7c9..f015ea1497 100644 --- a/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.h +++ b/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.h @@ -16,7 +16,7 @@ #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" @class FIRApp; @class FIRRemoteConfig; diff --git a/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.m b/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.m index 2a696bc646..e0adc7bccb 100644 --- a/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.m +++ b/FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.m @@ -16,7 +16,7 @@ #import "FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.h" -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 abca77fecf..ea7a369dc0 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" @implementation RCNConfigContent { /// Active config data that is currently used. diff --git a/FirebaseRemoteConfig/Sources/RCNConfigDBManager.m b/FirebaseRemoteConfig/Sources/RCNConfigDBManager.m index 294ebe236f..2e1548a1f5 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 55b9806a46..9a2260ba62 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 e9ca1f894f..7c4462d59d 100644 --- a/FirebaseRemoteConfig/Sources/RCNConfigFetch.m +++ b/FirebaseRemoteConfig/Sources/RCNConfigFetch.m @@ -17,7 +17,7 @@ #import "FirebaseRemoteConfig/Sources/Private/RCNConfigFetch.h" #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 f26a404b9f..09af88f32d 100644 --- a/FirebaseRemoteConfig/Sources/RCNConfigSettings.m +++ b/FirebaseRemoteConfig/Sources/RCNConfigSettings.m @@ -23,7 +23,7 @@ #import "FirebaseRemoteConfig/Sources/RCNUserDefaultsManager.h" #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 c6cfee6361..52e65284bd 100644 --- a/FirebaseRemoteConfig/Sources/RCNDevice.m +++ b/FirebaseRemoteConfig/Sources/RCNDevice.m @@ -19,7 +19,7 @@ #import #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 b6bdb0525f..c3ea8f1bcd 100644 --- a/FirebaseRemoteConfig/Sources/RCNUserDefaultsManager.m +++ b/FirebaseRemoteConfig/Sources/RCNUserDefaultsManager.m @@ -15,7 +15,7 @@ */ #import "FirebaseRemoteConfig/Sources/RCNUserDefaultsManager.h" -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseRemoteConfig/Sources/Public/FirebaseRemoteConfig/FIRRemoteConfig.h" static NSString *const kRCNGroupPrefix = @"group"; diff --git a/FirebaseRemoteConfig/Tests/Sample/Podfile b/FirebaseRemoteConfig/Tests/Sample/Podfile index 4253162bb9..8e1a84a002 100644 --- a/FirebaseRemoteConfig/Tests/Sample/Podfile +++ b/FirebaseRemoteConfig/Tests/Sample/Podfile @@ -10,6 +10,7 @@ target 'RemoteConfigSampleApp' do use_frameworks! pod 'FirebaseAnalytics' pod 'FirebaseCore', :path => '../../../' + pod 'FirebaseCoreInternal', :path => '../../../' pod 'FirebaseCoreDiagnostics', :path => '../../../' pod 'FirebaseInstallations', :path => '../../../' pod 'FirebaseRemoteConfig', :path => '../../../' diff --git a/FirebaseRemoteConfig/Tests/Unit/FIRRemoteConfigComponentTest.m b/FirebaseRemoteConfig/Tests/Unit/FIRRemoteConfigComponentTest.m index 96c1ad5414..077702b7b1 100644 --- a/FirebaseRemoteConfig/Tests/Unit/FIRRemoteConfigComponentTest.m +++ b/FirebaseRemoteConfig/Tests/Unit/FIRRemoteConfigComponentTest.m @@ -16,7 +16,7 @@ #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 041b74bc56..49f6f97fe5 100644 --- a/FirebaseRemoteConfig/Tests/Unit/RCNConfigDBManagerTest.m +++ b/FirebaseRemoteConfig/Tests/Unit/RCNConfigDBManagerTest.m @@ -19,7 +19,7 @@ #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 d98fb552d1..5d1b28fb61 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 70e9327c90..e8d3c13cd4 100644 --- a/FirebaseRemoteConfig/Tests/Unit/RCNPersonalizationTest.m +++ b/FirebaseRemoteConfig/Tests/Unit/RCNPersonalizationTest.m @@ -17,7 +17,7 @@ #import #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 4a594d5903..55d6a848c0 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 d7a0c13c4e..5fc426b1e4 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" @interface RCNConfigFetch (ForTest) - (instancetype)initWithContent:(RCNConfigContent *)content diff --git a/FirebaseRemoteConfig/Tests/Unit/RCNThrottlingTests.m b/FirebaseRemoteConfig/Tests/Unit/RCNThrottlingTests.m index b3c0173e71..8721463feb 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" @interface RCNThrottlingTests : XCTestCase { RCNConfigContent *_configContentMock; diff --git a/FirebaseStorage/Sources/FIRStorage.m b/FirebaseStorage/Sources/FIRStorage.m index 508afafc94..578aeb5d38 100644 --- a/FirebaseStorage/Sources/FIRStorage.m +++ b/FirebaseStorage/Sources/FIRStorage.m @@ -25,7 +25,7 @@ #import "FirebaseAppCheck/Interop/FIRAppCheckInterop.h" #import "FirebaseAuth/Interop/FIRAuthInterop.h" -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #if SWIFT_PACKAGE @import GTMSessionFetcherCore; diff --git a/FirebaseStorage/Sources/FIRStorageComponent.m b/FirebaseStorage/Sources/FIRStorageComponent.m index 7e4bf9af37..25cec1e97e 100644 --- a/FirebaseStorage/Sources/FIRStorageComponent.m +++ b/FirebaseStorage/Sources/FIRStorageComponent.m @@ -18,7 +18,7 @@ #import "FirebaseAppCheck/Interop/FIRAppCheckInterop.h" #import "FirebaseAuth/Interop/FIRAuthInterop.h" -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseStorage/Sources/FIRStorageLogger.h b/FirebaseStorage/Sources/FIRStorageLogger.h index 4c9e7bfab5..4af6db3f7c 100644 --- a/FirebaseStorage/Sources/FIRStorageLogger.h +++ b/FirebaseStorage/Sources/FIRStorageLogger.h @@ -16,7 +16,7 @@ #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" extern FIRLoggerService kFIRLoggerStorage; diff --git a/FirebaseStorage/Sources/FIRStorageReference.m b/FirebaseStorage/Sources/FIRStorageReference.m index 88a9e5bfbb..fc8be3d526 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #if SWIFT_PACKAGE @import GTMSessionFetcherCore; diff --git a/FirebaseStorage/Sources/FIRStorageTokenAuthorizer.m b/FirebaseStorage/Sources/FIRStorageTokenAuthorizer.m index f1f7016bc5..136712fd9c 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseAppCheck/Interop/FIRAppCheckInterop.h" #import "FirebaseAppCheck/Interop/FIRAppCheckTokenResultInterop.h" diff --git a/FirebaseStorage/Tests/Integration/FIRStorageIntegrationTests.m b/FirebaseStorage/Tests/Integration/FIRStorageIntegrationTests.m index ee4c8b55d0..51feb9595b 100644 --- a/FirebaseStorage/Tests/Integration/FIRStorageIntegrationTests.m +++ b/FirebaseStorage/Tests/Integration/FIRStorageIntegrationTests.m @@ -18,7 +18,7 @@ #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseStorage/Tests/Integration/Credentials.h" diff --git a/FirebaseStorage/Tests/Unit/FIRStorageComponentTests.m b/FirebaseStorage/Tests/Unit/FIRStorageComponentTests.m index 890ee87848..63c76294f2 100644 --- a/FirebaseStorage/Tests/Unit/FIRStorageComponentTests.m +++ b/FirebaseStorage/Tests/Unit/FIRStorageComponentTests.m @@ -17,7 +17,7 @@ #import #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 eceec6d3d9..d4e2202ef8 100644 --- a/FirebaseStorage/Tests/Unit/FIRStorageTestHelpers.h +++ b/FirebaseStorage/Tests/Unit/FIRStorageTestHelpers.h @@ -18,7 +18,7 @@ #import #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 496a24c1f1..be81cbe759 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 0e967ef7a6..9f7ee72f88 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/Internal/FIRAppInternal.h" +#import "FirebaseCore/Extension/FIRAppInternal.h" #include "Firestore/core/src/util/autoid.h" #include "Firestore/core/src/util/hard_assert.h" diff --git a/Firestore/Example/Podfile b/Firestore/Example/Podfile index 01aab51912..c48f646d9a 100644 --- a/Firestore/Example/Podfile +++ b/Firestore/Example/Podfile @@ -63,6 +63,7 @@ def configure_local_pods() # scripts/install_prereqs.sh for more details. pod 'FirebaseCore', :path => '../..' pod 'FirebaseCoreDiagnostics', :path => '../..' + pod 'FirebaseCoreInternal',:path => '../..' # Pull in local sources conditionally. maybe_local_pod 'FirebaseAuth' diff --git a/Firestore/Example/Tests/API/FIRFirestoreTests.mm b/Firestore/Example/Tests/API/FIRFirestoreTests.mm index b493e3f61e..3a63e42f02 100644 --- a/Firestore/Example/Tests/API/FIRFirestoreTests.mm +++ b/Firestore/Example/Tests/API/FIRFirestoreTests.mm @@ -19,7 +19,7 @@ #import -#import "FirebaseCore/Internal/FIRAppInternal.h" +#import "FirebaseCore/Extension/FIRAppInternal.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 959eece228..292c4137b4 100644 --- a/Firestore/Example/Tests/Integration/API/FIRDatabaseTests.mm +++ b/Firestore/Example/Tests/Integration/API/FIRDatabaseTests.mm @@ -18,7 +18,7 @@ #import -#import "FirebaseCore/Internal/FIRAppInternal.h" +#import "FirebaseCore/Extension/FIRAppInternal.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 05ba4d25f9..7e52e697d2 100644 --- a/Firestore/Example/Tests/Integration/API/FIRValidationTests.mm +++ b/Firestore/Example/Tests/Integration/API/FIRValidationTests.mm @@ -20,7 +20,7 @@ #include -#import "FirebaseCore/Internal/FIROptionsInternal.h" +#import "FirebaseCore/Extension/FIROptionsInternal.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 9170879645..43c3a6734c 100644 --- a/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm +++ b/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm @@ -30,9 +30,9 @@ #include #include -#import "FirebaseCore/Internal/FIRAppInternal.h" -#import "FirebaseCore/Internal/FIRLogger.h" -#import "FirebaseCore/Internal/FIROptionsInternal.h" +#import "FirebaseCore/Extension/FIRAppInternal.h" +#import "FirebaseCore/Extension/FIRLogger.h" +#import "FirebaseCore/Extension/FIROptionsInternal.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 68e850a3d4..5e8c3f142b 100644 --- a/Firestore/Source/API/FIRFirestore.mm +++ b/Firestore/Source/API/FIRFirestore.mm @@ -22,9 +22,9 @@ #import "FIRFirestoreSettings+Internal.h" -#import "FirebaseCore/Internal/FIRAppInternal.h" -#import "FirebaseCore/Internal/FIRComponentContainer.h" -#import "FirebaseCore/Internal/FIRComponentType.h" +#import "FirebaseCore/Extension/FIRAppInternal.h" +#import "FirebaseCore/Extension/FIRComponentContainer.h" +#import "FirebaseCore/Extension/FIRComponentType.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 cea6a8b3db..bb1d63ede1 100644 --- a/Firestore/Source/API/FSTFirestoreComponent.mm +++ b/Firestore/Source/API/FSTFirestoreComponent.mm @@ -22,13 +22,13 @@ #import "FirebaseAppCheck/Interop/FIRAppCheckInterop.h" #import "FirebaseAuth/Interop/FIRAuthInterop.h" -#import "FirebaseCore/Internal/FIRAppInternal.h" -#import "FirebaseCore/Internal/FIRComponent.h" -#import "FirebaseCore/Internal/FIRComponentContainer.h" -#import "FirebaseCore/Internal/FIRComponentType.h" -#import "FirebaseCore/Internal/FIRDependency.h" -#import "FirebaseCore/Internal/FIRLibrary.h" -#import "FirebaseCore/Internal/FIROptionsInternal.h" +#import "FirebaseCore/Extension/FIRAppInternal.h" +#import "FirebaseCore/Extension/FIRComponent.h" +#import "FirebaseCore/Extension/FIRComponentContainer.h" +#import "FirebaseCore/Extension/FIRComponentType.h" +#import "FirebaseCore/Extension/FIRDependency.h" +#import "FirebaseCore/Extension/FIRLibrary.h" +#import "FirebaseCore/Extension/FIROptionsInternal.h" #import "Firestore/Source/API/FIRFirestore+Internal.h" #include "Firestore/core/include/firebase/firestore/firestore_version.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 a21b52a50b..a45f1401ce 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/Interop/FIRAppCheckInterop.h" #import "FirebaseAppCheck/Interop/FIRAppCheckTokenResultInterop.h" -#import "FirebaseCore/Internal/FIRAppInternal.h" +#import "FirebaseCore/Extension/FIRAppInternal.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 aea4a273f6..c4452025e8 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/Internal/FIRAppInternal.h" +#import "FirebaseCore/Extension/FIRAppInternal.h" #import "FirebaseAuth/Interop/FIRAuthInterop.h" diff --git a/Firestore/core/src/remote/firebase_metadata_provider_apple.mm b/Firestore/core/src/remote/firebase_metadata_provider_apple.mm index a83e35fb90..78fb379c23 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/Internal/FIRAppInternal.h" -#import "FirebaseCore/Internal/FIRHeartbeatInfo.h" -#import "FirebaseCore/Internal/FIROptionsInternal.h" +#import "FirebaseCore/Extension/FIRAppInternal.h" +#import "FirebaseCore/Extension/FIRHeartbeatInfo.h" +#import "FirebaseCore/Extension/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 d04e2257b0..d85997c9b9 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/Internal/FIRLogger.h" +#import "FirebaseCore/Extension/FIRLogger.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 9824f3d325..e3ebd47d2a 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/Interop/FIRAppCheckInterop.h" #import "FirebaseAppCheck/Interop/FIRAppCheckTokenResultInterop.h" -#import "FirebaseCore/Internal/FIRAppInternal.h" +#import "FirebaseCore/Extension/FIRAppInternal.h" #include "Firestore/core/test/unit/testutil/app_testing.h" diff --git a/Firestore/core/test/unit/testutil/app_testing.mm b/Firestore/core/test/unit/testutil/app_testing.mm index 74732fc4e4..a51732375a 100644 --- a/Firestore/core/test/unit/testutil/app_testing.mm +++ b/Firestore/core/test/unit/testutil/app_testing.mm @@ -14,8 +14,8 @@ * limitations under the License. */ -#import "FirebaseCore/Internal/FIRAppInternal.h" -#import "FirebaseCore/Internal/FIROptionsInternal.h" +#import "FirebaseCore/Extension/FIRAppInternal.h" +#import "FirebaseCore/Extension/FIROptionsInternal.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 748d6a5e51..847c1748af 100644 --- a/HeadersImports.md +++ b/HeadersImports.md @@ -47,7 +47,7 @@ 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/Internal/FirebaseCoreInternal.h`. For CocoaPods, these files should be + `FirebaseCore/Extension/FIRebaseCoreInternal.h`. For CocoaPods, these files should be added to the podspec in the `source_files` attribute like: ``` s.source_files = [ 'FirebaseFoo/Sources/**/*.[mh]' diff --git a/HeartbeatLoggingTestUtils.podspec b/HeartbeatLoggingTestUtils.podspec index 757f6467b9..122ca3d7f2 100644 --- a/HeartbeatLoggingTestUtils.podspec +++ b/HeartbeatLoggingTestUtils.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'HeartbeatLoggingTestUtils' - s.version = '8.11.0' + s.version = '8.12.0' s.summary = 'Testing utilities for testing the HeartbeatLogging module' s.description = <<-DESC @@ -17,30 +17,22 @@ Pod::Spec.new do |s| :tag => 'CocoaPods-' + s.version.to_s } + s.pod_target_xcconfig = { + 'ENABLE_TESTING_SEARCH_PATHS'=>'YES' + } + s.swift_version = '5.3' - s.cocoapods_version = '>= 1.4.0' - s.prefix_header_file = false - ios_deployment_target = '9.0' - osx_deployment_target = '10.12' - tvos_deployment_target = '10.0' - watchos_deployment_target = '6.0' - - s.ios.deployment_target = ios_deployment_target - s.osx.deployment_target = osx_deployment_target - s.tvos.deployment_target = tvos_deployment_target - s.watchos.deployment_target = watchos_deployment_target - - s.ios.deployment_target = ios_deployment_target - s.osx.deployment_target = osx_deployment_target - s.tvos.deployment_target = tvos_deployment_target - s.watchos.deployment_target = watchos_deployment_target + s.ios.deployment_target = '9.0' + s.osx.deployment_target = '10.12' + s.tvos.deployment_target = '10.0' + s.watchos.deployment_target = '6.0' s.source_files = [ 'HeartbeatLoggingTestUtils/Sources/**/*.swift', ] - s.dependency 'FirebaseCore', '~> 8.11' s.framework = 'XCTest' + s.dependency 'FirebaseCoreInternal', '~> 8.11' end diff --git a/HeartbeatLoggingTestUtils/Sources/HeartbeatLoggingTestUtils.swift b/HeartbeatLoggingTestUtils/Sources/HeartbeatLoggingTestUtils.swift index 68b787c6d8..6cfc8ad209 100644 --- a/HeartbeatLoggingTestUtils/Sources/HeartbeatLoggingTestUtils.swift +++ b/HeartbeatLoggingTestUtils/Sources/HeartbeatLoggingTestUtils.swift @@ -14,12 +14,7 @@ import Foundation import XCTest - -#if SWIFT_PACKAGE - import HeartbeatLogging -#else - import FirebaseCore -#endif +import FirebaseCoreInternal @objc(FIRHeartbeatLoggingTestUtils) @objcMembers diff --git a/Interop/FirebaseComponentSystem.md b/Interop/FirebaseComponentSystem.md index 6a23df29bf..56a0ac63fe 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/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" @interface FIRFoo @end diff --git a/Package.swift b/Package.swift index c4b35ba0fe..45522c65a4 100644 --- a/Package.swift +++ b/Package.swift @@ -208,7 +208,7 @@ let package = Package( dependencies: [ "Firebase", "FirebaseCoreDiagnostics", - "HeartbeatLogging", + "FirebaseCoreInternal", .product(name: "GULEnvironment", package: "GoogleUtilities"), .product(name: "GULLogger", package: "GoogleUtilities"), ], @@ -238,37 +238,41 @@ let package = Package( .headerSearchPath("../../.."), ] ), - // Internal headers only for consuming from Swift. + + // MARK: - Firebase Core Extension + + // Extension of FirebaseCore for consuming by Swift product SDKs. .target( - name: "FirebaseCoreInternal", - path: "FirebaseCore/Internal", + name: "FirebaseCoreExtension", + path: "FirebaseCore/Extension", publicHeadersPath: ".", cSettings: [ .headerSearchPath("../../"), ] ), - // MARK: - Heartbeat Logging + // MARK: - Firebase Core Internal + // Shared collection of APIs for internal FirebaseCore usage. .target( - name: "HeartbeatLogging", + name: "FirebaseCoreInternal", dependencies: [ .product(name: "GULNSData", package: "GoogleUtilities"), ], - path: "HeartbeatLogging/Sources/" + path: "FirebaseCore/Internal/Sources" ), .target( name: "HeartbeatLoggingTestUtils", - dependencies: ["HeartbeatLogging"], - path: "HeartbeatLoggingTestUtils/Sources/" + dependencies: ["FirebaseCoreInternal"], + path: "HeartbeatLoggingTestUtils/Sources" ), .testTarget( - name: "HeartbeatLoggingTests", + name: "FirebaseCoreInternalTests", dependencies: [ - "HeartbeatLogging", + "FirebaseCoreInternal", "HeartbeatLoggingTestUtils", ], - path: "HeartbeatLogging/Tests/" + path: "FirebaseCore/Internal/Tests" ), .target( @@ -727,7 +731,7 @@ let package = Package( "FirebaseAppCheckInterop", "FirebaseAuthInterop", "FirebaseCore", - "FirebaseCoreInternal", + "FirebaseCoreExtension", "FirebaseMessagingInterop", "FirebaseSharedSwift", .product(name: "GTMSessionFetcherCore", package: "GTMSessionFetcher"), diff --git a/SharedTestUtilities/FIRComponentTestUtilities.h b/SharedTestUtilities/FIRComponentTestUtilities.h index bf34f57b26..40d7f76a88 100644 --- a/SharedTestUtilities/FIRComponentTestUtilities.h +++ b/SharedTestUtilities/FIRComponentTestUtilities.h @@ -16,7 +16,7 @@ #import -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/SharedTestUtilities/FIROptionsMock.m b/SharedTestUtilities/FIROptionsMock.m index 3675f9b0e1..31e1b39273 100644 --- a/SharedTestUtilities/FIROptionsMock.m +++ b/SharedTestUtilities/FIROptionsMock.m @@ -14,7 +14,7 @@ #import -#import "FirebaseCore/Internal/FIROptionsInternal.h" +#import "FirebaseCore/Extension/FIROptionsInternal.h" #import "SharedTestUtilities/FIROptionsMock.h" NSString *const kAndroidClientID = @"correct_android_client_id"; diff --git a/SharedTestUtilities/FIRSampleAppUtilities.m b/SharedTestUtilities/FIRSampleAppUtilities.m index 1b19d203fc..7dfa9f8433 100644 --- a/SharedTestUtilities/FIRSampleAppUtilities.m +++ b/SharedTestUtilities/FIRSampleAppUtilities.m @@ -22,7 +22,7 @@ #import #endif -#import "FirebaseCore/Internal/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/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 6fe74300f6..ec29700fa7 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/Internal", // TODO: work through adding this back. + "FirebaseCore/Extension", // TODO(v9): work through adding this back. "Firebase/CoreDiagnostics", "FirebaseDatabase/Sources/third_party/Wrap-leveldb", // Pending SwiftPM for leveldb. "Example", diff --git a/scripts/localize_podfile.swift b/scripts/localize_podfile.swift index 2fd42bd907..9703923eb9 100755 --- a/scripts/localize_podfile.swift +++ b/scripts/localize_podfile.swift @@ -36,8 +36,9 @@ let implicitPods = [ "FirebaseCore", "FirebaseInstallations", "Firebase", "FirebaseAuth", "FirebaseABTesting", "FirebaseCoreDiagnostics", "FirebaseRemoteConfig", - "FirebaseCoreInternal", "FirebaseAppCheckInterop", + "FirebaseCoreExtension", "FirebaseAppCheckInterop", "FirebaseAuthInterop", "FirebaseMessagingInterop", + "FirebaseCoreInternal", ] var didImplicits = false diff --git a/scripts/spm_test_schemes/HeartbeatLoggingTests.xcscheme b/scripts/spm_test_schemes/FirebaseCoreInternalTests.xcscheme similarity index 77% rename from scripts/spm_test_schemes/HeartbeatLoggingTests.xcscheme rename to scripts/spm_test_schemes/FirebaseCoreInternalTests.xcscheme index 599ee8d0ab..eb9dc6b2f2 100644 --- a/scripts/spm_test_schemes/HeartbeatLoggingTests.xcscheme +++ b/scripts/spm_test_schemes/FirebaseCoreInternalTests.xcscheme @@ -1,6 +1,6 @@ + buildForAnalyzing = "YES"> @@ -32,9 +32,9 @@ skipped = "NO"> @@ -60,9 +60,9 @@