Skip to content

Commit acba81f

Browse files
committed
Update versions for Release 5.4.1
1 parent ac36545 commit acba81f

File tree

6 files changed

+15
-9
lines changed

6 files changed

+15
-9
lines changed

Example/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ target 'Core_Example_iOS' do
1212
# The next line is the forcing function for the Firebase pod. The Firebase
1313
# version's subspecs should depend on the component versions in their
1414
# corresponding podspec's.
15-
pod 'Firebase/Core', '5.4.0'
15+
pod 'Firebase/Core', '5.4.1'
1616

1717
target 'Core_Tests_iOS' do
1818
inherit! :search_paths

Firebase/Core/FIROptions.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
NSString *const kFIRLibraryVersionID =
4444
@"5" // Major version (one or more digits)
4545
@"00" // Minor version (exactly 2 digits)
46-
@"05" // Build number (exactly 2 digits)
46+
@"06" // Build number (exactly 2 digits)
4747
@"000"; // Fixed "000"
4848
// Plist file name.
4949
NSString *const kServiceInfoFileName = @"GoogleService-Info";

FirebaseCore.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'FirebaseCore'
3-
s.version = '5.0.5'
3+
s.version = '5.0.6'
44
s.summary = 'Firebase Core for iOS (plus community support for macOS and tvOS)'
55

66
s.description = <<-DESC
@@ -35,6 +35,6 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration
3535
s.pod_target_xcconfig = {
3636
'OTHER_CFLAGS' => '-fno-autolink',
3737
'GCC_PREPROCESSOR_DEFINITIONS' =>
38-
'FIRCore_VERSION=' + s.version.to_s + ' Firebase_VERSION=5.4.0'
38+
'FIRCore_VERSION=' + s.version.to_s + ' Firebase_VERSION=5.4.1'
3939
}
4040
end

FirebaseFirestore.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'FirebaseFirestore'
3-
s.version = '0.12.5'
3+
s.version = '0.12.6'
44
s.summary = 'Google Cloud Firestore for iOS'
55

66
s.description = <<-DESC

Firestore/Example/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ target 'Firestore_Example_iOS' do
1010
# The next line is the forcing function for the Firebase pod. The Firebase
1111
# version's subspecs should depend on the component versions in their
1212
# corresponding podspec's.
13-
pod 'Firebase/Core', '5.4.0'
13+
pod 'Firebase/Core', '5.4.1'
1414

1515
pod 'FirebaseAuth', :path => '../../'
1616
pod 'FirebaseCore', :path => '../../'

Releases/update-versions.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@ def SetupArguments():
5555
action='store_true',
5656
help='Update the tags only')
5757

58+
parser.add_argument(
59+
'--base_branch',
60+
dest='base_branch',
61+
default='master',
62+
help='Base branch for new release')
63+
5864
args = parser.parse_args()
5965
return args
6066

@@ -88,13 +94,13 @@ def GetVersionData(git_root, version):
8894
sys.exit('Missing version file:{}'.format(json_file))
8995

9096

91-
def CreateReleaseBranch(release_branch):
97+
def CreateReleaseBranch(release_branch, base_branch):
9298
"""Create and push the release branch.
9399
94100
Args:
95101
release_branch: the name of the git release branch.
96102
"""
97-
os.system('git checkout master')
103+
os.system('git checkout {}'.format(base_branch))
98104
os.system('git pull')
99105
os.system('git checkout -b {}'.format(release_branch))
100106
LogOrRun('git push origin {}'.format(release_branch))
@@ -233,7 +239,7 @@ def UpdateVersions():
233239
return
234240

235241
release_branch = 'release-{}'.format(args.version)
236-
CreateReleaseBranch(release_branch)
242+
CreateReleaseBranch(release_branch, args.base_branch)
237243
UpdateFIROptions(git_root, version_data)
238244
UpdatePodSpecs(git_root, version_data, args.version)
239245
UpdatePodfiles(git_root, args.version)

0 commit comments

Comments
 (0)