Use preserve_paths instead of CocoaPods private (#5758)

Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionArbiter.m

@@ -20,7 +20,7 @@
 #import "FBLPromises.h"
 #endif
 
-#import <FirebaseCore/FIRApp.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FIRCLSUserDefaults.h"
 

Crashlytics/Crashlytics/FIRCrashlytics.m

@@ -42,13 +42,8 @@
 #import "FIRCLSReportManager.h"
 
 #import <FirebaseAnalyticsInterop/FIRAnalyticsInterop.h>
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIRComponent.h>
-#import <FirebaseCore/FIRComponentContainer.h>
-#import <FirebaseCore/FIRDependency.h>
-#import <FirebaseCore/FIRLibrary.h>
-#import <FirebaseCore/FIROptionsInternal.h>
 #import <FirebaseInstallations/FirebaseInstallations.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import <GoogleDataTransport/GDTCORTargets.h>
 #import <GoogleDataTransport/GDTCORTransport.h>

Crashlytics/Crashlytics/Helpers/FIRCLSLogger.m

@@ -14,7 +14,7 @@
 
 #import "FIRCLSLogger.h"
 
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 FIRLoggerService kFIRLoggerCrashlytics = @"[Firebase/Crashlytics]";
 

Crashlytics/UnitTests/FIRCLSReportManagerTests.m

@@ -15,7 +15,7 @@
 #import <Foundation/Foundation.h>
 #import <XCTest/XCTest.h>
 
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #if __has_include(<FBLPromises/FBLPromises.h>)
 #import <FBLPromises/FBLPromises.h>

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/FIRApp.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 @interface FIRAppFake : NSObject
 

Example/Database/Tests/Helpers/FTestBase.m

@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-#import <FirebaseCore/FIRApp.h>
-#import <FirebaseCore/FIROptions.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FIRDatabaseQuery_Private.h"
 #import "FIRTestAuthTokenProvider.h"

Example/Database/Tests/Helpers/FTestHelpers.m

@@ -17,10 +17,7 @@
 #import "FTestHelpers.h"
 
 #import <FirebaseAuthInterop/FIRAuthInterop.h>
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIRComponent.h>
-#import <FirebaseCore/FIRComponentContainer.h>
-#import <FirebaseCore/FIROptions.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FConstants.h"
 #import "FIRAuthInteropFake.h"

Example/Database/Tests/Integration/FConnectionTest.m

@@ -16,8 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <FirebaseCore/FIRApp.h>
-#import <FirebaseCore/FIROptions.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FConnection.h"
 #import "FIRDatabaseQuery_Private.h"

Example/Database/Tests/Integration/FData.m

@@ -15,8 +15,6 @@
  */
 
 #import "FData.h"
-#import <FirebaseCore/FIRApp.h>
-#import <FirebaseCore/FIROptions.h>
 #import <limits.h>
 #import "FEventTester.h"
 #import "FIRDatabaseConfig_Private.h"
@@ -25,6 +23,7 @@
 #import "FRepo_Private.h"
 #import "FTestHelpers.h"
 #import "FTupleEventTypeString.h"
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 @implementation FData
 

Example/Database/Tests/Integration/FIRAuthTests.m

@@ -17,9 +17,7 @@
 #import <XCTest/XCTest.h>
 
 #import <FirebaseAuthInterop/FIRAuthInterop.h>
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIRComponent.h>
-#import <FirebaseCore/FIRComponentContainer.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FIRAuthInteropFake.h"
 #import "FIRDatabaseConfig_Private.h"

Example/Database/Tests/Integration/FIRDatabaseTests.m

@@ -16,9 +16,8 @@
 
 #import <XCTest/XCTest.h>
 
-#import <FirebaseCore/FIRApp.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
-#import <FirebaseCore/FIROptions.h>
 #import "FIRDatabase.h"
 #import "FIRDatabaseConfig_Private.h"
 #import "FIRDatabaseReference.h"

Example/Database/Tests/Unit/FSyncPointTests.m

@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FCancelEvent.h"
 #import "FChange.h"

Example/InstanceID/Tests/FIRInstanceIDTest.m

@@ -18,10 +18,9 @@
 
 #import <FirebaseInstallations/FIRInstallations.h>
 
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIROptionsInternal.h>
 #import <FirebaseInstanceID/FIRInstanceID_Private.h>
 #import <OCMock/OCMock.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "Firebase/InstanceID/FIRInstanceIDAuthService.h"
 #import "Firebase/InstanceID/FIRInstanceIDCheckinPreferences+Internal.h"

Example/InstanceID/Tests/FIRInstanceIDTokenInfoTest.m

@@ -18,11 +18,10 @@
 
 #import <XCTest/XCTest.h>
 
-#import <FirebaseCore/FIROptions.h>
-#import <FirebaseCore/FIROptionsInternal.h>
 #import <OCMock/OCMock.h>
 #import "Firebase/InstanceID/FIRInstanceIDAPNSInfo.h"
 #import "Firebase/InstanceID/FIRInstanceIDUtilities.h"
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 static NSString *const kAuthorizedEntity = @"authorizedEntity";
 static NSString *const kScope = @"scope";

Example/InstanceID/Tests/FIRInstanceIDTokenOperationsTest.m

@@ -32,9 +32,9 @@
 #import "Firebase/InstanceID/FIRInstanceIDTokenOperation.h"
 #import "Firebase/InstanceID/NSError+FIRInstanceID.h"
 
-#import <FirebaseCore/FIRAppInternal.h>
 #import <FirebaseInstallations/FirebaseInstallations.h>
 #import <GoogleUtilities/GULHeartbeatDateStorage.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 static NSString *kDeviceID = @"fakeDeviceID";
 static NSString *kSecretToken = @"fakeSecretToken";

Example/Shared/FIRComponentTestUtilities.h

@@ -16,9 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIRComponent.h>
-#import <FirebaseCore/FIRComponentContainer.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

Example/Shared/FIRSampleAppUtilities.m

@@ -16,8 +16,8 @@
 
 #import "FIRSampleAppUtilities.h"
 
-#import <FirebaseCore/FIROptionsInternal.h>
 #import <SafariServices/SafariServices.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 NSString *const kGoogleAppIDPlistKey = @"GOOGLE_APP_ID";
 // Dummy plist GOOGLE_APP_ID

Firebase.podspec

@@ -36,7 +36,7 @@ Simplify your app development, grow your user base, and monetize more effectivel
   end
 
   s.subspec 'CoreOnly' do |ss|
-    ss.dependency 'FirebaseCore', '6.7.2'
+    ss.dependency 'FirebaseCore', '6.8.0'
     ss.source_files = 'CoreOnly/Sources/Firebase.h'
     ss.preserve_paths = 'CoreOnly/Sources/module.modulemap'
     if ENV['FIREBASE_POD_REPO_FOR_DEV_POD'] then

Firebase/Database/Api/FIRDatabase.m

@@ -16,13 +16,8 @@
 
 #import <Foundation/Foundation.h>
 
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 #import <FirebaseAuthInterop/FIRAuthInterop.h>
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIRComponent.h>
-#import <FirebaseCore/FIRComponentContainer.h>
-#import <FirebaseCore/FIRDependency.h>
-#import <FirebaseCore/FIRLogger.h>
-#import <FirebaseCore/FIROptions.h>
 
 #import "FIRDatabase.h"
 #import "FIRDatabaseComponent.h"

Firebase/Database/Api/FIRDatabaseComponent.m

@@ -20,13 +20,8 @@
 #import "FIRDatabase_Private.h"
 #import "FRepoManager.h"
 
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 #import <FirebaseAuthInterop/FIRAuthInterop.h>
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIRComponent.h>
-#import <FirebaseCore/FIRComponentContainer.h>
-#import <FirebaseCore/FIRDependency.h>
-#import <FirebaseCore/FIRLibrary.h>
-#import <FirebaseCore/FIROptions.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

Firebase/Database/Core/FPersistentConnection.m

@@ -33,7 +33,7 @@
 #import "FTupleCallbackStatus.h"
 #import "FTupleOnDisconnect.h"
 #import "FUtilities.h"
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 #import <SystemConfiguration/SystemConfiguration.h>
 #import <dlfcn.h>
 #import <netinet/in.h>

Firebase/Database/Core/FRepo.m

@@ -49,7 +49,7 @@
 #import "FTupleTransaction.h"
 #import "FValueEventRegistration.h"
 #import "FWriteRecord.h"
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 #import <dlfcn.h>
 
 #if TARGET_OS_IOS || TARGET_OS_TV

Firebase/Database/Core/FRepoManager.m

@@ -20,7 +20,7 @@
 #import "FIRDatabaseQuery_Private.h"
 #import "FIRDatabase_Private.h"
 #import "FRepo.h"
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 @implementation FRepoManager
 

Firebase/Database/Core/FSyncTree.m

@@ -48,7 +48,7 @@
 #import "FWriteRecord.h"
 #import "FWriteTree.h"
 #import "FWriteTreeRef.h"
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 // Size after which we start including the compound hash
 static const NSUInteger kFSizeThresholdForCompoundHash = 1024;

Firebase/Database/Core/Utilities/FIRRetryHelper.m

@@ -16,7 +16,7 @@
 
 #import "FIRRetryHelper.h"
 #import "FUtilities.h"
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 @interface FIRRetryHelperTask : NSObject
 

Firebase/Database/Core/View/FChildEventRegistration.m

@@ -21,7 +21,7 @@
 #import "FIRDatabaseQuery_Private.h"
 #import "FQueryParams.h"
 #import "FQuerySpec.h"
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 @interface FChildEventRegistration ()
 @property(nonatomic, strong) FRepo *repo;

Firebase/Database/Core/View/FValueEventRegistration.m

@@ -21,7 +21,7 @@
 #import "FIRDatabaseQuery_Private.h"
 #import "FQueryParams.h"
 #import "FQuerySpec.h"
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 @interface FValueEventRegistration ()
 @property(nonatomic, strong) FRepo *repo;

Firebase/Database/FIRDatabaseReference.m

@@ -26,8 +26,7 @@
 #import "FStringUtilities.h"
 #import "FUtilities.h"
 #import "FValidation.h"
-#import <FirebaseCore/FIRApp.h>
-#import <FirebaseCore/FIROptions.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 @implementation FIRDatabaseReference
 

Firebase/Database/Login/FAuthTokenProvider.m

@@ -16,10 +16,8 @@
 
 #import "FAuthTokenProvider.h"
 
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 #import <FirebaseAuthInterop/FIRAuthInterop.h>
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIRComponentContainer.h>
-#import <FirebaseCore/FIRLogger.h>
 
 #import "FIRDatabaseQuery_Private.h"
 #import "FIRNoopAuthTokenProvider.h"

Firebase/Database/Persistence/FLevelDBStorageEngine.m

@@ -27,7 +27,7 @@
 #import "FTrackedQuery.h"
 #import "FUtilities.h"
 #import "FWriteRecord.h"
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 @interface FLevelDBStorageEngine ()
 

Firebase/Database/Persistence/FPersistenceManager.m

@@ -23,7 +23,7 @@
 #import "FTrackedQuery.h"
 #import "FTrackedQueryManager.h"
 #import "FUtilities.h"
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 @interface FPersistenceManager ()
 

Firebase/Database/Persistence/FTrackedQueryManager.m

@@ -22,7 +22,7 @@
 #import "FPruneForest.h"
 #import "FTrackedQuery.h"
 #import "FUtilities.h"
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 @interface FTrackedQueryManager ()
 

Firebase/Database/Realtime/FConnection.m

@@ -16,7 +16,7 @@
 
 #import "FConnection.h"
 #import "FConstants.h"
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 typedef enum {
     REALTIME_STATE_CONNECTING = 0,

Firebase/Database/Realtime/FWebSocketConnection.m

@@ -24,7 +24,7 @@
 #import "FIRDatabase_Private.h"
 #import "FStringUtilities.h"
 #import "FWebSocketConnection.h"
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #if TARGET_OS_IOS || TARGET_OS_TV
 #import <UIKit/UIKit.h>

Firebase/Database/Utilities/FUtilities.h

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 #import <Foundation/Foundation.h>
 
 #import "FParsedUrl.h"

Firebase/Database/Utilities/FUtilities.m

@@ -18,7 +18,7 @@
 #import "FAtomicNumber.h"
 #import "FConstants.h"
 #import "FStringUtilities.h"
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #define ARC4RANDOM_MAX 0x100000000
 #define INTEGER_32_MIN (-2147483648)

Firebase/InstanceID/FIRInstanceID.m

@@ -18,11 +18,6 @@
 
 #import <FirebaseInstallations/FIRInstallations.h>
 
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIRComponent.h>
-#import <FirebaseCore/FIRComponentContainer.h>
-#import <FirebaseCore/FIRLibrary.h>
-#import <FirebaseCore/FIROptions.h>
 #import <GoogleUtilities/GULAppEnvironmentUtil.h>
 #import <GoogleUtilities/GULUserDefaults.h>
 #import "FIRInstanceID+Private.h"
@@ -37,6 +32,7 @@
 #import "FIRInstanceIDTokenManager.h"
 #import "FIRInstanceIDUtilities.h"
 #import "FIRInstanceIDVersionUtilities.h"
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 #import "NSError+FIRInstanceID.h"
 
 // Public constants

Firebase/InstanceID/FIRInstanceIDLogger.m

@@ -16,7 +16,7 @@
 
 #import "FIRInstanceIDLogger.h"
 
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 // Re-definition of FIRLogger service, as it is not included in :FIRAppHeaders target
 NSString *const kFIRInstanceIDLoggerService = @"[Firebase/InstanceID]";

Firebase/InstanceID/FIRInstanceIDTokenFetchOperation.m

@@ -25,8 +25,7 @@
 #import "FIRInstanceIDUtilities.h"
 #import "NSError+FIRInstanceID.h"
 
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIRHeartbeatInfo.h>
+#import "FirebaseCore/Sources/Private/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

Firebase/InstanceID/FIRInstanceIDUtilities.m

@@ -21,11 +21,11 @@
 #endif
 #import <sys/utsname.h>
 
-#import <FirebaseCore/FIROptions.h>
 #import <GoogleUtilities/GULUserDefaults.h>
 #import "FIRInstanceID.h"
 #import "FIRInstanceIDConstants.h"
 #import "FIRInstanceIDLogger.h"
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 // Convert the macro to a string
 #define STR_EXPAND(x) #x

FirebaseABTesting.podspec

@@ -41,7 +41,7 @@ Firebase Cloud Messaging and Firebase Remote Config in your app.
     'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"'
   }
   s.dependency 'FirebaseAnalyticsInterop', '~> 1.3'
-  s.dependency 'FirebaseCore', '~> 6.1'
+  s.dependency 'FirebaseCore', '~> 6.8'
   s.dependency 'Protobuf', '~> 3.9', '>= 3.9.2'
 
   s.test_spec 'unit' do |unit_tests|

FirebaseABTesting/Sources/ABTConditionalUserPropertyController.m

@@ -16,8 +16,8 @@
 
 #import <FirebaseABTesting/FIRLifecycleEvents.h>
 #import <FirebaseAnalyticsInterop/FIRAnalyticsInterop.h>
-#import <FirebaseCore/FIRLogger.h>
 #import "FirebaseABTesting/Sources/ABTConstants.h"
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 @implementation ABTConditionalUserPropertyController {
   dispatch_queue_t _analyticOperationQueue;

FirebaseABTesting/Sources/FIRExperimentController.m

@@ -15,16 +15,11 @@
 #import <FirebaseABTesting/FIRExperimentController.h>
 
 #import <FirebaseABTesting/FIRLifecycleEvents.h>
-#import <FirebaseCore/FIRLogger.h>
 #import "FirebaseABTesting/Sources/ABTConditionalUserPropertyController.h"
 #import "FirebaseABTesting/Sources/ABTConstants.h"
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import <FirebaseAnalyticsInterop/FIRAnalyticsInterop.h>
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIRComponent.h>
-#import <FirebaseCore/FIRComponentContainer.h>
-#import <FirebaseCore/FIRDependency.h>
-#import <FirebaseCore/FIRLibrary.h>
 
 #ifndef FIRABTesting_VERSION
 #error "FIRABTesting_VERSION is not defined: \

FirebaseABTesting/Tests/Unit/ABTConditionalUserPropertyControllerTest.m

@@ -16,13 +16,12 @@
 
 #import <FirebaseABTesting/FIRExperimentController.h>
 #import <FirebaseABTesting/FIRLifecycleEvents.h>
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIROptionsInternal.h>
 #import <OCMock/OCMock.h>
 #import "FirebaseABTesting/Sources/ABTConditionalUserPropertyController.h"
 #import "FirebaseABTesting/Sources/ABTConstants.h"
 #import "FirebaseABTesting/Tests/Unit/ABTFakeFIRAConditionalUserPropertyController.h"
 #import "FirebaseABTesting/Tests/Unit/ABTTestUniversalConstants.h"
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 @interface ABTConditionalUserPropertyController (ExposedForTest)
 - (NSInteger)maxNumberOfExperimentsOfOrigin:(NSString *)origin;

FirebaseABTesting/Tests/Unit/FIRExperimentControllerTest.m

@@ -17,13 +17,12 @@
 #import <FirebaseABTesting/FIRExperimentController.h>
 #import <FirebaseABTesting/FIRLifecycleEvents.h>
 #import <FirebaseAnalyticsInterop/FIRAnalyticsInterop.h>
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIROptionsInternal.h>
 #import <OCMock/OCMock.h>
 #import "FirebaseABTesting/Sources/ABTConditionalUserPropertyController.h"
 #import "FirebaseABTesting/Sources/ABTConstants.h"
 #import "FirebaseABTesting/Tests/Unit/ABTFakeFIRAConditionalUserPropertyController.h"
 #import "FirebaseABTesting/Tests/Unit/ABTTestUniversalConstants.h"
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 extern ABTExperimentPayload *ABTDeserializeExperimentPayload(NSData *payload);
 

FirebaseAppDistribution.podspec

@@ -25,14 +25,16 @@ iOS SDK for App Distribution for Firebase.
   s.source_files = base_dir + '**/*.{c,h,m,mm}'
   s.public_header_files = base_dir + 'Public/*.h'
   s.private_header_files = base_dir + 'Private/*.h'
+  s.preserve_paths = 'FirebaseCore/Sources/Private/*.h'
 
-  s.dependency 'FirebaseCore', '~> 6.6'
+  s.dependency 'FirebaseCore', '~> 6.8'
   s.dependency 'AppAuth', '~> 1.2.0'
   s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 6.5'
 
   s.pod_target_xcconfig = {
     'GCC_C_LANGUAGE_STANDARD' => 'c99',
-    'GCC_PREPROCESSOR_DEFINITIONS' => 'FIRAppDistribution_VERSION=' + s.version.to_s
+    'GCC_PREPROCESSOR_DEFINITIONS' => 'FIRAppDistribution_VERSION=' + s.version.to_s,
+    'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"'
   }
 
   s.test_spec 'unit' do |unit_tests|

FirebaseAppDistribution/Sources/FIRAppDistribution.m

@@ -17,10 +17,7 @@
 #import "FIRAppDistributionMachO+Private.h"
 #import "FIRAppDistributionRelease+Private.h"
 
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIRComponent.h>
-#import <FirebaseCore/FIRComponentContainer.h>
-#import <FirebaseCore/FIROptions.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import <GoogleUtilities/GULAppDelegateSwizzler.h>
 #import "FIRAppDistributionAppDelegateInterceptor.h"

FirebaseAppDistribution/Tests/Unit/FIRAppDistributionMachOTests.m

@@ -15,8 +15,8 @@
 #import <Foundation/Foundation.h>
 #import <XCTest/XCTest.h>
 
-#import <FirebaseCore/FIRAppInternal.h>
 #import "FIRAppDistributionMachO+Private.h"
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 @interface FIRAppDistributionMachOTests : XCTestCase
 @end

FirebaseAppDistribution/Tests/Unit/FIRAppDistributionTests.m

@@ -15,8 +15,8 @@
 #import <Foundation/Foundation.h>
 #import <XCTest/XCTest.h>
 
-#import <FirebaseCore/FIRAppInternal.h>
 #import "FirebaseAppDistribution/FIRAppDistribution.h"
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 @interface FIRAppDistributionSampleTests : XCTestCase
 

FirebaseAuth.podspec

@@ -29,6 +29,7 @@ supports email and password accounts, as well as several 3rd party authenticatio
   s.source_files = source + '**/*.[mh]'
   s.public_header_files = source + 'Public/*.h'
   s.preserve_paths = [
+    'FirebaseCore/Sources/Private/*.h',
     'FirebaseAuth/README.md',
     'FirebaseAuth/CHANGELOG.md'
   ]
@@ -42,7 +43,7 @@ supports email and password accounts, as well as several 3rd party authenticatio
   s.framework = 'Security'
   s.ios.framework = 'SafariServices'
   s.dependency 'FirebaseAuthInterop', '~> 1.0'
-  s.dependency 'FirebaseCore', '~> 6.6'
+  s.dependency 'FirebaseCore', '~> 6.8'
   s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 6.5'
   s.dependency 'GoogleUtilities/Environment', '~> 6.5'
   s.dependency 'GTMSessionFetcher/Core', '~> 1.1'

FirebaseAuth/Sources/Auth/FIRAuth.m

@@ -23,15 +23,10 @@
 #endif
 
 #import <FirebaseAuth/FirebaseAuth.h>
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIRComponent.h>
-#import <FirebaseCore/FIRComponentContainer.h>
-#import <FirebaseCore/FIRLibrary.h>
-#import <FirebaseCore/FIRLogger.h>
-#import <FirebaseCore/FIROptions.h>
 #import <GoogleUtilities/GULAppDelegateSwizzler.h>
 #import <GoogleUtilities/GULAppEnvironmentUtil.h>
 #import <GoogleUtilities/GULSceneDelegateSwizzler.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FirebaseAuth/Sources/Auth/FIRAuthDataResult_Internal.h"
 #import "FirebaseAuth/Sources/Auth/FIRAuthDispatcher.h"

FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthProvider.m

@@ -18,8 +18,7 @@
 #import <FirebaseAuth/FIRFacebookAuthProvider.h>
 #import <FirebaseAuth/FIROAuthCredential.h>
 #import <FirebaseAuth/FIROAuthProvider.h>
-#import <FirebaseCore/FIRApp.h>
-#import <FirebaseCore/FIROptions.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h"
 #import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h"

FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthProvider.m

@@ -21,9 +21,7 @@
 #import <FirebaseAuth/FIRMultiFactorResolver.h>
 #import <FirebaseAuth/FIRPhoneAuthProvider.h>
 #import <FirebaseAuth/FirebaseAuthVersion.h>
-#import <FirebaseCore/FIRApp.h>
-#import <FirebaseCore/FIRLogger.h>
-#import <FirebaseCore/FIROptions.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h"
 #import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h"

FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.m

@@ -17,8 +17,8 @@
 #include <TargetConditionals.h>
 #if !TARGET_OS_OSX
 
-#import <FirebaseCore/FIRLogger.h>
 #import <GoogleUtilities/GULAppEnvironmentUtil.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h"
 #import "FirebaseAuth/Sources/SystemService/FIRAuthAPNSToken.h"

FirebaseAuth/Sources/SystemService/FIRAuthNotificationManager.m

@@ -17,7 +17,7 @@
 #include <TargetConditionals.h>
 #if !TARGET_OS_OSX
 
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h"
 #import "FirebaseAuth/Sources/SystemService/FIRAuthAppCredential.h"

FirebaseAuth/Sources/User/FIRUser.m

@@ -17,7 +17,7 @@
 #import <FirebaseAuth/FIRAuth.h>
 #import <FirebaseAuth/FIREmailAuthProvider.h>
 #import <FirebaseAuth/FIRFederatedAuthProvider.h>
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FirebaseAuth/Sources/Auth/FIRAuthDataResult_Internal.h"
 #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h"

FirebaseAuth/Tests/Sample/Sample/ApplicationDelegate.m

@@ -17,7 +17,7 @@
 #import "ApplicationDelegate.h"
 
 #import <FirebaseCore/FIRApp.h>
-#import <FirebaseCore/FIRLogger.h>
+#import <FirebaseCore/FIRConfiguration.h>
 
 #import "AuthProviders.h"
 #import <FirebaseAuth/FirebaseAuth.h>
@@ -41,7 +41,7 @@ static __weak id<OpenURLDelegate> gOpenURLDelegate;
 - (BOOL)application:(UIApplication *)application
     didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
   [GTMSessionFetcher  setLoggingEnabled:YES];
-  FIRSetLoggerLevel(FIRLoggerLevelInfo);
+  [[FIRConfiguration sharedInstance] setLoggerLevel:FIRLoggerLevelInfo];
 
   // Configure the default Firebase application:
   [FIRApp configure];

FirebaseAuth/Tests/Unit/FIRApp+FIRAuthUnitTests.h

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import <FirebaseCore/FIRAppInternal.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 /** @category FIRApp (FIRAuthUnitTests)
     @brief Tests for @c FIRAuth.

FirebaseAuth/Tests/Unit/FIRApp+FIRAuthUnitTests.m

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import <FirebaseCore/FIROptionsInternal.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FirebaseAuth/Tests/Unit/FIRApp+FIRAuthUnitTests.h"
 

FirebaseAuth/Tests/Unit/FIRAuthLifeCycleTests.m

@@ -15,10 +15,8 @@
  */
 
 #import <FirebaseAuthInterop/FIRAuthInterop.h>
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIRComponent.h>
-#import <FirebaseCore/FIRLibrary.h>
 #import <XCTest/XCTest.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h"
 #import "FirebaseAuth/Sources/Backend/FIRAuthRequestConfiguration.h"

FirebaseAuth/Tests/Unit/FIRAuthTests.m

@@ -21,13 +21,11 @@
 #import <FirebaseAuth/FIRGoogleAuthProvider.h>
 #import <FirebaseAuth/FIROAuthProvider.h>
 #import <FirebaseAuthInterop/FIRAuthInterop.h>
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIRComponent.h>
-#import <FirebaseCore/FIRLibrary.h>
 #import <Foundation/Foundation.h>
 #import <GoogleUtilities/GULAppDelegateSwizzler.h>
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FirebaseAuth/Sources/Auth/FIRAuthDispatcher.h"
 #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h"

FirebaseAuth/Tests/Unit/FIROAuthProviderTests.m

@@ -17,10 +17,9 @@
 #import <FirebaseAuth/FIRAuthErrors.h>
 #import <FirebaseAuth/FIRAuthUIDelegate.h>
 #import <FirebaseAuth/FIROAuthProvider.h>
-#import <FirebaseCore/FIRApp.h>
-#import <FirebaseCore/FIROptions.h>
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h"
 #import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h"

FirebaseAuth/Tests/Unit/FIRPhoneAuthProviderTests.m

@@ -18,11 +18,10 @@
 #import <FirebaseAuth/FIRAuthSettings.h>
 #import <FirebaseAuth/FIRAuthUIDelegate.h>
 #import <FirebaseAuth/FIRPhoneAuthProvider.h>
-#import <FirebaseCore/FIRApp.h>
-#import <FirebaseCore/FIROptions.h>
 #import <OCMock/OCMock.h>
 #import <SafariServices/SafariServices.h>
 #import <XCTest/XCTest.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h"
 #import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h"

FirebaseCore.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseCore'
-  s.version          = '6.7.2'
+  s.version          = '6.8.0'
   s.summary          = 'Firebase Core'
 
   s.description      = <<-DESC

FirebaseCore/Sources/FIRApp.m

@@ -22,7 +22,7 @@
 #import <AppKit/AppKit.h>
 #endif
 
-#import <FirebaseCore/FIRApp.h>
+#import "FirebaseCore/Sources/Public/FIRApp.h"
 
 #import "FirebaseCore/Sources/FIRAnalyticsConfiguration.h"
 #import "FirebaseCore/Sources/FIRBundleUtil.h"

FirebaseCore/Sources/FIRComponentContainerInternal.h

@@ -15,8 +15,8 @@
  */
 #import <Foundation/Foundation.h>
 
-#import <FirebaseCore/FIRComponent.h>
-#import <FirebaseCore/FIRComponentContainer.h>
+#import "FirebaseCore/Sources/Private/FIRComponent.h"
+#import "FirebaseCore/Sources/Private/FIRComponentContainer.h"
 
 @class FIRApp;
 

FirebaseCore/Sources/FIRConfigurationInternal.h

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import <FirebaseCore/FIRConfiguration.h>
+#import "FIRConfiguration.h"
 
 @class FIRAnalyticsConfiguration;
 

FirebaseCore/Sources/FIRCoreDiagnosticsConnector.m

@@ -18,7 +18,7 @@
 
 #import <FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsInterop.h>
 
-#import <FirebaseCore/FIROptions.h>
+#import "FirebaseCore/Sources/Public/FIROptions.h"
 
 #import "FirebaseCore/Sources/FIRDiagnosticsData.h"
 #import "FirebaseCore/Sources/Private/FIRAppInternal.h"

FirebaseCore/Sources/FIRDiagnosticsData.m

@@ -16,7 +16,7 @@
 
 #import "FirebaseCore/Sources/FIRDiagnosticsData.h"
 
-#import <FirebaseCore/FIRApp.h>
+#import "FirebaseCore/Sources/Public/FIRApp.h"
 
 #import "FirebaseCore/Sources/Private/FIRAppInternal.h"
 #import "FirebaseCore/Sources/Private/FIROptionsInternal.h"

FirebaseCore/Sources/FIRLogger.m

@@ -14,9 +14,9 @@
 
 #import "FirebaseCore/Sources/Private/FIRLogger.h"
 
-#import <FirebaseCore/FIRLoggerLevel.h>
 #import <GoogleUtilities/GULAppEnvironmentUtil.h>
 #import <GoogleUtilities/GULLogger.h>
+#import "FirebaseCore/Sources/Public/FIRLoggerLevel.h"
 
 #import "FirebaseCore/Sources/FIRVersion.h"
 

FirebaseCore/Sources/Private/FIRAppInternal.h

@@ -14,8 +14,18 @@
  * limitations under the License.
  */
 
+#if __cplusplus
 #import <FirebaseCore/FIRApp.h>
+#else
+#import "FIRApp.h"
+#endif
+
+// The has_include is a workaround so the old IID needed for the FIS tests can find FIRErrors.h
+#if __has_include("FirebaseCore/Sources/Private/FIRErrors.h")
+#import "FirebaseCore/Sources/Private/FIRErrors.h"
+#else
 #import <FirebaseCore/FIRErrors.h>
+#endif
 
 @class FIRComponentContainer;
 @protocol FIRLibrary;

FirebaseCore/Sources/Private/FIRComponentContainer.h

@@ -15,8 +15,14 @@
  */
 #import <Foundation/Foundation.h>
 
+// The has_include is a workaround so the old IID needed for the FIS tests can find the headers.
+#if __has_include("FirebaseCore/Sources/Private/FIRErrors.h")
+#import "FirebaseCore/Sources/Private/FIRComponentType.h"
+#import "FirebaseCore/Sources/Private/FIRLibrary.h"
+#else
 #import <FirebaseCore/FIRComponentType.h>
 #import <FirebaseCore/FIRLibrary.h>
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 

FirebaseCore/Sources/Private/FIRErrorCode.h

@@ -32,7 +32,8 @@ typedef NS_ENUM(NSInteger, FIRErrorCode) {
   FIRErrorCodeInvalidAppID = -101,
 
   /**
-   * Error code for failing to configure a specific service.
+   * Error code for failing to configure a specific service. Deprectated, but
+   * still used after copybara.
    */
   FIRErrorCodeConfigFailed = -114,
 };

FirebaseCore/Sources/Private/FIRLibrary.h

@@ -19,7 +19,12 @@
 
 #import <Foundation/Foundation.h>
 
+// The has_include is a workaround so the old IID needed for the FIS tests can find the headers.
+#if __has_include("FirebaseCore/Sources/Private/FIRErrors.h")
+#import "FirebaseCore/Sources/Private/FIRComponent.h"
+#else
 #import <FirebaseCore/FIRComponent.h>
+#endif
 
 @class FIRApp;
 

FirebaseCore/Sources/Private/FIRLogger.h

@@ -16,7 +16,11 @@
 
 #import <Foundation/Foundation.h>
 
+#if __cplusplus
 #import <FirebaseCore/FIRLoggerLevel.h>
+#else
+#import "FIRLoggerLevel.h"
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 

FirebaseCore/Sources/Private/FIROptionsInternal.h

@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
+#if __cplusplus
 #import <FirebaseCore/FIROptions.h>
+#else
+#import "FIROptions.h"
+#endif
 
 /**
  * Keys for the strings in the plist file.

FirebaseCore/Sources/Private/FirebaseCoreInternal.h

@@ -0,0 +1,28 @@
+// 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.
+
+#if SWIFT_PACKAGE
+@import FirebaseCore;
+#else
+#import <FirebaseCore/FirebaseCore.h>
+#endif
+
+#import "FirebaseCore/Sources/Private/FIRAppInternal.h"
+#import "FirebaseCore/Sources/Private/FIRComponent.h"
+#import "FirebaseCore/Sources/Private/FIRComponentContainer.h"
+#import "FirebaseCore/Sources/Private/FIRDependency.h"
+#import "FirebaseCore/Sources/Private/FIRHeartbeatInfo.h"
+#import "FirebaseCore/Sources/Private/FIRLibrary.h"
+#import "FirebaseCore/Sources/Private/FIRLogger.h"
+#import "FirebaseCore/Sources/Private/FIROptionsInternal.h"

FirebaseCore/Sources/Public/FIRConfiguration.h

@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <FirebaseCore/FIRLoggerLevel.h>
+#import "FIRLoggerLevel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

FirebaseCore/Tests/Unit/FIRComponentContainerTest.m

@@ -14,10 +14,8 @@
 
 #import "FirebaseCore/Tests/Unit/FIRTestCase.h"
 
-#import <FirebaseCore/FIROptions.h>
 #import "FirebaseCore/Sources/FIRComponentContainerInternal.h"
-#import "FirebaseCore/Sources/Private/FIRAppInternal.h"
-#import "FirebaseCore/Sources/Private/FIRComponent.h"
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FirebaseCore/Tests/Unit/FIRTestComponents.h"
 

FirebaseCore/Tests/Unit/FIRTestComponents.m

@@ -14,9 +14,7 @@
 
 #import "FirebaseCore/Tests/Unit/FIRTestComponents.h"
 
-#import "FirebaseCore/Sources/Private/FIRAppInternal.h"
-#import "FirebaseCore/Sources/Private/FIRComponent.h"
-#import "FirebaseCore/Sources/Private/FIRDependency.h"
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #pragma mark - Standard Component
 

FirebaseCore/Tests/Unit/Swift/FirebaseCore-unit-Bridging-Header.h

@@ -12,5 +12,5 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FirebaseCore/Sources/Private/FIRAppInternal.h"
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 #import "FirebaseCore/Tests/Unit/Swift/SwiftTestingUtilities/ExceptionCatcher.h"

FirebaseCrashlytics.podspec

@@ -29,6 +29,7 @@ Pod::Spec.new do |s|
   ]
 
   s.preserve_paths = [
+    'FirebaseCore/Sources/Private/*.h',
     'Crashlytics/README.md',
     'run',
     'upload-symbols',
@@ -41,7 +42,7 @@ Pod::Spec.new do |s|
     cp -f ./Crashlytics/upload-symbols ./upload-symbols
   PREPARE_COMMAND_END
 
-  s.dependency 'FirebaseCore', '~> 6.6'
+  s.dependency 'FirebaseCore', '~> 6.8'
   s.dependency 'FirebaseInstallations', '~> 1.1'
   s.dependency 'FirebaseAnalyticsInterop', '~> 1.2'
   s.dependency 'PromisesObjC', '~> 1.2'
@@ -59,6 +60,7 @@ Pod::Spec.new do |s|
       'CLS_SDK_NAME="Crashlytics iOS SDK" ' +
       # For nanopb:
       'PB_FIELD_32BIT=1 PB_NO_PACKED_STRUCTS=1 PB_ENABLE_MALLOC=1',
+    'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"',
     'OTHER_LD_FLAGS' => '$(inherited) -sectcreate __TEXT __info_plist'
   }
 
@@ -69,6 +71,7 @@ Pod::Spec.new do |s|
       'CLS_SDK_NAME="Crashlytics Mac SDK" ' +
       # For nanopb:
       'PB_FIELD_32BIT=1 PB_NO_PACKED_STRUCTS=1 PB_ENABLE_MALLOC=1',
+    'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"',
     'OTHER_LD_FLAGS' => '$(inherited) -sectcreate __TEXT __info_plist'
   }
 
@@ -79,6 +82,7 @@ Pod::Spec.new do |s|
       'CLS_SDK_NAME="Crashlytics tvOS SDK" ' +
       # For nanopb:
       'PB_FIELD_32BIT=1 PB_NO_PACKED_STRUCTS=1 PB_ENABLE_MALLOC=1',
+    'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"',
     'OTHER_LD_FLAGS' => '$(inherited) -sectcreate __TEXT __info_plist'
   }
 

FirebaseDatabase.podspec

@@ -29,15 +29,16 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
     base_dir + 'third_party/Wrap-leveldb/APLevelDB.mm',
     base_dir + 'third_party/SocketRocket/fbase64.c'
   s.public_header_files = base_dir + 'Public/*.h'
+  s.preserve_paths = 'FirebaseCore/Sources/Private/*.h'
   s.libraries = ['c++', 'icucore']
   s.frameworks = 'CFNetwork', 'Security', 'SystemConfiguration'
   s.dependency 'leveldb-library', '~> 1.22'
   s.dependency 'FirebaseAuthInterop', '~> 1.0'
-  s.dependency 'FirebaseCore', '~> 6.0'
+  s.dependency 'FirebaseCore', '~> 6.8'
   s.pod_target_xcconfig = {
     'GCC_C_LANGUAGE_STANDARD' => 'c99',
-    'GCC_PREPROCESSOR_DEFINITIONS' =>
-      'FIRDatabase_VERSION=' + s.version.to_s
+    'GCC_PREPROCESSOR_DEFINITIONS' => 'FIRDatabase_VERSION=' + s.version.to_s,
+    'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"'
   }
 
   s.test_spec 'unit' do |unit_tests|

FirebaseDynamicLinks.podspec

@@ -24,9 +24,10 @@ Firebase Dynamic Links are deep links that enhance user experience and increase
 
   s.source_files = 'FirebaseDynamicLinks/Sources/**/*.[mh]'
   s.public_header_files = 'FirebaseDynamicLinks/Sources/Public/*.h'
+  s.preserve_paths = 'FirebaseCore/Sources/Private/*.h'
   s.frameworks = 'QuartzCore'
   s.weak_framework = 'WebKit'
-  s.dependency 'FirebaseCore', '~> 6.2'
+  s.dependency 'FirebaseCore', '~> 6.8'
   s.dependency 'FirebaseAnalyticsInterop', '~> 1.3'
 
   s.pod_target_xcconfig = {

FirebaseDynamicLinks/Sources/FDLURLComponents/FIRDynamicLinkComponentsKeyProvider.m

@@ -16,8 +16,7 @@
 
 #import "FirebaseDynamicLinks/Sources/FDLURLComponents/FIRDynamicLinkComponentsKeyProvider.h"
 
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIROptions.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 @implementation FIRDynamicLinkComponentsKeyProvider
 

FirebaseDynamicLinks/Sources/FIRDynamicLinks.m

@@ -20,12 +20,7 @@
 
 #ifdef FIRDynamicLinks3P
 #import <FirebaseAnalyticsInterop/FIRAnalyticsInterop.h>
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIRComponent.h>
-#import <FirebaseCore/FIRComponentContainer.h>
-#import <FirebaseCore/FIRDependency.h>
-#import <FirebaseCore/FIRLibrary.h>
-#import <FirebaseCore/FIROptionsInternal.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 #import "FirebaseDynamicLinks/Sources/FIRDLScionLogging.h"
 #endif
 

FirebaseDynamicLinks/Sources/Logging/FDLLogging.m

@@ -17,7 +17,7 @@
 #import "FirebaseDynamicLinks/Sources/Logging/FDLLogging.h"
 
 #ifdef GIN_SCION_LOGGING
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 FIRLoggerService kFIRLoggerDynamicLinks = @"[Firebase/DynamicLinks]";
 #endif  // GIN_SCION_LOGGING

FirebaseDynamicLinks/Tests/Sample/FDLBuilderTestAppObjC/AppDelegate.m

@@ -17,9 +17,8 @@
 #import "AppDelegate.h"
 #import "ViewController.h"
 
-#import <FirebaseCore/FIRApp.h>
-#import <FirebaseCore/FIROptions.h>
 #import <FirebaseDynamicLinks/FIRDynamicLinks.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 @implementation AppDelegate
 

FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m

@@ -17,12 +17,10 @@
 #import <XCTest/XCTest.h>
 
 #import <FirebaseAnalyticsInterop/FIRAnalyticsInterop.h>
-#import <FirebaseCore/FIRApp.h>
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIROptions.h>
 #import <GoogleUtilities/GULSwizzler+Unswizzle.h>
 #import <GoogleUtilities/GULSwizzler.h>
 #import <OCMock/OCMock.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 #import "FirebaseDynamicLinks/Sources/FIRDLDefaultRetrievalProcessV2.h"
 #import "FirebaseDynamicLinks/Sources/FIRDLRetrievalProcessFactory.h"
 #import "FirebaseDynamicLinks/Sources/FIRDLRetrievalProcessResult+Private.h"

FirebaseFirestore.podspec

@@ -33,6 +33,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
     'Firestore/core/src/**/*.{cc,mm}',
   ]
   s.preserve_paths = [
+    'FirebaseCore/Sources/Private/*.h',
     'Firestore/Source/API/*.h',
     'Firestore/Source/Core/*.h',
     'Firestore/Source/Local/*.h',
@@ -59,7 +60,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
   s.public_header_files = 'Firestore/Source/Public/*.h'
 
   s.dependency 'FirebaseAuthInterop', '~> 1.0'
-  s.dependency 'FirebaseCore', '~> 6.2'
+  s.dependency 'FirebaseCore', '~> 6.8'
 
   abseil_version = '0.20200225.0'
   s.dependency 'abseil/algorithm', abseil_version

FirebaseFunctions.podspec

@@ -25,14 +25,16 @@ Cloud Functions for Firebase.
 
   s.source_files = 'Functions/FirebaseFunctions/**/*'
   s.public_header_files = 'Functions/FirebaseFunctions/Public/*.h'
+  s.preserve_paths = 'FirebaseCore/Sources/Private/*.h'
 
   s.dependency 'FirebaseAuthInterop', '~> 1.0'
-  s.dependency 'FirebaseCore', '~> 6.0'
+  s.dependency 'FirebaseCore', '~> 6.8'
   s.dependency 'GTMSessionFetcher/Core', '~> 1.1'
 
   s.pod_target_xcconfig = {
     'GCC_C_LANGUAGE_STANDARD' => 'c99',
-    'GCC_PREPROCESSOR_DEFINITIONS' => 'FIRFunctions_VERSION=' + s.version.to_s
+    'GCC_PREPROCESSOR_DEFINITIONS' => 'FIRFunctions_VERSION=' + s.version.to_s,
+    'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"'
   }
 
   s.test_spec 'unit' do |unit_tests|

FirebaseInAppMessaging.podspec

@@ -27,6 +27,7 @@ See more product details at https://firebase.google.com/products/in-app-messagin
   s.source_files = base_dir + "Sources/**/*.[cmh]"
   s.public_header_files = base_dir + 'Sources/Public/*.h'
   s.private_header_files = base_dir + 'Sources/Private/**/*.h'
+  s.preserve_paths = 'FirebaseCore/Sources/Private/*.h'
 
   s.resource_bundles = {
     'InAppMessagingDisplayResources' => [ base_dir + 'Resources/*.xib',
@@ -34,14 +35,16 @@ See more product details at https://firebase.google.com/products/in-app-messagin
                                    base_dir + 'Resources/*.png']
   }
 
-  s.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' =>
+  s.pod_target_xcconfig = {
+    'GCC_PREPROCESSOR_DEFINITIONS' =>
 			'GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1 ' +
       '$(inherited) ' +
       'FIRInAppMessaging_LIB_VERSION=' + String(s.version) + ' ' +
-      'PB_FIELD_32BIT=1 PB_NO_PACKED_STRUCTS=1 PB_ENABLE_MALLOC=1'
+      'PB_FIELD_32BIT=1 PB_NO_PACKED_STRUCTS=1 PB_ENABLE_MALLOC=1',
+    'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"'
   }
 
-  s.dependency 'FirebaseCore', '~> 6.2'
+  s.dependency 'FirebaseCore', '~> 6.8'
   s.ios.dependency 'FirebaseAnalyticsInterop', '~> 1.3'
   s.dependency 'FirebaseInstallations', '~> 1.1'
   s.dependency 'GoogleDataTransportCCTSupport', '~> 3.1'

FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.m

@@ -17,9 +17,9 @@
 #import "FIRIAMAnalyticsEventLoggerImpl.h"
 
 #import <FirebaseAnalyticsInterop/FIRAnalyticsInterop.h>
-#import <FirebaseCore/FIRLogger.h>
 #import "FIRCore+InAppMessaging.h"
 #import "FIRIAMClearcutLogger.h"
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 typedef void (^FIRAUserPropertiesCallback)(NSDictionary *userProperties);
 

FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutHttpRequestSender.m

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FIRCore+InAppMessaging.h"
 #import "FIRIAMClearcutHttpRequestSender.h"

FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.m

@@ -16,7 +16,7 @@
 
 #import <UIKit/UIKit.h>
 
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FIRCore+InAppMessaging.h"
 #import "FIRIAMClearcutLogStorage.h"

FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogger.m

@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FIRCore+InAppMessaging.h"
 #import "FIRIAMClearcutLogStorage.h"

FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutUploader.m

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#import <FirebaseCore/FIRLogger.h>
 #import <UIKit/UIKit.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FIRCore+InAppMessaging.h"
 #import "FIRIAMClearcutUploader.h"

FirebaseInAppMessaging/Sources/Data/FIRIAMFetchResponseParser.m

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FIRCore+InAppMessaging.h"
 #import "FIRIAMDisplayTriggerDefinition.h"

FirebaseInAppMessaging/Sources/Data/FIRIAMMessageContentDataWithImageURL.m

@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FIRCore+InAppMessaging.h"
 #import "FIRIAMMessageContentData.h"

FirebaseInAppMessaging/Sources/DefaultUI/FIRCore+InAppMessagingDisplay.h

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 // This file contains declarations that should go into FirebaseCore when
 // Firebase InAppMessagingDisplay is merged into master. Keep them separate now to help