Skip to content

Commit

Permalink
Merge pull request firebase#880 from firebase/release-4.10.0
Browse files Browse the repository at this point in the history
Merge Release 4.10.0 into Master
  • Loading branch information
paulb777 authored Mar 6, 2018
2 parents 8311c64 + b964ef4 commit 0b8f216
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Example/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Firebase/Core/FIROptions.m
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
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";
Expand Down
2 changes: 1 addition & 1 deletion FirebaseAuth.podspec
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion FirebaseCore.podspec
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion FirebaseDatabase.podspec
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 3 additions & 2 deletions FirebaseFirestore.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}',
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion FirebaseMessaging.podspec
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion FirebaseStorage.podspec
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Firestore/Example/Podfile
Original file line number Diff line number Diff line change
@@ -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'
Expand Down

0 comments on commit 0b8f216

Please sign in to comment.