aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar davidair <davidair@users.noreply.github.com>2018-06-06 17:29:10 -0400
committerGravatar GitHub <noreply@github.com>2018-06-06 17:29:10 -0400
commit3973b6499adb29bdb60cc2c55a1afd4c4532c094 (patch)
treef1282c64876d1c816ec8a3ae02ca1ac0dc559c29
parent7dbf5caa5f25551658aee614247aed10012166e2 (diff)
parent1bbac8d26eceba8837327f726b187e3207435202 (diff)
Merge branch 'release-5.2.0' into master
-rw-r--r--Example/Podfile2
-rw-r--r--Firebase/Core/FIROptions.m2
-rw-r--r--FirebaseAuth.podspec2
-rw-r--r--FirebaseCore.podspec4
-rw-r--r--FirebaseFirestore.podspec2
-rw-r--r--FirebaseMessaging.podspec2
-rw-r--r--Firestore/Example/Podfile2
-rwxr-xr-xscripts/push-pods.sh8
-rwxr-xr-xscripts/update-tags.sh36
9 files changed, 30 insertions, 30 deletions
diff --git a/Example/Podfile b/Example/Podfile
index 5308679..0ac77a3 100644
--- a/Example/Podfile
+++ b/Example/Podfile
@@ -12,7 +12,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/Core', '5.1.0'
+ pod 'Firebase/Core', '5.2.0'
target 'Core_Tests_iOS' do
inherit! :search_paths
diff --git a/Firebase/Core/FIROptions.m b/Firebase/Core/FIROptions.m
index ecdd9e9..cf1dd2b 100644
--- a/Firebase/Core/FIROptions.m
+++ b/Firebase/Core/FIROptions.m
@@ -43,7 +43,7 @@ NSString *const kFIRIsSignInEnabled = @"IS_SIGNIN_ENABLED";
NSString *const kFIRLibraryVersionID =
@"5" // Major version (one or more digits)
@"00" // Minor version (exactly 2 digits)
- @"02" // Build number (exactly 2 digits)
+ @"03" // Build number (exactly 2 digits)
@"000"; // Fixed "000"
// Plist file name.
NSString *const kServiceInfoFileName = @"GoogleService-Info";
diff --git a/FirebaseAuth.podspec b/FirebaseAuth.podspec
index 48a9354..754e172 100644
--- a/FirebaseAuth.podspec
+++ b/FirebaseAuth.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'FirebaseAuth'
- s.version = '5.0.0'
+ s.version = '5.0.1'
s.summary = 'The official iOS client for Firebase Authentication (plus community support for macOS and tvOS)'
s.description = <<-DESC
diff --git a/FirebaseCore.podspec b/FirebaseCore.podspec
index ddcb981..f74cef4 100644
--- a/FirebaseCore.podspec
+++ b/FirebaseCore.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'FirebaseCore'
- s.version = '5.0.2'
+ s.version = '5.0.3'
s.summary = 'Firebase Core for iOS (plus community support for macOS and tvOS)'
s.description = <<-DESC
@@ -35,6 +35,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.1.0'
+ 'FIRCore_VERSION=' + s.version.to_s + ' Firebase_VERSION=5.2.0'
}
end
diff --git a/FirebaseFirestore.podspec b/FirebaseFirestore.podspec
index 01f8ea3..024be8c 100644
--- a/FirebaseFirestore.podspec
+++ b/FirebaseFirestore.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'FirebaseFirestore'
- s.version = '0.12.2'
+ s.version = '0.12.3'
s.summary = 'Google Cloud Firestore for iOS'
s.description = <<-DESC
diff --git a/FirebaseMessaging.podspec b/FirebaseMessaging.podspec
index bd0921b..00a3598 100644
--- a/FirebaseMessaging.podspec
+++ b/FirebaseMessaging.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'FirebaseMessaging'
- s.version = '3.0.1'
+ s.version = '3.0.2'
s.summary = 'Firebase Messaging for iOS'
s.description = <<-DESC
diff --git a/Firestore/Example/Podfile b/Firestore/Example/Podfile
index dc5af48..57cd533 100644
--- a/Firestore/Example/Podfile
+++ b/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/Core', '5.1.0'
+ pod 'Firebase/Core', '5.2.0'
pod 'FirebaseAuth', :path => '../../'
pod 'FirebaseCore', :path => '../../'
diff --git a/scripts/push-pods.sh b/scripts/push-pods.sh
index b79b76e..ed34d79 100755
--- a/scripts/push-pods.sh
+++ b/scripts/push-pods.sh
@@ -22,16 +22,16 @@
# investigation.
pod cache clean FirebaseCore --all
-#pod cache clean FirebaseAuth --all
-pod cache clean FirebaseDatabase --all
+pod cache clean FirebaseAuth --all
+#pod cache clean FirebaseDatabase --all
pod cache clean FirebaseFirestore --all
#pod cache clean FirebaseFunctions --all
pod cache clean FirebaseMessaging --all
#pod cache clean FirebaseStorage --all
pod repo push cpdc-internal-spec FirebaseCore.podspec
-#pod repo push cpdc-internal-spec FirebaseAuth.podspec
-pod repo push cpdc-internal-spec FirebaseDatabase.podspec
+pod repo push cpdc-internal-spec FirebaseAuth.podspec
+#pod repo push cpdc-internal-spec FirebaseDatabase.podspec
pod repo push cpdc-internal-spec FirebaseFirestore.podspec --allow-warnings
#pod repo push cpdc-internal-spec FirebaseFunctions.podspec
pod repo push cpdc-internal-spec FirebaseMessaging.podspec
diff --git a/scripts/update-tags.sh b/scripts/update-tags.sh
index d321dd8..d29fb5c 100755
--- a/scripts/update-tags.sh
+++ b/scripts/update-tags.sh
@@ -27,35 +27,35 @@
# Delete any existing tags at origin
-git push --delete origin '5.1.0'
-git push --delete origin 'Core-5.0.2'
-#git push --delete origin 'Auth-5.0.0'
-git push --delete origin 'Database-5.0.1'
-git push --delete origin 'Firestore-0.12.2'
+git push --delete origin '5.2.0'
+git push --delete origin 'Core-5.0.3'
+git push --delete origin 'Auth-5.0.1'
+#git push --delete origin 'Database-5.0.1'
+git push --delete origin 'Firestore-0.12.3'
#git push --delete origin 'Functions-2.0.0'
-git push --delete origin 'Messaging-3.0.1'
+git push --delete origin 'Messaging-3.0.2'
#git push --delete origin 'Storage-3.0.0'
# Delete local tags
-git tag --delete '5.1.0'
-git tag --delete 'Core-5.0.2'
-#git tag --delete 'Auth-5.0.0'
-git tag --delete 'Database-5.0.1'
-git tag --delete 'Firestore-0.12.2'
+git tag --delete '5.2.0'
+git tag --delete 'Core-5.0.3'
+git tag --delete 'Auth-5.0.1'
+#git tag --delete 'Database-5.0.1'
+git tag --delete 'Firestore-0.12.3'
#git tag --delete 'Functions-2.0.0'
-git tag --delete 'Messaging-3.0.1'
+git tag --delete 'Messaging-3.0.2'
#git tag --delete 'Storage-3.0.0'
# Add and push the tags
-git tag '5.1.0'
-git tag 'Core-5.0.2'
-#git tag 'Auth-5.0.0'
-git tag 'Database-5.0.1'
-git tag 'Firestore-0.12.2'
+git tag '5.2.0'
+git tag 'Core-5.0.3'
+git tag 'Auth-5.0.1'
+# git tag 'Database-5.0.1'
+git tag 'Firestore-0.12.3'
#git tag 'Functions-2.0.0'
-git tag 'Messaging-3.0.1'
+git tag 'Messaging-3.0.2'
#git tag 'Storage-3.0.0'
git push origin --tags