Merging the 6.15.0 release into master (#4682)

samedson · ryanwilson · paulb777 · commit 2328d1f36598 · 2020-01-14T16:21:34.000-08:00
* Update versions for Release 6.15.0 * Update podspec dependencies for M62 (#4640) * Cherry-picks for M62. (#4650) * Include GoogleUtilities in the release manifest. * Crashlytics fix header import ordering issue (#4649) Co-authored-by: Sam Edson <samedson@google.com> Co-authored-by: Ryan Wilson <wilsonryan@google.com>
diff --git a/Firebase.podspec b/Firebase.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'Firebase'
-  s.version          = '6.14.0'
+  s.version          = '6.15.0'
   s.summary          = 'Firebase for iOS (plus community support for macOS and tvOS)'
 
   s.description      = <<-DESC
@@ -31,12 +31,12 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
   s.default_subspec = 'Core'
 
   s.subspec 'Core' do |ss|
-    ss.ios.dependency 'FirebaseAnalytics', '6.1.7'
+    ss.ios.dependency 'FirebaseAnalytics', '6.2.1'
     ss.dependency 'Firebase/CoreOnly'
   end
 
   s.subspec 'CoreOnly' do |ss|
-    ss.dependency 'FirebaseCore', '6.5.0'
+    ss.dependency 'FirebaseCore', '6.6.0'
     ss.source_files = 'CoreOnly/Sources/Firebase.h'
     ss.preserve_paths = 'CoreOnly/Sources/module.modulemap'
     if ENV['FIREBASE_POD_REPO_FOR_DEV_POD'] then
@@ -66,7 +66,7 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
 
   s.subspec 'Auth' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseAuth', '~> 6.4.1'
+    ss.dependency 'FirebaseAuth', '~> 6.4.2'
   end
 
   s.subspec 'Crashlytics' do |ss|
@@ -76,7 +76,7 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
 
   s.subspec 'Database' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseDatabase', '~> 6.1.3'
+    ss.dependency 'FirebaseDatabase', '~> 6.1.4'
   end
 
   s.subspec 'DynamicLinks' do |ss|
@@ -86,7 +86,7 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
 
   s.subspec 'Firestore' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseFirestore', '~> 1.8.2'
+    ss.dependency 'FirebaseFirestore', '~> 1.9.0'
   end
 
   s.subspec 'Functions' do |ss|
@@ -96,7 +96,7 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
 
   s.subspec 'InAppMessaging' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.ios.dependency 'FirebaseInAppMessaging', '~> 0.15.6'
+    ss.ios.dependency 'FirebaseInAppMessaging', '~> 0.16.0'
   end
 
   s.subspec 'InAppMessagingDisplay' do |ss|
@@ -106,12 +106,12 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
 
   s.subspec 'Messaging' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseMessaging', '~> 4.1.10'
+    ss.dependency 'FirebaseMessaging', '~> 4.2.0'
   end
 
   s.subspec 'Performance' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.ios.dependency 'FirebasePerformance', '~> 3.1.8'
+    ss.ios.dependency 'FirebasePerformance', '~> 3.1.9'
   end
 
   s.subspec 'RemoteConfig' do |ss|
@@ -121,7 +121,7 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
 
   s.subspec 'Storage' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseStorage', '~> 3.4.3'
+    ss.dependency 'FirebaseStorage', '~> 3.5.0'
   end
 
   s.subspec 'MLCommon' do |ss|
diff --git a/FirebaseAnalyticsInterop.podspec b/FirebaseAnalyticsInterop.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseAnalyticsInterop'
-  s.version          = '1.4.0'
+  s.version          = '1.5.0'
   s.summary          = 'Interfaces that allow other Firebase SDKs to use Analytics functionality.'
 
   s.description      = <<-DESC
diff --git a/FirebaseAuth.podspec b/FirebaseAuth.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseAuth'
-  s.version          = '6.4.1'
+  s.version          = '6.4.2'
   s.summary          = 'The official iOS client for Firebase Authentication (plus community support for macOS and tvOS)'
 
   s.description      = <<-DESC
@@ -41,9 +41,9 @@ 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.2'
-  s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 6.2'
-  s.dependency 'GoogleUtilities/Environment', '~> 6.2'
+  s.dependency 'FirebaseCore', '~> 6.6'
+  s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 6.5'
+  s.dependency 'GoogleUtilities/Environment', '~> 6.5'
   s.dependency 'GTMSessionFetcher/Core', '~> 1.1'
 
   s.test_spec 'unit' do |unit_tests|
diff --git a/FirebaseCore.podspec b/FirebaseCore.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseCore'
-  s.version          = '6.5.0'
+  s.version          = '6.6.0'
   s.summary          = 'Firebase Core for iOS (plus community support for macOS and tvOS)'
 
   s.description      = <<-DESC
@@ -32,15 +32,15 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration
   s.ios.framework = 'UIKit'
   s.osx.framework = 'AppKit'
   s.tvos.framework = 'UIKit'
-  s.dependency 'GoogleUtilities/Environment', '~> 6.4'
-  s.dependency 'GoogleUtilities/Logger', '~> 6.4'
-  s.dependency 'FirebaseCoreDiagnosticsInterop', '~> 1.0'
-  s.dependency 'FirebaseCoreDiagnostics', '~> 1.0'
+  s.dependency 'GoogleUtilities/Environment', '~> 6.5'
+  s.dependency 'GoogleUtilities/Logger', '~> 6.5'
+  s.dependency 'FirebaseCoreDiagnosticsInterop', '~> 1.2'
+  s.dependency 'FirebaseCoreDiagnostics', '~> 1.2'
 
   s.pod_target_xcconfig = {
     'GCC_C_LANGUAGE_STANDARD' => 'c99',
     'GCC_PREPROCESSOR_DEFINITIONS' =>
-      'FIRCore_VERSION=' + s.version.to_s + ' Firebase_VERSION=6.14.0',
+      'FIRCore_VERSION=' + s.version.to_s + ' Firebase_VERSION=6.15.0',
     'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"',
     'OTHER_CFLAGS' => '-fno-autolink'
   }
diff --git a/FirebaseCoreDiagnostics.podspec b/FirebaseCoreDiagnostics.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseCoreDiagnostics'
-  s.version          = '1.1.2'
+  s.version          = '1.2.0'
   s.summary          = 'Firebase Core Diagnostics'
 
   s.description      = <<-DESC
@@ -45,10 +45,10 @@ non-Cocoapod integration. This library also respects the Firebase global data co
   s.source_files = 'Firebase/CoreDiagnostics/FIRCDLibrary/**/*.[cmh]'
   s.framework = 'Foundation'
 
-  s.dependency 'FirebaseCoreDiagnosticsInterop', '~> 1.0'
-  s.dependency 'GoogleDataTransportCCTSupport', '~> 1.0'
-  s.dependency 'GoogleUtilities/Environment', '~> 6.2'
-  s.dependency 'GoogleUtilities/Logger', '~> 6.2'
+  s.dependency 'FirebaseCoreDiagnosticsInterop', '~> 1.2'
+  s.dependency 'GoogleDataTransportCCTSupport', '~> 1.3'
+  s.dependency 'GoogleUtilities/Environment', '~> 6.5'
+  s.dependency 'GoogleUtilities/Logger', '~> 6.5'
   s.dependency 'nanopb', '~> 0.3.901'
 
   s.test_spec 'unit' do |unit_tests|
diff --git a/FirebaseCoreDiagnosticsInterop.podspec b/FirebaseCoreDiagnosticsInterop.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseCoreDiagnosticsInterop'
-  s.version          = '1.1.0'
+  s.version          = '1.2.0'
   s.summary          = 'Interfaces that allow other Firebase SDKs to use CoreDiagnostics functionality.'
 
   s.description      = <<-DESC
diff --git a/FirebaseCrashlytics.podspec b/FirebaseCrashlytics.podspec
@@ -40,8 +40,8 @@ Pod::Spec.new do |s|
     cp -f ./Crashlytics/upload-symbols ./upload-symbols
   PREPARE_COMMAND_END
 
-  s.dependency 'FirebaseCore', '~> 6.3', '>= 6.3.2'
-  s.dependency 'FirebaseInstanceID', '~> 4.1'
+  s.dependency 'FirebaseCore', '~> 6.6'
+  s.dependency 'FirebaseInstanceID', '~> 4.3'
   s.dependency 'FirebaseAnalyticsInterop', '~> 1.2'
   s.dependency 'PromisesObjC', '~> 1.2'
 
diff --git a/FirebaseDatabase.podspec b/FirebaseDatabase.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseDatabase'
-  s.version          = '6.1.3'
+  s.version          = '6.1.4'
   s.summary          = 'Firebase Open Source Libraries for iOS (plus community support for macOS and tvOS)'
 
   s.description      = <<-DESC
diff --git a/FirebaseFirestore.podspec b/FirebaseFirestore.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseFirestore'
-  s.version          = '1.8.3'
+  s.version          = '1.9.0'
   s.summary          = 'Google Cloud Firestore for iOS'
 
   s.description      = <<-DESC
diff --git a/FirebaseInAppMessaging.podspec b/FirebaseInAppMessaging.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseInAppMessaging'
-  s.version          = '0.15.6'
+  s.version          = '0.16.0'
   s.summary          = 'Firebase In-App Messaging for iOS'
 
   s.description      = <<-DESC
diff --git a/FirebaseInstallations.podspec b/FirebaseInstallations.podspec
@@ -30,9 +30,9 @@ Pod::Spec.new do |s|
   s.public_header_files = base_dir + 'Library/Public/*.h'
 
   s.framework = 'Security'
-  s.dependency 'FirebaseCore', '~> 6.5'
+  s.dependency 'FirebaseCore', '~> 6.6'
   s.dependency 'PromisesObjC', '~> 1.2'
-  s.dependency 'GoogleUtilities/UserDefaults', '~> 6.4'
+  s.dependency 'GoogleUtilities/UserDefaults', '~> 6.5'
 
   preprocessor_definitions = 'FIRInstallations_LIB_VERSION=' + String(s.version)
   if ENV['FIS_ALLOWS_INCOMPATIBLE_IID_VERSION'] && ENV['FIS_ALLOWS_INCOMPATIBLE_IID_VERSION'] == '1' then
diff --git a/FirebaseInstanceID.podspec b/FirebaseInstanceID.podspec
@@ -38,10 +38,10 @@ services.
       'FIRInstanceID_LIB_VERSION=' + String(s.version)
   }
   s.framework = 'Security'
-  s.dependency 'FirebaseCore', '~> 6.5'
+  s.dependency 'FirebaseCore', '~> 6.6'
   s.dependency 'FirebaseInstallations', '~> 1.0'
-  s.dependency 'GoogleUtilities/UserDefaults', '~> 6.4'
-  s.dependency 'GoogleUtilities/Environment', '~> 6.4'
+  s.dependency 'GoogleUtilities/UserDefaults', '~> 6.5'
+  s.dependency 'GoogleUtilities/Environment', '~> 6.5'
 
   s.test_spec 'unit' do |unit_tests|
     unit_tests.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}
diff --git a/FirebaseMessaging.podspec b/FirebaseMessaging.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseMessaging'
-  s.version          = '4.1.10'
+  s.version          = '4.2.0'
   s.summary          = 'Firebase Messaging for iOS'
 
   s.description      = <<-DESC
@@ -45,13 +45,13 @@ device, and it is completely free.
   s.tvos.framework = 'SystemConfiguration'
   s.osx.framework = 'SystemConfiguration'
   s.weak_framework = 'UserNotifications'
-  s.dependency 'FirebaseAnalyticsInterop', '~> 1.3'
-  s.dependency 'FirebaseCore', '~> 6.2'
-  s.dependency 'FirebaseInstanceID', '~> 4.1'
-  s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 6.2'
-  s.dependency 'GoogleUtilities/Reachability', '~> 6.2'
-  s.dependency 'GoogleUtilities/Environment', '~> 6.2'
-  s.dependency 'GoogleUtilities/UserDefaults', '~> 6.2'
+  s.dependency 'FirebaseAnalyticsInterop', '~> 1.5'
+  s.dependency 'FirebaseCore', '~> 6.6'
+  s.dependency 'FirebaseInstanceID', '~> 4.3'
+  s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 6.5'
+  s.dependency 'GoogleUtilities/Reachability', '~> 6.5'
+  s.dependency 'GoogleUtilities/Environment', '~> 6.5'
+  s.dependency 'GoogleUtilities/UserDefaults', '~> 6.5'
   s.dependency 'Protobuf', '~> 3.9', '>= 3.9.2'
 
   s.test_spec 'unit' do |unit_tests|
diff --git a/FirebaseStorage.podspec b/FirebaseStorage.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseStorage'
-  s.version          = '3.4.3'
+  s.version          = '3.5.0'
   s.summary          = 'Firebase Storage for iOS (plus community support for macOS and tvOS)'
 
   s.description      = <<-DESC
diff --git a/Firestore/Example/Podfile b/Firestore/Example/Podfile
@@ -118,7 +118,7 @@ if is_platform(:ios)
     # 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 podspecs.
-    pod 'Firebase/CoreOnly', '6.14.0'
+    pod 'Firebase/CoreOnly', '6.15.0'
 
     configure_local_pods()
 
diff --git a/GoogleDataTransport.podspec b/GoogleDataTransport.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'GoogleDataTransport'
-  s.version          = '3.2.0'
+  s.version          = '3.3.0'
   s.summary          = 'Google iOS SDK data transport.'
 
   s.description      = <<-DESC
diff --git a/GoogleDataTransportCCTSupport.podspec b/GoogleDataTransportCCTSupport.podspec
@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'GoogleDataTransportCCTSupport'
-  s.version          = '1.2.3'
+  s.version          = '1.3.0'
   s.summary          = 'Support library for the GoogleDataTransport CCT backend target.'
 
 
@@ -33,7 +33,7 @@ Support library to provide event prioritization and uploading for the GoogleData
 
   s.libraries = ['z']
 
-  s.dependency 'GoogleDataTransport', '~> 3.2'
+  s.dependency 'GoogleDataTransport', '~> 3.3'
   s.dependency 'nanopb', '~> 0.3.901'
 
   header_search_paths = {
diff --git a/GoogleUtilities.podspec b/GoogleUtilities.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'GoogleUtilities'
-  s.version          = '6.4.0'
+  s.version          = '6.5.0'
   s.summary          = 'Google Utilities for iOS (plus community support for macOS and tvOS)'
 
   s.description      = <<-DESC
diff --git a/Releases/Manifests/6.15.0.json b/Releases/Manifests/6.15.0.json
@@ -0,0 +1,19 @@
+{
+  "Firebase":"6.15.0",
+  "FirebaseAnalyticsInterop":"1.5.0",
+  "FirebaseAuth":"6.4.2",
+  "FirebaseCore":"6.6.0",
+  "FirebaseCoreDiagnostics":"1.2.0",
+  "FirebaseCoreDiagnosticsInterop":"1.2.0",
+  "FirebaseCrashlytics":"4.0.0-beta.1",
+  "FirebaseDatabase":"6.1.4",
+  "FirebaseFirestore":"1.9.0",
+  "FirebaseInAppMessaging":"0.16.0",
+  "FirebaseInstallations":"1.0.0",
+  "FirebaseInstanceID":"4.3.0",
+  "FirebaseMessaging":"4.2.0",
+  "FirebaseStorage":"3.5.0",
+  "GoogleDataTransport":"3.3.0",
+  "GoogleDataTransportCCTSupport":"1.3.0",
+  "GoogleUtilities":"6.5.0"
+}
diff --git a/SymbolCollisionTest/Podfile b/SymbolCollisionTest/Podfile
@@ -8,7 +8,7 @@ target 'SymbolCollisionTest' do
   # use_frameworks!
 
   # Firebase Pods
-    pod 'Firebase', '6.14.0'
+    pod 'Firebase', '6.15.0'
     pod 'FirebaseAnalytics'
     pod 'FirebaseAuth'
     pod 'FirebaseCore'
