Merge 6.9.0 (#3907)

* Update versions for Release 6.9.0 * Fix unbalanced background task creation in GDTCCTUploader (#3838) (#3839) * Add Manifest * dependency version update * Cherry picks for 6.9.0 (#3871) * fixed "expiclitlySet" typo. (#3853) * Mark unused variables (#3854) * Mute FCM deprecated warnings with Xcode 11 and min iOS >= 10 (#3857) * Add a third slash to make sure generated docs include these comments.b/13812238 (#3846)
firebase · Sep 23, 2019 · fb353c2 · fb353c2
1 parent b1eb602
commit fb353c2
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 12 deletions.
diff --git a/Example/Podfile b/Example/Podfile
@@ -21,7 +21,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 the
   # corresponding podspec's in this repo.
-  pod 'Firebase/CoreOnly', '6.8.1'
+  pod 'Firebase/CoreOnly', '6.9.0'
 
   target 'Core_Tests_iOS' do
     inherit! :search_paths

diff --git a/Firebase/Core/CHANGELOG.md b/Firebase/Core/CHANGELOG.md
@@ -1,5 +1,6 @@
 # v6.3.0 -- M56
 - [changed] Transitive GoogleDataTransport dependency incremented to v2.0.0. (#3729)
+- [fixed] Fixed "expiclitlySet" typo. (#3853)
 
 # v6.2.0 -- M53
 - [added] Added AppKit dependency on macOS and UIKit dependency on iOS and tvOS. (#3459)

diff --git a/Firebase/Messaging/CHANGELOG.md b/Firebase/Messaging/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2019-09 -- v4.1.5
+- [fixed] Mute FCM deprecated warnings with Xcode 11 and min iOS >= 10. (#3857)
+
 # 2019-09-03 -- v4.1.4
 - [fixed] Fixed notification open event is not logged when scheduling a local timezone message. (#3670, #3638)
 - [fixed] Fixed FirebaseApp.delete() results in unusable Messaging singleton. (#3411)

diff --git a/FirebaseCore.podspec b/FirebaseCore.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseCore'
-  s.version          = '6.2.3'
+  s.version          = '6.3.0'
   s.summary          = 'Firebase Core for iOS (plus community support for macOS and tvOS)'
 
   s.description      = <<-DESC
@@ -39,7 +39,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=6.8.1',
+      'FIRCore_VERSION=' + s.version.to_s + ' Firebase_VERSION=6.9.0',
     'OTHER_CFLAGS' => '-fno-autolink'
   }
   s.test_spec 'unit' do |unit_tests|

diff --git a/FirebaseCoreDiagnostics.podspec b/FirebaseCoreDiagnostics.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseCoreDiagnostics'
-  s.version          = '1.0.1'
+  s.version          = '1.1.0'
   s.summary          = 'Firebase Core Diagnostics'
 
   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.5.0'
+  s.version          = '1.5.1'
   s.summary          = 'Google Cloud Firestore for iOS'
 
   s.description      = <<-DESC

diff --git a/FirebaseMessaging.podspec b/FirebaseMessaging.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseMessaging'
-  s.version          = '4.1.4'
+  s.version          = '4.1.5'
   s.summary          = 'Firebase Messaging for iOS'
 
   s.description      = <<-DESC

diff --git a/FirebaseRemoteConfig.podspec b/FirebaseRemoteConfig.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseRemoteConfig'
-  s.version          = '4.4.0'
+  s.version          = '4.4.1'
   s.summary          = 'Firebase RemoteConfig for iOS'
 
   s.description      = <<-DESC

diff --git a/FirebaseRemoteConfig/CHANGELOG.md b/FirebaseRemoteConfig/CHANGELOG.md
@@ -1,3 +1,7 @@
+Version 4.4.1
+==================================
+- Fix docs issue. (#3846)
+
 Version 4.3.0
 ==================================
 - Open source. (TBD)

diff --git a/Firestore/Example/Podfile b/Firestore/Example/Podfile
@@ -96,7 +96,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 podspecs.
-  pod 'Firebase/CoreOnly', '6.8.1'
+  pod 'Firebase/CoreOnly', '6.9.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          = '1.2.0'
+  s.version          = '2.0.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.0.4'
+  s.version          = '1.1.0'
   s.summary          = 'Support library for the GoogleDataTransport CCT backend target.'
 
 
@@ -32,7 +32,7 @@ Support library to provide event prioritization and uploading for the GoogleData
 
   s.libraries = ['z']
 
-  s.dependency 'GoogleDataTransport', '~> 1.2'
+  s.dependency 'GoogleDataTransport', '~> 2.0'
   s.dependency 'nanopb'
 
   header_search_paths = {

diff --git a/GoogleUtilities/CHANGELOG.md b/GoogleUtilities/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 6.3.0
+- GULSecureCoding introduced. (#3707)
+- Mark unused variables. (#3854)
+
 # 6.2.5
 - Remove test-only method and update tests to include Catalyst. (#3544)
 

diff --git a/Releases/Manifests/6.9.0.json b/Releases/Manifests/6.9.0.json
@@ -0,0 +1,9 @@
+{
+  "FirebaseCore":"6.3.0",
+  "FirebaseCoreDiagnostics":"1.1.0",
+  "FirebaseFirestore":"1.5.1",
+  "FirebaseMessaging":"4.1.5",
+  "FirebaseRemoteConfig":"4.4.1",
+  "GoogleDataTransport":"2.0.0",
+  "GoogleDataTransportCCTSupport":"1.1.0"
+}
diff --git a/SymbolCollisionTest/Podfile b/SymbolCollisionTest/Podfile
@@ -8,7 +8,7 @@ target 'SymbolCollisionTest' do
   # use_frameworks!
 
   # Firebase Pods
-    pod 'Firebase', '6.8.1'
+    pod 'Firebase', '6.9.0'
     pod 'FirebaseAnalytics'
     pod 'FirebaseAuth'
     pod 'FirebaseCore'