Merge pull request #1567 from firebase/wilhuff/merge-5.4.1

Merge Firebase 5.4.1 to master

Author: paulb777

Example/Podfile

@@ -14,7 +14,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', '5.4.0'
+  pod 'Firebase/CoreOnly', '5.4.1'
 
   target 'Core_Tests_iOS' do
     inherit! :search_paths

Firebase/Core/FIROptions.m

@@ -43,7 +43,7 @@
 NSString *const kFIRLibraryVersionID =
     @"5"     // Major version (one or more digits)
     @"00"    // Minor version (exactly 2 digits)
-    @"05"    // Build number (exactly 2 digits)
+    @"06"    // Build number (exactly 2 digits)
     @"000";  // Fixed "000"
 // Plist file name.
 NSString *const kServiceInfoFileName = @"GoogleService-Info";

FirebaseCore.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseCore'
-  s.version          = '5.0.5'
+  s.version          = '5.0.6'
   s.summary          = 'Firebase Core for iOS (plus community support for macOS and tvOS)'
 
   s.description      = <<-DESC
@@ -36,6 +36,6 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration
   s.pod_target_xcconfig = {
     'OTHER_CFLAGS' => '-fno-autolink',
     'GCC_PREPROCESSOR_DEFINITIONS' =>
-      'FIRCore_VERSION=' + s.version.to_s + ' Firebase_VERSION=5.4.0'
+      'FIRCore_VERSION=' + s.version.to_s + ' Firebase_VERSION=5.4.1'
   }
 end

FirebaseFirestore.podspec

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

Firestore/CHANGELOG.md

@@ -11,6 +11,12 @@
   (thousands of documents) collection would take a long time in offline mode
   (#1477).
 
+# v0.12.6
+- [fixed] Fixed an issue where queries returned fewer results than they should,
+  caused by documents that were cached as deleted when they should not have
+  been (#1548). Some cache data is cleared and so clients may use extra
+  bandwidth the first time they launch with this version of the SDK.
+
 # v0.12.5
 - [changed] Internal improvements.
 

Firestore/Example/Podfile

@@ -10,7 +10,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', '5.4.0'
+  pod 'Firebase/CoreOnly', '5.4.1'
 
   pod 'FirebaseAuth', :path => '../../'
   pod 'FirebaseAuthInterop', :path => '../../'

Releases/update-versions.py

@@ -55,6 +55,12 @@ def SetupArguments():
       action='store_true',
       help='Update the tags only')
 
+  parser.add_argument(
+      '--base_branch',
+      dest='base_branch',
+      default='master',
+      help='Base branch for new release')
+
   args = parser.parse_args()
   return args
 
@@ -88,13 +94,13 @@ def GetVersionData(git_root, version):
     sys.exit('Missing version file:{}'.format(json_file))
 
 
-def CreateReleaseBranch(release_branch):
+def CreateReleaseBranch(release_branch, base_branch):
   """Create and push the release branch.
 
   Args:
     release_branch: the name of the git release branch.
   """
-  os.system('git checkout master')
+  os.system('git checkout {}'.format(base_branch))
   os.system('git pull')
   os.system('git checkout -b {}'.format(release_branch))
   LogOrRun('git push origin {}'.format(release_branch))
@@ -233,7 +239,7 @@ def UpdateVersions():
     return
 
   release_branch = 'release-{}'.format(args.version)
-  CreateReleaseBranch(release_branch)
+  CreateReleaseBranch(release_branch, args.base_branch)
   UpdateFIROptions(git_root, version_data)
   UpdatePodSpecs(git_root, version_data, args.version)
   UpdatePodfiles(git_root, args.version)