diff options
author | Paul Beusterien <paulbeusterien@google.com> | 2018-03-06 15:46:10 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-06 15:46:10 -0800 |
commit | 0b8f216e4ce85b968ac0803d729cd24eb110d0b6 (patch) | |
tree | f5d2f59999ce680f08d52c6a56150b976c6a2e9d | |
parent | 8311c6432ecff78bedd13e27f64d241659324786 (diff) | |
parent | b964ef4b00d049d9c7808843aacb830330dc7d7a (diff) |
Merge pull request #880 from firebase/release-4.10.0
Merge Release 4.10.0 into Master
-rw-r--r-- | Example/Podfile | 2 | ||||
-rw-r--r-- | Firebase/Core/FIROptions.m | 2 | ||||
-rw-r--r-- | FirebaseAuth.podspec | 2 | ||||
-rw-r--r-- | FirebaseCore.podspec | 2 | ||||
-rw-r--r-- | FirebaseDatabase.podspec | 2 | ||||
-rw-r--r-- | FirebaseFirestore.podspec | 5 | ||||
-rw-r--r-- | FirebaseMessaging.podspec | 2 | ||||
-rw-r--r-- | FirebaseStorage.podspec | 2 | ||||
-rw-r--r-- | Firestore/Example/Podfile | 2 |
9 files changed, 11 insertions, 10 deletions
diff --git a/Example/Podfile b/Example/Podfile index dac03cf..0a3b784 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -8,7 +8,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', '4.9.0' + pod 'Firebase/Core', '4.10.0' target 'Core_Tests_iOS' do inherit! :search_paths diff --git a/Firebase/Core/FIROptions.m b/Firebase/Core/FIROptions.m index e8f6600..bbfe5c0 100644 --- a/Firebase/Core/FIROptions.m +++ b/Firebase/Core/FIROptions.m @@ -43,7 +43,7 @@ NSString *const kFIRIsSignInEnabled = @"IS_SIGNIN_ENABLED"; NSString *const kFIRLibraryVersionID = @"4" // Major version (one or more digits) @"00" // Minor version (exactly 2 digits) - @"15" // Build number (exactly 2 digits) + @"16" // 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 d87d1cd..1f18d97 100644 --- a/FirebaseAuth.podspec +++ b/FirebaseAuth.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseAuth' - s.version = '4.4.3' + s.version = '4.4.4' s.summary = 'The official iOS client for Firebase Authentication' s.description = <<-DESC diff --git a/FirebaseCore.podspec b/FirebaseCore.podspec index 444022d..3c6fe59 100644 --- a/FirebaseCore.podspec +++ b/FirebaseCore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseCore' - s.version = '4.0.15' + s.version = '4.0.16' s.summary = 'Firebase Core for iOS' s.description = <<-DESC diff --git a/FirebaseDatabase.podspec b/FirebaseDatabase.podspec index 3992c21..6138536 100644 --- a/FirebaseDatabase.podspec +++ b/FirebaseDatabase.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseDatabase' - s.version = '4.1.4' + s.version = '4.1.5' s.summary = 'Firebase Open Source Libraries for iOS.' s.description = <<-DESC diff --git a/FirebaseFirestore.podspec b/FirebaseFirestore.podspec index 094a2ba..e7d1c85 100644 --- a/FirebaseFirestore.podspec +++ b/FirebaseFirestore.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'FirebaseFirestore' - s.version = '0.10.1' + s.version = '0.10.2' s.summary = 'Google Cloud Firestore for iOS' s.description = <<-DESC @@ -31,6 +31,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling, s.source_files = [ 'Firestore/Source/**/*', 'Firestore/Port/**/*', + 'Firestore/Protos/nanopb/**/*.[hc]', 'Firestore/Protos/objc/**/*.[hm]', 'Firestore/core/include/**/*.{h,cc,mm}', 'Firestore/core/src/**/*.{h,cc,mm}', @@ -67,7 +68,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling, '"${PODS_TARGET_SRCROOT}/Firestore/third_party/abseil-cpp" ' + '"${PODS_ROOT}/nanopb" ' + '"${PODS_TARGET_SRCROOT}/Firestore/Protos/nanopb"', - 'OTHER_CFLAGS' => '-DFIRFirestore_VERSION=' + s.version.to_s + 'OTHER_CFLAGS' => '-DFIRFirestore_VERSION=' + s.version.to_s + ' -DPB_FIELD_16BIT' } s.prepare_command = <<-CMD diff --git a/FirebaseMessaging.podspec b/FirebaseMessaging.podspec index 30d9185..5ef4fab 100644 --- a/FirebaseMessaging.podspec +++ b/FirebaseMessaging.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseMessaging' - s.version = '2.1.0' + s.version = '2.1.1' s.summary = 'Firebase Messaging for iOS' s.description = <<-DESC diff --git a/FirebaseStorage.podspec b/FirebaseStorage.podspec index ce50270..8f0b9d0 100644 --- a/FirebaseStorage.podspec +++ b/FirebaseStorage.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseStorage' - s.version = '2.1.2' + s.version = '2.1.3' s.summary = 'Firebase Storage for iOS' s.description = <<-DESC diff --git a/Firestore/Example/Podfile b/Firestore/Example/Podfile index 2c38cd9..bae5576 100644 --- a/Firestore/Example/Podfile +++ b/Firestore/Example/Podfile @@ -1,7 +1,7 @@ # 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', '4.9.0' +pod 'Firebase/Core', '4.10.0' use_frameworks! platform :ios, '8.0' |