From de4c2585eaab4cb0c85cb8164b64190f0a722b89 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 28 Oct 2024 15:28:01 -0700 Subject: [PATCH] cmake fixes --- .../FirebaseCombine-unit-Bridging-Header.h | 2 +- FirebaseCore/CMakeLists.txt | 4 ++-- ...CoreInternal.h => FirebaseCoreExtension.h} | 0 .../InternalObjC/FirebaseCoreInternal.h | 23 +++++++++++++++++++ FirebaseCore/Sources/FIROptions.m | 3 ++- .../FirebaseCore-unit-Bridging-Header.h | 2 +- .../ObjCIntegration/FIRIntegrationTests.m | 2 +- .../DefaultUI/FIRCore+InAppMessagingDisplay.h | 2 -- .../Sources/FIRInAppMessaging.m | 1 - .../FIRIAMDisplayCheckOnAnalyticEventsFlow.m | 1 - .../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 +- .../Tests/Unit/Fakes/FIRAppFake.m | 2 +- FirebaseRemoteConfig/Sources/RCNDevice.m | 2 +- .../Sources/RCNUserDefaultsManager.m | 2 +- .../Tests/Unit/RCNConfigDBManagerTest.m | 2 +- .../Tests/Unit/RCNPersonalizationTest.m | 2 +- .../Tests/Unit/RCNRemoteConfig+FIRAppTest.m | 2 +- .../Tests/Unit/RCNRemoteConfigTest.m | 2 +- .../Tests/Unit/RCNThrottlingTests.m | 2 +- .../FIRStorageIntegrationTests.m | 2 +- HeadersImports.md | 2 +- Interop/FirebaseComponentSystem.md | 2 +- SharedTestUtilities/FIRSampleAppUtilities.m | 2 +- 30 files changed, 50 insertions(+), 30 deletions(-) rename FirebaseCore/Extension/{FirebaseCoreInternal.h => FirebaseCoreExtension.h} (100%) create mode 100644 FirebaseCore/InternalObjC/FirebaseCoreInternal.h diff --git a/FirebaseCombineSwift/Tests/Unit/FirebaseCombine-unit-Bridging-Header.h b/FirebaseCombineSwift/Tests/Unit/FirebaseCombine-unit-Bridging-Header.h index d61e7a7535d..513e02610ad 100644 --- a/FirebaseCombineSwift/Tests/Unit/FirebaseCombine-unit-Bridging-Header.h +++ b/FirebaseCombineSwift/Tests/Unit/FirebaseCombine-unit-Bridging-Header.h @@ -16,4 +16,4 @@ #import "SharedTestUtilities/FIROptionsMock.h" // Firebase Core -#import "FirebaseCore/Extension/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreExtension.h" diff --git a/FirebaseCore/CMakeLists.txt b/FirebaseCore/CMakeLists.txt index 5117556d606..10de26fc5b1 100644 --- a/FirebaseCore/CMakeLists.txt +++ b/FirebaseCore/CMakeLists.txt @@ -19,8 +19,8 @@ endif() # GoogleUtilities is an external dependency without its own cmake configuration. include(GoogleUtilities) -file(GLOB headers Sources/Private/*.h Sources/Public/FirebaseCore/*.h) -file(GLOB sources Sources/*.m) +file(GLOB headers Sources/Private/*.h Sources/Public/FirebaseCore/*.h Sources/InternalObjC/*.h) +file(GLOB sources Sources/*.m Sources/InternalObjC/*.m) podspec_version(version ${PROJECT_SOURCE_DIR}/FirebaseCore.podspec) firebase_version(firebase_version ${PROJECT_SOURCE_DIR}/FirebaseCore.podspec) diff --git a/FirebaseCore/Extension/FirebaseCoreInternal.h b/FirebaseCore/Extension/FirebaseCoreExtension.h similarity index 100% rename from FirebaseCore/Extension/FirebaseCoreInternal.h rename to FirebaseCore/Extension/FirebaseCoreExtension.h diff --git a/FirebaseCore/InternalObjC/FirebaseCoreInternal.h b/FirebaseCore/InternalObjC/FirebaseCoreInternal.h new file mode 100644 index 00000000000..89a20493e08 --- /dev/null +++ b/FirebaseCore/InternalObjC/FirebaseCoreInternal.h @@ -0,0 +1,23 @@ +// Copyright 2020 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 FirebaseCore; + +#import "FIRAppInternal.h" +#import "FIRComponent.h" +#import "FIRComponentContainer.h" +#import "FIRComponentType.h" +#import "FIRHeartbeatLogger.h" +#import "FIRLibrary.h" +#import "FIRLogger.h" diff --git a/FirebaseCore/Sources/FIROptions.m b/FirebaseCore/Sources/FIROptions.m index 976a0da7792..7ec49d4ddb2 100644 --- a/FirebaseCore/Sources/FIROptions.m +++ b/FirebaseCore/Sources/FIROptions.m @@ -13,7 +13,8 @@ // limitations under the License. #import "FirebaseCore/Extension/FIRAppInternal.h" -@import FirebaseCoreInternal; + +#import "FirebaseCore/InternalObjC/FirebaseCoreInternal.h" #if SWIFT_PACKAGE @import FirebaseCoreInternalObjC; #endif diff --git a/FirebaseCore/Tests/SwiftUnit/FirebaseCore-unit-Bridging-Header.h b/FirebaseCore/Tests/SwiftUnit/FirebaseCore-unit-Bridging-Header.h index 93325036a02..18f7243cefd 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/Extension/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreExtension.h" #import "SharedTestUtilities/ExceptionCatcher.h" #import "SharedTestUtilities/FIROptionsMock.h" diff --git a/FirebaseFunctions/Tests/ObjCIntegration/FIRIntegrationTests.m b/FirebaseFunctions/Tests/ObjCIntegration/FIRIntegrationTests.m index 124f2eb9044..7c3d1a090b1 100644 --- a/FirebaseFunctions/Tests/ObjCIntegration/FIRIntegrationTests.m +++ b/FirebaseFunctions/Tests/ObjCIntegration/FIRIntegrationTests.m @@ -14,7 +14,7 @@ #import -#import "FirebaseCore/Extension/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreExtension.h" #import "FirebaseFunctions/Tests/ObjCIntegration/FIRFunctions+Internal.h" @import FirebaseFunctions; diff --git a/FirebaseInAppMessaging/Sources/DefaultUI/FIRCore+InAppMessagingDisplay.h b/FirebaseInAppMessaging/Sources/DefaultUI/FIRCore+InAppMessagingDisplay.h index 91b15a75afb..185288bc4ad 100644 --- a/FirebaseInAppMessaging/Sources/DefaultUI/FIRCore+InAppMessagingDisplay.h +++ b/FirebaseInAppMessaging/Sources/DefaultUI/FIRCore+InAppMessagingDisplay.h @@ -14,8 +14,6 @@ * limitations under the License. */ -#import "FirebaseCore/Extension/FirebaseCoreInternal.h" - // This file contains declarations that should go into FirebaseCore when // Firebase InAppMessagingDisplay is merged into main. Keep them separate now to help // with build from development folder and avoid merge conflicts. diff --git a/FirebaseInAppMessaging/Sources/FIRInAppMessaging.m b/FirebaseInAppMessaging/Sources/FIRInAppMessaging.m index a30e2d0eb11..445e2daca1e 100644 --- a/FirebaseInAppMessaging/Sources/FIRInAppMessaging.m +++ b/FirebaseInAppMessaging/Sources/FIRInAppMessaging.m @@ -21,7 +21,6 @@ #import -#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnAnalyticEventsFlow.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnAnalyticEventsFlow.m index 4e3a1491919..56b110886da 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnAnalyticEventsFlow.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnAnalyticEventsFlow.m @@ -17,7 +17,6 @@ #import #if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION -#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" #import "Interop/Analytics/Public/FIRAnalyticsInteropListener.h" diff --git a/FirebaseMessaging/Sources/FIRMessagingUtilities.m b/FirebaseMessaging/Sources/FIRMessagingUtilities.m index 70939e70235..6072a15d947 100644 --- a/FirebaseMessaging/Sources/FIRMessagingUtilities.m +++ b/FirebaseMessaging/Sources/FIRMessagingUtilities.m @@ -18,7 +18,7 @@ #import #import -#import "FirebaseCore/Extension/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreExtension.h" #import "FirebaseMessaging/Sources/FIRMessagingLogger.h" NSString *const kFIRMessagingInstanceIDUserDefaultsKeyLocale = diff --git a/FirebaseMessaging/Sources/Token/FIRMessagingTokenFetchOperation.m b/FirebaseMessaging/Sources/Token/FIRMessagingTokenFetchOperation.m index ffb3fdb736c..0062241eb9b 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/Extension/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreExtension.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 92509ec26a7..90e770dd769 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingHandlingTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingHandlingTest.m @@ -19,7 +19,7 @@ #import #import -#import "FirebaseCore/Extension/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreExtension.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 8ef1952552e..227b94350e7 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTest.m @@ -18,7 +18,7 @@ #import #import -#import "FirebaseCore/Extension/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreExtension.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 c653d111fc1..034fb72760a 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTestUtilities.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTestUtilities.m @@ -17,7 +17,7 @@ #import #import -#import "FirebaseCore/Extension/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreExtension.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 13d353b1d02..20b58612515 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenInfoTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenInfoTest.m @@ -19,7 +19,7 @@ #import #import -#import "FirebaseCore/Extension/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreExtension.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 0459a8d3e38..431fe5c506b 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenOperationsTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenOperationsTest.m @@ -18,7 +18,7 @@ #import -#import "FirebaseCore/Extension/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreExtension.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 9d498a57023..6b4941a3c68 100644 --- a/FirebasePerformance/Sources/Configurations/FPRConfigurations.m +++ b/FirebasePerformance/Sources/Configurations/FPRConfigurations.m @@ -23,7 +23,7 @@ #import "FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags+Private.h" #import "FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags.h" -#import "FirebaseCore/Extension/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreExtension.h" FPRConfigName kFPRConfigDataCollectionEnabled = @"dataCollectionEnabled"; diff --git a/FirebasePerformance/Tests/Unit/Fakes/FIRAppFake.m b/FirebasePerformance/Tests/Unit/Fakes/FIRAppFake.m index 11446ffac90..1173806f08a 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/Extension/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreExtension.h" @implementation FIRAppFake diff --git a/FirebaseRemoteConfig/Sources/RCNDevice.m b/FirebaseRemoteConfig/Sources/RCNDevice.m index 3819ff26fbd..69cdc79f4ba 100644 --- a/FirebaseRemoteConfig/Sources/RCNDevice.m +++ b/FirebaseRemoteConfig/Sources/RCNDevice.m @@ -19,7 +19,7 @@ #import #import -#import "FirebaseCore/Extension/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreExtension.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 85b3124c9ae..7ee69c165db 100644 --- a/FirebaseRemoteConfig/Sources/RCNUserDefaultsManager.m +++ b/FirebaseRemoteConfig/Sources/RCNUserDefaultsManager.m @@ -15,7 +15,7 @@ */ #import "FirebaseRemoteConfig/Sources/RCNUserDefaultsManager.h" -#import "FirebaseCore/Extension/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreExtension.h" #import "FirebaseRemoteConfig/Sources/Public/FirebaseRemoteConfig/FIRRemoteConfig.h" #import "FirebaseRemoteConfig/Sources/RCNConfigConstants.h" diff --git a/FirebaseRemoteConfig/Tests/Unit/RCNConfigDBManagerTest.m b/FirebaseRemoteConfig/Tests/Unit/RCNConfigDBManagerTest.m index 773af690935..09a2244ff59 100644 --- a/FirebaseRemoteConfig/Tests/Unit/RCNConfigDBManagerTest.m +++ b/FirebaseRemoteConfig/Tests/Unit/RCNConfigDBManagerTest.m @@ -19,7 +19,7 @@ #import -#import "FirebaseCore/Extension/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreExtension.h" #import "FirebaseRemoteConfig/Sources/Private/RCNConfigSettings.h" #import "FirebaseRemoteConfig/Sources/RCNConfigConstants.h" #import "FirebaseRemoteConfig/Sources/RCNConfigContent.h" diff --git a/FirebaseRemoteConfig/Tests/Unit/RCNPersonalizationTest.m b/FirebaseRemoteConfig/Tests/Unit/RCNPersonalizationTest.m index bdd8ab0b8bc..bf8ab69ea7b 100644 --- a/FirebaseRemoteConfig/Tests/Unit/RCNPersonalizationTest.m +++ b/FirebaseRemoteConfig/Tests/Unit/RCNPersonalizationTest.m @@ -17,7 +17,7 @@ #import #import -#import "FirebaseCore/Extension/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreExtension.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 00704690521..78d3c02413e 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/Extension/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreExtension.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 e84bd024b8b..a197b21d4df 100644 --- a/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m +++ b/FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m @@ -31,7 +31,7 @@ #import "FirebaseRemoteConfig/Tests/Unit/RCNTestUtilities.h" #import -#import "FirebaseCore/Extension/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreExtension.h" @import FirebaseRemoteConfigInterop; @protocol FIRRolloutsStateSubscriber; diff --git a/FirebaseRemoteConfig/Tests/Unit/RCNThrottlingTests.m b/FirebaseRemoteConfig/Tests/Unit/RCNThrottlingTests.m index 5429c61df1f..b1cf83f2034 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/Extension/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreExtension.h" @import FirebaseRemoteConfigInterop; @interface RCNThrottlingTests : XCTestCase { diff --git a/FirebaseStorage/Tests/ObjCIntegration/FIRStorageIntegrationTests.m b/FirebaseStorage/Tests/ObjCIntegration/FIRStorageIntegrationTests.m index bad1bdfa821..113ed884838 100644 --- a/FirebaseStorage/Tests/ObjCIntegration/FIRStorageIntegrationTests.m +++ b/FirebaseStorage/Tests/ObjCIntegration/FIRStorageIntegrationTests.m @@ -17,7 +17,7 @@ @import FirebaseAuth; @import FirebaseStorage; -#import "FirebaseCore/Extension/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreExtension.h" #import "FirebaseStorage/Tests/ObjCIntegration/Credentials.h" diff --git a/HeadersImports.md b/HeadersImports.md index 847c1748afe..d7bf70a1545 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/Extension/FIRebaseCoreInternal.h`. For CocoaPods, these files should be + `FirebaseCore/Extension/FirebaseCoreExtension.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/Interop/FirebaseComponentSystem.md b/Interop/FirebaseComponentSystem.md index ab881ff5402..ef0ceca2b7a 100644 --- a/Interop/FirebaseComponentSystem.md +++ b/Interop/FirebaseComponentSystem.md @@ -87,7 +87,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/Extension/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreExtension.h" @interface FIRFoo @end diff --git a/SharedTestUtilities/FIRSampleAppUtilities.m b/SharedTestUtilities/FIRSampleAppUtilities.m index 8f088b93420..dae295b23a9 100644 --- a/SharedTestUtilities/FIRSampleAppUtilities.m +++ b/SharedTestUtilities/FIRSampleAppUtilities.m @@ -22,7 +22,7 @@ #import #endif -#import "FirebaseCore/Extension/FirebaseCoreInternal.h" +#import "FirebaseCore/Extension/FirebaseCoreExtension.h" NSString *const kGoogleAppIDPlistKey = @"GOOGLE_APP_ID"; // Dummy plist GOOGLE_APP_ID