Merge branch 'master' into rw-datacollection-api

.github/workflows/abtesting.yml

@@ -7,6 +7,7 @@ on:
   pull_request:
     paths:
     - 'FirebaseABTesting**'
+    - 'Interop/Analytics/Public/*.h'
     - '.github/workflows/abtesting.yml'
     - 'Gemfile'
   schedule:

.github/workflows/auth.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     paths:
     - 'FirebaseAuth**'
+    - 'Interop/Auth/Public/*.h'
     - '.github/workflows/auth.yml'
     - 'Gemfile'
   schedule:

.github/workflows/core.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     paths:
     - 'FirebaseCore**'
+    - 'Interop/CoreDiagnostics/Public/*.h'
     - '.github/workflows/core.yml'
     - 'Gemfile'
   schedule:

.github/workflows/crashlytics.yml

@@ -5,6 +5,7 @@ on:
     paths:
     - 'Crashlytics**'
     - '.github/workflows/crashlytics.yml'
+    - 'Interop/Analytics/Public/*.h'
     - 'Gemfile'
   schedule:
     # Run every day at 11pm (PST) - cron uses UTC times

.github/workflows/database.yml

@@ -9,6 +9,7 @@ on:
     - 'FirebaseDatabase**'
     - 'Firebase/Database/**'
     - 'Example/Database/**'
+    - 'Interop/Auth/Public/*.h'
     - '.github/workflows/database.yml'
     - 'Gemfile'
   schedule:

.github/workflows/dynamiclinks.yml

@@ -5,6 +5,7 @@ on:
     paths:
     - 'FirebaseDynamicLinks**'
     - '.github/workflows/dynamiclinks.yml'
+    - 'Interop/Analytics/Public/*.h'
     - 'Gemfile'
   schedule:
     # Run every day at 11pm (PST) - cron uses UTC times

.github/workflows/firestore.yml

@@ -20,6 +20,9 @@ on:
     # Firestore sources
     - 'Firestore/**'
 
+    # Interop headers
+    - 'Interop/Auth/Public/*.h'
+
     # Podspec
     - 'FirebaseFirestore.podspec'
 

.github/workflows/functions.yml

@@ -8,6 +8,7 @@ on:
     paths:
     - 'Functions**'
     - '.github/workflows/functions.yml'
+    - 'Interop/Auth/Public/*.h'
     - 'Gemfile'
   schedule:
     # Run every day at 11pm (PST) - cron uses UTC times

.github/workflows/inappmessaging.yml

@@ -7,6 +7,7 @@ on:
   pull_request:
     paths:
     - 'FirebaseInAppMessaging**'
+    - 'Interop/Analytics/Public/*.h'
     - '.github/workflows/inappmessaging.yml'
     - 'Gemfile'
   schedule:

.github/workflows/interop.yml

@@ -1,28 +0,0 @@
-name: interop
-
-# All Interop pods in the repo are linted here.
-
-on:
-  pull_request:
-    paths:
-    - 'Interop/**'
-    - '*Interop.podspec'
-    - '.github/workflows/interop.yml'
-    - 'Gemfile'
-  schedule:
-    # Run every day at 11pm (PST) - cron uses UTC times
-    - cron:  '0 7 * * *'
-
-jobs:
-  pod-lib-lint:
-    runs-on: macOS-latest
-    strategy:
-      matrix:
-        pod: [Analytics, Auth, CoreDiagnostics]
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Setup Bundler
-      run: scripts/setup_bundler.sh
-    - name: Interop Pod
-      run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb Firebase${{ matrix.pod }}Interop.podspec

.github/workflows/messaging.yml

@@ -5,6 +5,8 @@ on:
     paths:
     # Messaging sources
     - 'FirebaseMessaging/**'
+    # Interop headers
+    - 'Interop/Analytics/Public/*.h'
     # Podspec
     - 'FirebaseMessaging.podspec'
     # This file

.github/workflows/remoteconfig.yml

@@ -7,11 +7,13 @@ on:
   pull_request:
     paths:
     - 'FirebaseRemoteConfig**'
+    - 'Interop/Analytics/Public/*.h'
     - '.github/workflows/remoteconfig.yml'
     - 'Gemfile'
   schedule:
-    # Run every day at 11pm (PST) - cron uses UTC times
-    - cron:  '0 7 * * *'
+    # Run every day at 3am (PST) - cron uses UTC times
+    # This is set to 3 hours after zip workflow so zip testing can run after.
+    - cron:  '0 11 * * *'
 
 jobs:
 
@@ -61,6 +63,60 @@ jobs:
       # Only build the unit tests on Catalyst. Test stopped working when GHA moved to Xcode 11.4.1.
       run: scripts/test_catalyst.sh FirebaseRemoteConfig build FirebaseRemoteConfig-Unit-unit
 
+  quickstart_framework:
+    env:
+      plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
+      signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
+      FRAMEWORK_ZIP: "Firebase-actions-dir.zip"
+      SDK: "Config"
+    runs-on: macOS-latest
+    # Make sure tests run after the zip workflow finishes.
+    if: github.event_name == 'schedule'
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install gcloud tool
+      run: scripts/install_gcloud.sh
+    - name: Access GCS bucket
+      run: |
+        scripts/decrypt_gha_secret.sh scripts/gha-encrypted/firebase-ios-testing.json.gpg firebase-ios-testing.json "$plist_secret"
+        gcloud auth activate-service-account --key-file firebase-ios-testing.json
+    - name: Pull framework zip files from GCS and unzip
+      run: scripts/get_latest_zip_from_gcs.sh "$FRAMEWORK_ZIP" "${HOME}/ios_frameworks"
+    - name: Setup quickstart
+      run: scripts/setup_quickstart_framework.sh "$SDK"
+    - name: Move frameworks to xcode project
+      run: |
+        mkdir -p quickstart-ios/"${SDK}"/Firebase/
+        mv "${HOME}"/ios_frameworks/Firebase/Firebase.h quickstart-ios/"${SDK}"/Firebase/
+        mv "${HOME}"/ios_frameworks/Firebase/module.modulemap quickstart-ios/"${SDK}"/Firebase/
+        mv "${HOME}"/ios_frameworks/Firebase/FirebaseRemoteConfig/* quickstart-ios/"${SDK}"/Firebase/
+        mv "${HOME}"/ios_frameworks/Firebase/FirebaseAnalytics/* quickstart-ios/"${SDK}"/Firebase/
+        cd quickstart-ios/"${SDK}"
+        ../scripts/add_framework_script.rb  "${SDK}" ConfigExample Firebase
+    - name: Install Secret GoogleService-Info.plist
+      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-config.plist.gpg \
+        quickstart-ios/config/GoogleService-Info.plist "$plist_secret"
+    - name: Install Secret FIREGSignInInfo.h
+      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/FIREGSignInInfo.h.gpg \
+        quickstart-ios/TestUtils/FIREGSignInInfo.h "$signin_secret"
+    - name: Test Quickstart
+      run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_framework.sh "${SDK}")
+    - name: Display xcodebuild setup
+      if: ${{ failure() }}
+      run: |
+        cd quickstart-ios/config
+        xcodebuild -project ConfigExample.xcodeproj -target "ConfigExample" -showBuildSettings
+    - name: Remove data before upload
+      if: ${{ failure() }}
+      run: |
+        rm -f quickstart-ios/config/GoogleSerivce-info.plist
+        rm -f quickstart-ios/TestUtils/FIREGSignInInfo.h
+    - uses: actions/upload-artifact@v2
+      if: ${{ failure() }}
+      with:
+        name: quickstart_artifacts
+        path: quickstart-ios/
+
   quickstart:
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}

.github/workflows/storage.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     paths:
     - 'FirebaseStorage**'
+    - 'Interop/Auth/Public/*.h'
     - '.github/workflows/storage.yml'
     - 'scripts/**'
     # Rebuild on Ruby infrastructure changes.

.github/workflows/zip.yml

@@ -23,6 +23,8 @@ jobs:
 
   package:
     needs: build
+    env:
+      gcs_key: ${{ secrets.GHASecretsGPGPassphrase1 }}
     runs-on: macOS-latest
     # Only run the `package` job for the cron job, not PRs.
     if: github.event_name == 'schedule'
@@ -34,10 +36,22 @@ jobs:
       run: |
          mkdir -p zip_output_dir
          sh -x scripts/build_zip.sh zip_output_dir
-
     - uses: actions/upload-artifact@v1
       with:
         name: Firebase-actions-dir
         # Zip the entire output directory since the builder adds subdirectories we don't know the
         # name of.
         path: zip_output_dir
+    - name: Install gcloud tool
+      if: ${{ always() }}
+      run: scripts/install_gcloud.sh
+    - name: Access gcloud account
+      if: ${{ always() }}
+      run: |
+         scripts/decrypt_gha_secret.sh scripts/gha-encrypted/firebase-ios-testing.json.gpg firebase-ios-testing.json "$gcs_key"
+         gcloud auth activate-service-account --key-file firebase-ios-testing.json
+    - name: Update commit hash on GCS if any previous steps failed
+      if: ${{ failure() }}
+      run: scripts/upload_to_gcs.sh "${GITHUB_SHA}" "Fail"
+    - name: Upload zip file to GCS
+      run: scripts/upload_to_gcs.sh "${GITHUB_SHA}" "zip_output_dir"

AddNewPod.md

@@ -46,6 +46,10 @@ explicit import by other Firebase pods)
 * `FirebaseFoo/Tests/Sample` - Optional
 * `FirebaseFoo/Tests/{Other}` - Optional
 
+## Headers and Imports
+
+See [Headers and Imports](HeadersImports.md) for details on managing headers and imports.
+
 ## Continous Integration
 
 Set up a GitHub Action workflow for the pod. A good example template is
@@ -61,7 +65,10 @@ For GitHub tag management and public header change detection, add a GitHub api t
 
 ## Firebase Integration
 
-* Make sure the public headers are imported via [Firebase.h](CoreOnly/Sources/Firebase.h).
+For top-level Firebase pods that map to documented products:
+
+* Make sure the public umbrella header is imported via [Firebase.h](CoreOnly/Sources/Firebase.h)
+  wrapped in `__has_include`. Follow the existing examples for details.
 * Update [Firebase.podspec](Firebase.podspec).
 * Register library via registerInternalLibrary API like this
   [Storage example](FirebaseStorage/Sources/FIRStorageComponent.m).

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_frameworks/Podfile

@@ -7,11 +7,8 @@ target 'CocoapodsIntegrationTest' do
   pod 'FirebaseABTesting', :path => '../'
   pod 'FirebaseCore', :path => '../'
   pod 'FirebaseCoreDiagnostics', :path => '../'
-  pod 'FirebaseCoreDiagnosticsInterop', :path => '../'
   pod 'FirebaseCrashlytics', :path => '../'
-  pod 'FirebaseAnalyticsInterop', :path => '../'
   pod 'FirebaseAuth', :path => '../'
-  pod 'FirebaseAuthInterop', :path => '../'
   pod 'FirebaseDatabase', :path => '../'
   pod 'FirebaseDynamicLinks', :path => '../'
   pod 'FirebaseFirestore', :path => '../'

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_staticLibs/Podfile

@@ -5,11 +5,8 @@ target 'CocoapodsIntegrationTest' do
   pod 'FirebaseABTesting', :path => '../'
   pod 'FirebaseCore', :path => '../'
   pod 'FirebaseCoreDiagnostics', :path => '../'
-  pod 'FirebaseCoreDiagnosticsInterop', :path => '../'
   pod 'FirebaseCrashlytics', :path => '../'
-  pod 'FirebaseAnalyticsInterop', :path => '../'
   pod 'FirebaseAuth', :path => '../'
-  pod 'FirebaseAuthInterop', :path => '../'
   pod 'FirebaseDatabase', :path => '../'
   pod 'FirebaseDynamicLinks', :path => '../'
   pod 'FirebaseFirestore', :path => '../'

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_frameworks/Podfile

@@ -6,11 +6,8 @@ target 'CocoapodsIntegrationTest' do
   pod 'FirebaseABTesting', :path => '../'
   pod 'FirebaseCore', :path => '../'
   pod 'FirebaseCoreDiagnostics', :path => '../'
-  pod 'FirebaseCoreDiagnosticsInterop', :path => '../'
   pod 'FirebaseCrashlytics', :path => '../'
-  pod 'FirebaseAnalyticsInterop', :path => '../'
   pod 'FirebaseAuth', :path => '../'
-  pod 'FirebaseAuthInterop', :path => '../'
   pod 'FirebaseDatabase', :path => '../'
   pod 'FirebaseDynamicLinks', :path => '../'
   pod 'FirebaseFirestore', :path => '../'

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_multiprojects_frameworks/Podfile

@@ -7,11 +7,8 @@ target 'CocoapodsIntegrationTest' do
   pod 'FirebaseABTesting', :path => '../'
   pod 'FirebaseCore', :path => '../'
   pod 'FirebaseCoreDiagnostics', :path => '../'
-  pod 'FirebaseCoreDiagnosticsInterop', :path => '../'
   pod 'FirebaseCrashlytics', :path => '../'
-  pod 'FirebaseAnalyticsInterop', :path => '../'
   pod 'FirebaseAuth', :path => '../'
-  pod 'FirebaseAuthInterop', :path => '../'
   pod 'FirebaseDatabase', :path => '../'
   pod 'FirebaseDynamicLinks', :path => '../'
   pod 'FirebaseFirestore', :path => '../'

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_multiprojects_staticLibs/Podfile

@@ -5,11 +5,8 @@ target 'CocoapodsIntegrationTest' do
   pod 'FirebaseABTesting', :path => '../'
   pod 'FirebaseCore', :path => '../'
   pod 'FirebaseCoreDiagnostics', :path => '../'
-  pod 'FirebaseCoreDiagnosticsInterop', :path => '../'
   pod 'FirebaseCrashlytics', :path => '../'
-  pod 'FirebaseAnalyticsInterop', :path => '../'
   pod 'FirebaseAuth', :path => '../'
-  pod 'FirebaseAuthInterop', :path => '../'
   pod 'FirebaseDatabase', :path => '../'
   pod 'FirebaseDynamicLinks', :path => '../'
   pod 'FirebaseFirestore', :path => '../'

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_staticLibs/Podfile

@@ -5,11 +5,8 @@ target 'CocoapodsIntegrationTest' do
   pod 'FirebaseABTesting', :path => '../'
   pod 'FirebaseCore', :path => '../'
   pod 'FirebaseCoreDiagnostics', :path => '../'
-  pod 'FirebaseCoreDiagnosticsInterop', :path => '../'
   pod 'FirebaseCrashlytics', :path => '../'
-  pod 'FirebaseAnalyticsInterop', :path => '../'
   pod 'FirebaseAuth', :path => '../'
-  pod 'FirebaseAuthInterop', :path => '../'
   pod 'FirebaseDatabase', :path => '../'
   pod 'FirebaseDynamicLinks', :path => '../'
   pod 'FirebaseFirestore', :path => '../'

CoreOnly/Tests/FirebasePodTest/Podfile

@@ -10,12 +10,9 @@ target 'FirebasePodTest' do
 
   pod 'Firebase', :path => '../../../'
   pod 'FirebaseABTesting', :path => '../../../'
-  pod 'FirebaseAnalyticsInterop', :path => '../../../'
   pod 'FirebaseAuth', :path => '../../../'
-  pod 'FirebaseAuthInterop', :path => '../../../'
   pod 'FirebaseCore', :path => '../../../'
   pod 'FirebaseCoreDiagnostics', :path => '../../../'
-  pod 'FirebaseCoreDiagnosticsInterop', :path => '../../../'
   pod 'FirebaseCrashlytics', :path => '../../../'
   pod 'FirebaseDatabase', :path => '../../../'
   pod 'FirebaseDynamicLinks', :path => '../../../'
@@ -30,7 +27,6 @@ target 'FirebasePodTest' do
 
   # Get dependent pods from the repo also
   pod 'FirebaseCoreDiagnostics', :path => '../../../'
-  pod 'FirebaseCoreDiagnosticsInterop', :path => '../../../'
   pod 'GoogleDataTransport', :path => '../../../'
   pod 'GoogleDataTransportCCTSupport', :path => '../../../'
   pod 'GoogleUtilities', :path => '../../../'

Crashlytics/Crashlytics/Controllers/FIRCLSReportManager.m

@@ -64,8 +64,9 @@
 
 #import "FIRCLSReportManager_Private.h"
 
-#include <FirebaseAnalyticsInterop/FIRAnalyticsInterop.h>
-#include <FirebaseAnalyticsInterop/FIRAnalyticsInteropListener.h>
+#import "Interop/Analytics/Public/FIRAnalyticsInterop.h"
+#import "Interop/Analytics/Public/FIRAnalyticsInteropListener.h"
+
 #include "FIRAEvent+Internal.h"
 #include "FIRCLSFCRAnalytics.h"
 

Crashlytics/Crashlytics/Controllers/FIRCLSReportUploader.m

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import <FirebaseAnalyticsInterop/FIRAnalyticsInterop.h>
+#import "Interop/Analytics/Public/FIRAnalyticsInterop.h"
 
 #import "FIRCLSApplication.h"
 #import "FIRCLSDataCollectionArbiter.h"

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

@@ -41,14 +41,9 @@
 
 #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 "Interop/Analytics/Public/FIRAnalyticsInterop.h"
 
 #import <GoogleDataTransport/GDTCORTargets.h>
 #import <GoogleDataTransport/GDTCORTransport.h>

Crashlytics/Crashlytics/Helpers/FIRCLSFCRAnalytics.m

@@ -17,7 +17,7 @@
 #import "FIRCLSInternalLogging.h"
 #import "FIRCLSSettings.h"
 
-#import <FirebaseAnalyticsInterop/FIRAnalyticsInterop.h>
+#import "Interop/Analytics/Public/FIRAnalyticsInterop.h"
 
 // Origin for events and user properties generated by Crashlytics.
 static NSString *const kFIREventOriginCrash = @"clx";

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/CoreDiagnostics/Tests/FIRCoreDiagnosticsTest.m

@@ -19,8 +19,6 @@
 #import <UIKit/UIKit.h>
 #endif  // TARGET_OS_IOS || TARGET_OS_TV
 
-#import <FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsData.h>
-#import <FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsInterop.h>
 #import <GoogleDataTransport/GDTCOREvent.h>
 #import <GoogleDataTransport/GDTCOREventDataObject.h>
 #import <GoogleDataTransport/GDTCORTransport.h>
@@ -31,6 +29,8 @@
 #import <OCMock/OCMock.h>
 #import <nanopb/pb_decode.h>
 #import <nanopb/pb_encode.h>
+#import "Interop/CoreDiagnostics/Public/FIRCoreDiagnosticsData.h"
+#import "Interop/CoreDiagnostics/Public/FIRCoreDiagnosticsInterop.h"
 
 #import "FIRCDLibrary/Protogen/nanopb/firebasecore.nanopb.h"
 

Example/Database/Tests/Helpers/FIRFakeApp.m

@@ -22,6 +22,7 @@
 
 @interface FIRFakeOptions : NSObject
 @property(nonatomic, readonly, copy) NSString *databaseURL;
+@property(nonatomic, readonly, copy) NSString *googleAppID;
 - (instancetype)initWithURL:(NSString *)url;
 @end
 
@@ -30,6 +31,7 @@
   self = [super init];
   if (self) {
     _databaseURL = url;
+    _googleAppID = @"fake-app-id";
   }
   return self;
 }

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

@@ -16,11 +16,8 @@
 
 #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 "Interop/Auth/Public/FIRAuthInterop.h"
 
 #import "FConstants.h"
 #import "FIRAuthInteropFake.h"
@@ -58,6 +55,7 @@
   id<FIRAuthInterop> auth = [[FIRAuthInteropFake alloc] initWithToken:nil userID:nil error:nil];
   id<FAuthTokenProvider> authTokenProvider = [FAuthTokenProvider authTokenProviderWithAuth:auth];
   return [[FIRDatabaseConfig alloc] initWithSessionIdentifier:name
+                                                  googleAppID:@"fake-app-id"
                                             authTokenProvider:authTokenProvider];
 }
 

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"
@@ -59,6 +58,7 @@
   FRepoInfo *info = [[FRepoInfo alloc] initWithHost:host isSecure:YES withNamespace:@"default"];
   FConnection *conn = [[FConnection alloc] initWith:info
                                    andDispatchQueue:[FIRDatabaseQuery sharedQueue]
+                                        googleAppID:@"fake-app-id"
                                       lastSessionID:nil];
   FTestConnectionDelegate *delegate = [[FTestConnectionDelegate alloc] init];
 

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

@@ -16,10 +16,8 @@
 
 #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 "Interop/Auth/Public/FIRAuthInterop.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/FIRAuthInteropFake.h

@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <FirebaseAuthInterop/FIRAuthInterop.h>
+#import "Interop/Auth/Public/FIRAuthInterop.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

Example/Shared/FIRAuthInteropFake.m

@@ -16,7 +16,7 @@
 
 #import "FIRAuthInteropFake.h"
 
-#import <FirebaseAuthInterop/FIRAuthInterop.h>
+#import "Interop/Auth/Public/FIRAuthInterop.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

Example/Shared/FIRComponentTestUtilities.h

@@ -16,9 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIRComponent.h>
-#import <FirebaseCore/FIRComponentContainerInternal.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

Example/tvOSSample/Podfile

@@ -7,9 +7,7 @@ target 'tvOSSample' do
   # Pods for tvOSSample
   pod 'FirebaseCore', :path => '../../'
   pod 'FirebaseCoreDiagnostics', :path => '../../'
-  pod 'FirebaseCoreDiagnosticsInterop', :path => '../../'
   pod 'FirebaseAuth', :path => '../../'
-  pod 'FirebaseAuthInterop', :path => '../../'
   pod 'FirebaseDatabase', :path => '../../'
   pod 'FirebaseStorage', :path => '../../'
   pod 'GoogleDataTransport', :path => '../../'

Example/watchOSSample/Podfile

@@ -3,14 +3,11 @@ use_frameworks!
 target 'SampleWatchAppWatchKitExtension' do
   platform :watchos, '6.0'
 
-  pod 'FirebaseAnalyticsInterop', :path => '../../../../../'
-  pod 'FirebaseAuthInterop', :path => '../../../../../'
   pod 'FirebaseCore', :path => '../../../../../'
   pod 'GoogleUtilities', :path => '../../../../../'
   pod 'FirebaseMessaging', :path => '../../../../../'
   pod 'FirebaseInstanceID', :path => '../../../../../'
   pod 'FirebaseCoreDiagnostics', :path => '../../../../../'
-  pod 'FirebaseCoreDiagnosticsInterop', :path => '../../../../../'
   pod 'GoogleDataTransport', :path => '../../../../../'
   pod 'GoogleDataTransportCCTSupport', :path => '../../../../../'
   pod 'FirebaseInstallations', :path => '../../../../../'

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/CoreDiagnostics/FIRCDLibrary/FIRCoreDiagnostics.m

@@ -26,8 +26,8 @@
 #import <GoogleUtilities/GULHeartbeatDateStorage.h>
 #import <GoogleUtilities/GULLogger.h>
 
-#import <FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsData.h>
-#import <FirebaseCoreDiagnosticsInterop/FIRCoreDiagnosticsInterop.h>
+#import "Interop/CoreDiagnostics/Public/FIRCoreDiagnosticsData.h"
+#import "Interop/CoreDiagnostics/Public/FIRCoreDiagnosticsInterop.h"
 
 #import <nanopb/pb.h>
 #import <nanopb/pb_decode.h>

Firebase/Database/Api/FIRDatabase.m

@@ -16,13 +16,8 @@
 
 #import <Foundation/Foundation.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 "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
+#import "Interop/Auth/Public/FIRAuthInterop.h"
 
 #import "FIRDatabase.h"
 #import "FIRDatabaseComponent.h"

Firebase/Database/Api/FIRDatabaseComponent.m

@@ -20,13 +20,8 @@
 #import "FIRDatabase_Private.h"
 #import "FRepoManager.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>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
+#import "Interop/Auth/Public/FIRAuthInterop.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -157,6 +152,7 @@ typedef NSMutableDictionary<NSString *, FIRDatabase *> FIRDatabaseDictionary;
 
             FIRDatabaseConfig *config = [[FIRDatabaseConfig alloc]
                 initWithSessionIdentifier:sessionIdentifier
+                              googleAppID:app.options.googleAppID
                         authTokenProvider:authTokenProvider];
             database = [[FIRDatabase alloc] initWithApp:app
                                                repoInfo:parsedUrl.repoInfo

Firebase/Database/Api/FIRDatabaseConfig.h

@@ -26,6 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface FIRDatabaseConfig : NSObject
 
 - (id)initWithSessionIdentifier:(NSString *)identifier
+                    googleAppID:(NSString *)googleAppID
               authTokenProvider:(id<FAuthTokenProvider>)authTokenProvider;
 
 /**

Firebase/Database/Api/FIRDatabaseConfig.m

@@ -23,6 +23,7 @@
 @interface FIRDatabaseConfig (Private)
 
 @property(nonatomic, strong, readwrite) NSString *sessionIdentifier;
+@property(nonatomic, strong, readwrite) NSString *googleAppID;
 
 @end
 
@@ -35,11 +36,13 @@
 }
 
 - (id)initWithSessionIdentifier:(NSString *)identifier
+                    googleAppID:(NSString *)googleAppID
               authTokenProvider:(id<FAuthTokenProvider>)authTokenProvider {
     self = [super init];
     if (self != nil) {
         self->_sessionIdentifier = identifier;
         self->_callbackQueue = dispatch_get_main_queue();
+        self->_googleAppID = googleAppID;
         self->_persistenceCacheSizeBytes =
             10 * 1024 * 1024; // Default cache size is 10MB
         self->_authTokenProvider = authTokenProvider;

Firebase/Database/CHANGELOG.md

@@ -1,6 +1,8 @@
 # v6.2.2
 - [fixed] Addressed crash that prevented the SDK from opening when the versioning file was
   corrupted. (#5686)
+- [changed] Added internal HTTP header to the WebChannel connection.
+
 
 # v6.2.1
 - [fixed] Fixed documentation typos. (#5406, #5418)

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>
@@ -511,6 +511,7 @@ typedef enum {
     self->connectionState = ConnectionStateConnecting;
     self.realtime = [[FConnection alloc] initWith:self.repoInfo
                                  andDispatchQueue:self.dispatchQueue
+                                      googleAppID:self.config.googleAppID
                                     lastSessionID:self.lastSessionID];
     self.realtime.delegate = self;
     [self.realtime open];

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/FIRDatabaseConfig_Private.h

@@ -23,6 +23,7 @@
 
 @property(nonatomic, readonly) BOOL isFrozen;
 @property(nonatomic, strong, readonly) NSString *sessionIdentifier;
+@property(nonatomic, strong, readonly) NSString *googleAppID;
 @property(nonatomic, strong) id<FAuthTokenProvider> authTokenProvider;
 @property(nonatomic, strong) id<FStorageEngine> forceStorageEngine;
 

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 <FirebaseAuthInterop/FIRAuthInterop.h>
-#import <FirebaseCore/FIRAppInternal.h>
-#import <FirebaseCore/FIRComponentContainer.h>
-#import <FirebaseCore/FIRLogger.h>
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
+#import "Interop/Auth/Public/FIRAuthInterop.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.h

@@ -26,6 +26,7 @@
 
 - (id)initWith:(FRepoInfo *)aRepoInfo
     andDispatchQueue:(dispatch_queue_t)queue
+         googleAppID:(NSString *)googleAppID
        lastSessionID:(NSString *)lastSessionID;
 
 - (void)open;

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,
@@ -47,6 +47,7 @@ typedef enum {
 
 - (id)initWith:(FRepoInfo *)aRepoInfo
     andDispatchQueue:(dispatch_queue_t)queue
+         googleAppID:googleAppID
        lastSessionID:(NSString *)lastSessionID {
     self = [super init];
     if (self) {
@@ -54,6 +55,7 @@ typedef enum {
         self.repoInfo = aRepoInfo;
         self.conn = [[FWebSocketConnection alloc] initWith:self.repoInfo
                                                   andQueue:queue
+                                               googleAppID:googleAppID
                                              lastSessionID:lastSessionID];
         self.conn.delegate = self;
     }

Firebase/Database/Realtime/FWebSocketConnection.h

@@ -26,6 +26,7 @@
 
 - (id)initWith:(FRepoInfo *)repoInfo
          andQueue:(dispatch_queue_t)queue
+      googleAppID:(NSString *)googleAppID
     lastSessionID:(NSString *)lastSessionID;
 
 - (void)open;

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>
@@ -60,6 +60,7 @@
 
 - (id)initWith:(FRepoInfo *)repoInfo
          andQueue:(dispatch_queue_t)queue
+      googleAppID:(NSString *)googleAppID
     lastSessionID:(NSString *)lastSessionID {
     self = [super init];
     if (self) {
@@ -80,6 +81,7 @@
             initWithURL:[[NSURL alloc] initWithString:connectionUrl]];
         self.webSocket = [[FSRWebSocket alloc] initWithURLRequest:req
                                                             queue:queue
+                                                      googleAppID:googleAppID
                                                      andUserAgent:ua];
         [self.webSocket setDelegateDispatchQueue:queue];
         self.webSocket.delegate = self;

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/Database/third_party/SocketRocket/FSRWebSocket.h

@@ -43,9 +43,9 @@ extern NSString *const FSRWebSocketErrorDomain;
 @property (nonatomic, readonly, copy) NSString *protocol;
 
 // Protocols should be an array of strings that turn into Sec-WebSocket-Protocol
-- (id)initWithURLRequest:(NSURLRequest *)request protocols:(NSArray *)protocols queue:(dispatch_queue_t)queue andUserAgent:(NSString *)userAgent;
+- (id)initWithURLRequest:(NSURLRequest *)request protocols:(NSArray *)protocols queue:(dispatch_queue_t)queue googleAppID:(NSString*)googleAppID andUserAgent:(NSString *)userAgent;
 - (id)initWithURLRequest:(NSURLRequest *)request protocols:(NSArray *)protocols;
-- (id)initWithURLRequest:(NSURLRequest *)request queue:(dispatch_queue_t)queue andUserAgent:(NSString *)userAgent;
+- (id)initWithURLRequest:(NSURLRequest *)request queue:(dispatch_queue_t)queue googleAppID:(NSString*)googleAppID andUserAgent:(NSString *)userAgent;
 - (id)initWithURLRequest:(NSURLRequest *)request;
 
 // Some helper constructors

Firebase/Database/third_party/SocketRocket/FSRWebSocket.m

@@ -262,6 +262,7 @@ typedef void (^data_callback)(FSRWebSocket *webSocket,  NSData *data);
     BOOL _secure;
     NSURLRequest *_urlRequest;
     NSString *_userAgent;
+    NSString *_googleAppID;
 
     CFHTTPMessageRef _receivedHTTPHeaders;
 
@@ -293,7 +294,8 @@ static __strong NSData *CRLFCRLF;
     CRLFCRLF = [[NSData alloc] initWithBytes:"\r\n\r\n" length:4];
 }
 
-- (id)initWithURLRequest:(NSURLRequest *)request protocols:(NSArray *)protocols queue:(dispatch_queue_t)queue andUserAgent:(NSString *)userAgent;
+- (id)initWithURLRequest:(NSURLRequest *)request protocols:(NSArray *)protocols queue:(dispatch_queue_t)queue
+             googleAppID:(NSString *)googleAppID andUserAgent:(NSString *)userAgent;
 {
     self = [super init];
     if (self) {
@@ -302,6 +304,7 @@ static __strong NSData *CRLFCRLF;
         NSString *scheme = [_url scheme];
 
         _requestedProtocols = [protocols copy];
+        _googleAppID = googleAppID;
         _userAgent = userAgent;
 
         assert([scheme isEqualToString:@"ws"] || [scheme isEqualToString:@"http"] || [scheme isEqualToString:@"wss"] || [scheme isEqualToString:@"https"]);
@@ -325,12 +328,14 @@ static __strong NSData *CRLFCRLF;
 
 - (id)initWithURLRequest:(NSURLRequest *)request protocols:(NSArray *)protocols;
 {
-    return [self initWithURLRequest:request protocols:nil queue:nil andUserAgent:nil];
+    return [self initWithURLRequest:request protocols:nil queue:nil googleAppID:nil andUserAgent:nil];
 }
 
-- (id)initWithURLRequest:(NSURLRequest *)request queue:(dispatch_queue_t)queue andUserAgent:(NSString *)userAgent;
+- (id)initWithURLRequest:(NSURLRequest *)request queue:(dispatch_queue_t)queue
+             googleAppID:(NSString *)googleAppID andUserAgent:(NSString *)userAgent;
 {
-    return [self initWithURLRequest:request protocols:nil queue:queue andUserAgent:userAgent];
+    return [self initWithURLRequest:request protocols:nil queue:queue googleAppID:googleAppID
+                       andUserAgent:userAgent];
 }
 
 - (id)initWithURLRequest:(NSURLRequest *)request;
@@ -548,6 +553,10 @@ static __strong NSData *CRLFCRLF;
         CFHTTPMessageSetHeaderFieldValue(request, CFSTR("User-Agent"), (__bridge CFStringRef)_userAgent);
     }
 
+    if (_googleAppID) {
+        CFHTTPMessageSetHeaderFieldValue(request, CFSTR("X-Firebase-GMPID"), (__bridge CFStringRef)_googleAppID);
+    }
+
     CFHTTPMessageSetHeaderFieldValue(request, CFSTR("Sec-WebSocket-Key"), (__bridge CFStringRef)_secKey);
     CFHTTPMessageSetHeaderFieldValue(request, CFSTR("Sec-WebSocket-Version"), (__bridge CFStringRef)[NSString stringWithFormat:@"%u", (int)_webSocketVersion]);
 

Firebase/InstanceID/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 2020-06 -- 4.4.0
+- [changed] Standardize FirebaseCore import headers. (#5758)
+
 # 2020-04 -- 4.3.4
 - [changed] Internal cleanup and remove repetitive local notification. (#5339)
 

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

@@ -29,7 +29,11 @@ Firebase Cloud Messaging and Firebase Remote Config in your app.
   s.prefix_header_file = false
 
   base_dir = "FirebaseABTesting/Sources/"
-  s.source_files = base_dir + '**/*.[mh]'
+  s.source_files = [
+    base_dir + '**/*.[mh]',
+   'Interop/Analytics/Public/*.h',
+   'FirebaseCore/Sources/Private/*.h',
+  ]
   s.requires_arc = base_dir + '*.m'
   s.public_header_files = base_dir + 'Public/*.h', base_dir + 'Protos/developers/mobile/abt/proto/*.h'
   s.private_header_files = base_dir + 'Protos/developers/mobile/abt/proto/*.h'
@@ -40,8 +44,7 @@ Firebase Cloud Messaging and Firebase Remote Config in your app.
       'FIRABTesting_VERSION=' + String(s.version),
     '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.h

@@ -16,7 +16,7 @@
 
 #import "FirebaseABTesting/Sources/Protos/developers/mobile/abt/proto/ExperimentPayload.pbobjc.h"
 
-#import <FirebaseAnalyticsInterop/FIRAnalyticsInterop.h>
+#import "Interop/Analytics/Public/FIRAnalyticsInterop.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

FirebaseABTesting/Sources/ABTConditionalUserPropertyController.m

@@ -15,9 +15,9 @@
 #import "FirebaseABTesting/Sources/ABTConditionalUserPropertyController.h"
 
 #import <FirebaseABTesting/FIRLifecycleEvents.h>
-#import <FirebaseAnalyticsInterop/FIRAnalyticsInterop.h>
-#import <FirebaseCore/FIRLogger.h>
 #import "FirebaseABTesting/Sources/ABTConstants.h"
+#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
+#import "Interop/Analytics/Public/FIRAnalyticsInterop.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>
+#import "Interop/Analytics/Public/FIRAnalyticsInterop.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/ABTFakeFIRAConditionalUserPropertyController.h

@@ -15,7 +15,7 @@
 #import <Foundation/Foundation.h>
 
 #ifdef COCOAPODS
-#import <FirebaseAnalyticsInterop/FIRAnalyticsInterop.h>
+#import "Interop/Analytics/Public/FIRAnalyticsInterop.h"
 #else
 #import "third_party/firebase/ios/Releases/FirebaseInterop/Analytics/Public/FIRAnalyticsInterop.h"
 #endif

FirebaseABTesting/Tests/Unit/FIRExperimentControllerTest.m

@@ -16,14 +16,13 @@
 
 #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"
+#import "Interop/Analytics/Public/FIRAnalyticsInterop.h"
 
 extern ABTExperimentPayload *ABTDeserializeExperimentPayload(NSData *payload);
 
@@ -536,7 +535,7 @@ extern NSArray *ABTExperimentsToClearFromPayloads(
 
   NSArray *experiments = [_mockCUPController experimentsWithOrigin:gABTTestOrigin];
 
-  FIRAConditionalUserProperty *userPropertyForExperiment = [experiments firstObject];
+  NSDictionary *userPropertyForExperiment = [experiments firstObject];
 
   // Verify that the triggerEventName is cleared, making this experiment active.
   XCTAssertNil([userPropertyForExperiment valueForKeyPath:@"triggerEventName"]);

FirebaseAnalyticsInterop.podspec

@@ -1,31 +0,0 @@
-Pod::Spec.new do |s|
-  s.name             = 'FirebaseAnalyticsInterop'
-  s.version          = '1.5.0'
-  s.summary          = 'Interfaces that allow other Firebase SDKs to use Analytics functionality.'
-
-  s.description      = <<-DESC
-  Not for public use.
-
-  A set of protocols that other Firebase SDKs can use to interoperate with FirebaseAnalytics in a
-  safe and reliable manner.
-                       DESC
-
-  s.homepage         = 'https://firebase.google.com'
-  s.license          = { :type => 'Apache', :file => 'LICENSE' }
-  s.authors          = 'Google, Inc.'
-
-  # NOTE that these should not be used externally, this is for Firebase pods to depend on each
-  # other.
-  s.source           = {
-    :git => 'https://github.com/firebase/firebase-ios-sdk.git',
-    :tag => 'AnalyticsInterop-' + s.version.to_s
-  }
-  s.social_media_url = 'https://twitter.com/Firebase'
-  s.ios.deployment_target = '8.0'
-  s.osx.deployment_target = '10.11'
-  s.tvos.deployment_target = '10.0'
-  s.watchos.deployment_target = '6.0'
-
-  s.source_files = 'Interop/Analytics/**/*.h'
-  s.public_header_files = 'Interop/Analytics/Public/*.h'
-end

FirebaseAppDistribution.podspec

@@ -22,17 +22,21 @@ iOS SDK for App Distribution for Firebase.
   s.prefix_header_file = false
 
   base_dir = "FirebaseAppDistribution/Sources/"
-  s.source_files = base_dir + '**/*.{c,h,m,mm}'
+  s.source_files = [
+    base_dir + '**/*.{c,h,m,mm}',
+    'FirebaseCore/Sources/Private/*.h',
+  ]
   s.public_header_files = base_dir + 'Public/*.h'
   s.private_header_files = base_dir + '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

@@ -26,7 +26,11 @@ supports email and password accounts, as well as several 3rd party authenticatio
   s.prefix_header_file = false
 
   source = 'FirebaseAuth/Sources/'
-  s.source_files = source + '**/*.[mh]'
+  s.source_files = [
+    source + '**/*.[mh]',
+    'FirebaseCore/Sources/Private/*.h',
+    'Interop/Auth/Public/*.h',
+  ]
   s.public_header_files = source + 'Public/*.h'
   s.preserve_paths = [
     'FirebaseAuth/README.md',
@@ -41,8 +45,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/Auth/FIRAuth_Internal.h

@@ -15,8 +15,8 @@
  */
 
 #import <FirebaseAuth/FIRAuth.h>
-#import <FirebaseAuthInterop/FIRAuthInterop.h>
 #import <Foundation/Foundation.h>
+#import "Interop/Auth/Public/FIRAuthInterop.h"
 
 @class FIRAuthRequestConfiguration;
 @class FIRAuthURLPresenter;

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"