Skip to content

Commit 0da269c

Browse files
authored
Merge pull request #1814 from firebase/release-5.8.0
Release 5.8.0
2 parents 4eea246 + 0d2cbe4 commit 0da269c

File tree

12 files changed

+45
-26
lines changed

12 files changed

+45
-26
lines changed

Example/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ target 'Core_Example_iOS' do
1414
# The next line is the forcing function for the Firebase pod. The Firebase
1515
# version's subspecs should depend on the component versions in their
1616
# corresponding podspec's.
17-
pod 'Firebase/CoreOnly', '5.7.0'
17+
pod 'Firebase/CoreOnly', '5.8.0'
1818

1919
target 'Core_Tests_iOS' do
2020
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
@"01" // Minor version (exactly 2 digits)
46-
@"02" // Build number (exactly 2 digits)
46+
@"03" // Build number (exactly 2 digits)
4747
@"000"; // Fixed "000"
4848
// Plist file name.
4949
NSString *const kServiceInfoFileName = @"GoogleService-Info";

FirebaseAuth.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 = 'FirebaseAuth'
3-
s.version = '5.0.3'
3+
s.version = '5.0.4'
44
s.summary = 'The official iOS client for Firebase Authentication (plus community support for macOS and tvOS)'
55

66
s.description = <<-DESC

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.1.2'
3+
s.version = '5.1.3'
44
s.summary = 'Firebase Core for iOS (plus community support for macOS and tvOS)'
55

66
s.description = <<-DESC
@@ -34,6 +34,6 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration
3434
s.pod_target_xcconfig = {
3535
'OTHER_CFLAGS' => '-fno-autolink',
3636
'GCC_PREPROCESSOR_DEFINITIONS' =>
37-
'FIRCore_VERSION=' + s.version.to_s + ' Firebase_VERSION=5.7.0'
37+
'FIRCore_VERSION=' + s.version.to_s + ' Firebase_VERSION=5.8.0'
3838
}
3939
end

FirebaseDatabase.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 = 'FirebaseDatabase'
3-
s.version = '5.0.2'
3+
s.version = '5.0.3'
44
s.summary = 'Firebase Open Source Libraries for iOS (plus community support for macOS and tvOS)'
55

66
s.description = <<-DESC

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.13.2'
3+
s.version = '0.13.3'
44
s.summary = 'Google Cloud Firestore for iOS'
55

66
s.description = <<-DESC

FirebaseFunctions.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 = 'FirebaseFunctions'
3-
s.version = '2.1.0'
3+
s.version = '2.1.1'
44
s.summary = 'Cloud Functions for Firebase iOS SDK.'
55

66
s.description = <<-DESC

FirebaseMessaging.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 = 'FirebaseMessaging'
3-
s.version = '3.1.1'
3+
s.version = '3.1.2'
44
s.summary = 'Firebase Messaging for iOS'
55

66
s.description = <<-DESC

FirebaseStorage.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 = 'FirebaseStorage'
3-
s.version = '3.0.1'
3+
s.version = '3.0.2'
44
s.summary = 'Firebase Storage for iOS (plus community support for macOS and tvOS)'
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/CoreOnly', '5.7.0'
13+
pod 'Firebase/CoreOnly', '5.8.0'
1414

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

Releases/Manifests/5.8.0.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"FirebaseCore":"5.1.3",
3+
"FirebaseAuth":"5.0.4",
4+
"FirebaseDatabase":"5.0.3",
5+
"FirebaseFirestore":"0.13.3",
6+
"FirebaseFunctions":"2.1.1",
7+
"FirebaseMessaging":"3.1.2",
8+
"FirebaseStorage":"3.0.2"
9+
}

Releases/update-versions.py

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,12 @@ def SetupArguments():
6161
default='master',
6262
help='Base branch for new release')
6363

64+
parser.add_argument(
65+
'--push_only',
66+
dest='push_only',
67+
action='store_true',
68+
help='Skip all of script except pushing podspecs to cpdc_internal')
69+
6470
args = parser.parse_args()
6571
return args
6672

@@ -154,7 +160,7 @@ def UpdatePodfiles(git_root, version):
154160
firestore_podfile = os.path.join(git_root, 'Firestore', 'Example', 'Podfile')
155161

156162
sed_command = ("sed -i.bak -e \"s#\\(pod "
157-
"'Firebase/Core',[[:space:]]*'\\).*'#\\1{}'#\" {}")
163+
"'Firebase/CoreOnly',[[:space:]]*'\\).*'#\\1{}'#\" {}")
158164
os.system(sed_command.format(version, firebase_podfile))
159165
os.system(sed_command.format(version, firestore_podfile))
160166

@@ -224,6 +230,7 @@ def UpdateVersions():
224230
global test_mode
225231
args = SetupArguments()
226232
test_mode = args.test_mode
233+
227234
# Validate version is proper format
228235
major, minor, patch = args.version.split('.')
229236
if (not major.isdigit()) or (not minor.isdigit()) or (not patch.isdigit()):
@@ -234,20 +241,23 @@ def UpdateVersions():
234241
stdout=subprocess.PIPE).communicate()[0].rstrip().decode('utf-8')
235242

236243
version_data = GetVersionData(git_root, args.version)
237-
if args.tag_update:
238-
UpdateTags(version_data, args.version)
239-
return
240-
241-
release_branch = 'release-{}'.format(args.version)
242-
CreateReleaseBranch(release_branch, args.base_branch)
243-
UpdateFIROptions(git_root, version_data)
244-
UpdatePodSpecs(git_root, version_data, args.version)
245-
UpdatePodfiles(git_root, args.version)
246-
247-
LogOrRun('git commit -am "Update versions for Release {}"'
248-
.format(args.version))
249-
LogOrRun('git push origin {}'.format(release_branch))
250-
UpdateTags(version_data, args.version, True)
244+
245+
if not args.push_only:
246+
if args.tag_update:
247+
UpdateTags(version_data, args.version)
248+
return
249+
250+
release_branch = 'release-{}'.format(args.version)
251+
CreateReleaseBranch(release_branch, args.base_branch)
252+
UpdateFIROptions(git_root, version_data)
253+
UpdatePodSpecs(git_root, version_data, args.version)
254+
UpdatePodfiles(git_root, args.version)
255+
256+
LogOrRun('git commit -am "Update versions for Release {}"'
257+
.format(args.version))
258+
LogOrRun('git push origin {}'.format(release_branch))
259+
UpdateTags(version_data, args.version, True)
260+
251261
PushPodspecs(version_data)
252262

253263

0 commit comments

Comments
 (0)