Resolve merge conflicts from release-6.0.0 branch (#2958)

* Update versions for Release 6.0.0

* Update FirebaseSDKs.textproto with new fields. (#2818) (#2834)

* Update FirebaseSDKs.textproto with new fields.

* Update message about strip_32bits flag.

* GULAppDelegateSwizzler - proxy APNS methods separately (#2835) (#2858)

* Cherry-picks for M47 RC5 (#2882)

* fix race condition checkin is deleted before writing during app start (#2860)

* GoogleUtilities min ios version from 6 to 8 (#2876)

* Put secret and oauth credentials into the private headers for now. (#2916) (#2919)

* Add missing Messaging weak_framework dep (#2921) (#2930)

Example/Podfile

@@ -19,7 +19,7 @@ target 'Core_Example_iOS' do
   # The next line is the forcing function for the Firebase pod. The Firebase
   # version's subspecs should depend on the component versions in their
   # corresponding podspec's.
-  pod 'Firebase/CoreOnly', '6.0.0-pre'
+  pod 'Firebase/CoreOnly', '6.0.0'
 
   target 'Core_Tests_iOS' do
     inherit! :search_paths

FirebaseAuth.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseAuth'
-  s.version          = '5.4.2'
+  s.version          = '6.0.0'
   s.summary          = 'The official iOS client for Firebase Authentication (plus community support for macOS and tvOS)'
 
   s.description      = <<-DESC

FirebaseCore.podspec

@@ -33,7 +33,7 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration
   s.pod_target_xcconfig = {
     'GCC_C_LANGUAGE_STANDARD' => 'c99',
     'GCC_PREPROCESSOR_DEFINITIONS' =>
-      'FIRCore_VERSION=' + s.version.to_s + ' Firebase_VERSION=5.20.0',
+      'FIRCore_VERSION=' + s.version.to_s + ' Firebase_VERSION=6.0.0',
     'OTHER_CFLAGS' => '-fno-autolink'
   }
   s.test_spec 'unit' do |unit_tests|

FirebaseDatabase.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseDatabase'
-  s.version          = '5.1.1'
+  s.version          = '6.0.0'
   s.summary          = 'Firebase Open Source Libraries for iOS (plus community support for macOS and tvOS)'
 
   s.description      = <<-DESC

FirebaseDynamicLinks.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseDynamicLinks'
-  s.version          = '3.4.3'
+  s.version          = '4.0.0'
   s.summary          = 'Firebase DynamicLinks for iOS'
 
   s.description      = <<-DESC

FirebaseFirestore.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseFirestore'
-  s.version          = '1.2.1'
+  s.version          = '1.3.0'
   s.summary          = 'Google Cloud Firestore for iOS'
 
   s.description      = <<-DESC

FirebaseFunctions.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseFunctions'
-  s.version          = '2.4.0'
+  s.version          = '2.5.0'
   s.summary          = 'Cloud Functions for Firebase iOS SDK.'
 
   s.description      = <<-DESC

FirebaseInAppMessagingDisplay.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseInAppMessagingDisplay'
-  s.version          = '0.13.1'
+  s.version          = '0.14.0'
   s.summary          = 'Firebase In-App Messaging UI for iOS'
 
   s.description      = <<-DESC

FirebaseMessaging.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseMessaging'
-  s.version          = '3.5.0'
+  s.version          = '4.0.0'
   s.summary          = 'Firebase Messaging for iOS'
 
   s.description      = <<-DESC

FirebaseStorage.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseStorage'
-  s.version          = '3.1.1'
+  s.version          = '3.2.0'
   s.summary          = 'Firebase Storage for iOS (plus community support for macOS and tvOS)'
 
   s.description      = <<-DESC

Firestore/Example/Podfile

@@ -43,7 +43,7 @@ target 'Firestore_Example_iOS' do
   # The next line is the forcing function for the Firebase pod. The Firebase
   # version's subspecs should depend on the component versions in their
   # corresponding podspec's.
-  pod 'Firebase/CoreOnly', '6.0.0-pre'
+  pod 'Firebase/CoreOnly', '6.0.0'
 
   pod 'FirebaseAuth', :path => '../../'
   pod 'FirebaseAuthInterop', :path => '../../'

Releases/Manifests/6.0.0.json

@@ -0,0 +1,13 @@
+{
+  "FirebaseAuth":"6.0.0",
+  "FirebaseCore":"6.0.0",
+  "FirebaseDatabase":"6.0.0",
+  "FirebaseDynamicLinks":"4.0.0",
+  "FirebaseFirestore":"1.3.0",
+  "FirebaseFunctions":"2.5.0",
+  "FirebaseInAppMessaging":"0.14.0",
+  "FirebaseInAppMessagingDisplay":"0.14.0",
+  "FirebaseInstanceID":"4.0.0",
+  "FirebaseMessaging":"4.0.0",
+  "FirebaseStorage":"3.2.0"
+}

SymbolCollisionTest/Podfile

@@ -6,7 +6,7 @@ target 'SymbolCollisionTest' do
   # use_frameworks!
 
   # Firebase Pods
-    pod 'Firebase', '5.20.1'
+    pod 'Firebase', '6.0.0'
     pod 'FirebaseAnalytics'
     pod 'FirebaseAuth'
     pod 'FirebaseCore'