diff options
| author |  Paul Beusterien <paulbeusterien@google.com> | 2018-06-20 13:37:28 -0700 |
|---|---|---|
| committer | Paul Beusterien <paulbeusterien@google.com> | 2018-06-20 13:37:28 -0700 |
| commit | ab06ec466ac3177d0c4d808c27afcc6a50a06933 (patch) | |
| tree | a6750424e613a797fb0593fc1b6164f289df5277 | |
| parent | 1579c3809d3700dda0497b3158c75d4c585674a4 (diff) | |
| parent | 1cbf3b65aac05eb0bccd3bb73db637dc8b74eb1d (diff) | |
Merge and resolve conflicts from release-5.3.0
| -rw-r--r-- | Example/Podfile | 2 | ||||
| -rw-r--r-- | Firebase/Core/FIROptions.m | 2 | ||||
| -rw-r--r-- | FirebaseCore.podspec | 4 | ||||
| -rw-r--r-- | FirebaseFirestore.podspec | 2 | ||||
| -rw-r--r-- | Firestore/Example/Podfile | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/Example/Podfile b/Example/Podfile index 0ac77a3..e59b643 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.2.0' + pod 'Firebase/Core', '5.3.0' target 'Core_Tests_iOS' do inherit! :search_paths diff --git a/Firebase/Core/FIROptions.m b/Firebase/Core/FIROptions.m index cf1dd2b..7c26623 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) - @"03" // Build number (exactly 2 digits) + @"04" // Build number (exactly 2 digits) @"000"; // Fixed "000" // Plist file name. NSString *const kServiceInfoFileName = @"GoogleService-Info"; diff --git a/FirebaseCore.podspec b/FirebaseCore.podspec index f74cef4..47a653b 100644 --- a/FirebaseCore.podspec +++ b/FirebaseCore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseCore' - s.version = '5.0.3' + s.version = '5.0.4' 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.2.0' + 'FIRCore_VERSION=' + s.version.to_s + ' Firebase_VERSION=5.3.0' } end diff --git a/FirebaseFirestore.podspec b/FirebaseFirestore.podspec index 9158be7..068d562 100644 --- a/FirebaseFirestore.podspec +++ b/FirebaseFirestore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseFirestore' - s.version = '0.12.3' + s.version = '0.12.4' s.summary = 'Google Cloud Firestore for iOS' s.description = <<-DESC diff --git a/Firestore/Example/Podfile b/Firestore/Example/Podfile index 110c676..881747a 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.2.0' + pod 'Firebase/Core', '5.3.0' pod 'FirebaseAuth', :path => '../../' pod 'FirebaseCore', :path => '../../' |