From e16c38688b1665a1897aa714141c1d0b87576193 Mon Sep 17 00:00:00 2001 From: Kyle Ju Date: Tue, 12 Dec 2017 14:33:04 -0500 Subject: Update component versions for Firebase 4.8.0 (#561) --- Example/Podfile | 2 +- Firebase/Core/FIROptions.m | 2 +- FirebaseAuth.podspec | 2 +- FirebaseCore.podspec | 2 +- FirebaseDatabase.podspec | 2 +- FirebaseFirestore.podspec | 2 +- FirebaseMessaging.podspec | 2 +- FirebaseStorage.podspec | 2 +- Firestore/Example/Podfile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Example/Podfile b/Example/Podfile index 164ca72..24a0de6 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.7.0' + pod 'Firebase/Core', '4.8.0' target 'Core_Tests_iOS' do inherit! :search_paths diff --git a/Firebase/Core/FIROptions.m b/Firebase/Core/FIROptions.m index 841c70b..b60ccdd 100644 --- a/Firebase/Core/FIROptions.m +++ b/Firebase/Core/FIROptions.m @@ -42,7 +42,7 @@ NSString *const kFIRIsSignInEnabled = @"IS_SIGNIN_ENABLED"; NSString *const kFIRLibraryVersionID = @"4" // Major version (one or more digits) @"00" // Minor version (exactly 2 digits) - @"12" // Build number (exactly 2 digits) + @"13" // 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 3ee4832..0addd75 100644 --- a/FirebaseAuth.podspec +++ b/FirebaseAuth.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseAuth' - s.version = '4.4.0' + s.version = '4.4.1' s.summary = 'The official iOS client for Firebase Authentication' s.description = <<-DESC diff --git a/FirebaseCore.podspec b/FirebaseCore.podspec index 453518f..ac8d5b9 100644 --- a/FirebaseCore.podspec +++ b/FirebaseCore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseCore' - s.version = '4.0.12' + s.version = '4.0.13' s.summary = 'Firebase Core for iOS' s.description = <<-DESC diff --git a/FirebaseDatabase.podspec b/FirebaseDatabase.podspec index 338a2f6..3f74718 100644 --- a/FirebaseDatabase.podspec +++ b/FirebaseDatabase.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseDatabase' - s.version = '4.1.2' + s.version = '4.1.3' s.summary = 'Firebase Open Source Libraries for iOS.' s.description = <<-DESC diff --git a/FirebaseFirestore.podspec b/FirebaseFirestore.podspec index ed7346c..5b810d8 100644 --- a/FirebaseFirestore.podspec +++ b/FirebaseFirestore.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'FirebaseFirestore' - s.version = '0.9.3' + s.version = '0.9.4' s.summary = 'Google Cloud Firestore for iOS' s.description = <<-DESC diff --git a/FirebaseMessaging.podspec b/FirebaseMessaging.podspec index a26b0b9..b1fdb68 100644 --- a/FirebaseMessaging.podspec +++ b/FirebaseMessaging.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseMessaging' - s.version = '2.0.7' + s.version = '2.0.8' s.summary = 'Firebase Messaging for iOS' s.description = <<-DESC diff --git a/FirebaseStorage.podspec b/FirebaseStorage.podspec index af81620..9b52e2f 100644 --- a/FirebaseStorage.podspec +++ b/FirebaseStorage.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseStorage' - s.version = '2.1.0' + s.version = '2.1.1' s.summary = 'Firebase Storage for iOS' s.description = <<-DESC diff --git a/Firestore/Example/Podfile b/Firestore/Example/Podfile index 89af74f..a15446e 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.7.0' +pod 'Firebase/Core', '4.8.0' use_frameworks! platform :ios, '8.0' -- cgit v1.2.3 From 163eeeecb75f24f155becaa76a95574c266d8a4f Mon Sep 17 00:00:00 2001 From: Ryan Wilson Date: Tue, 12 Dec 2017 19:18:24 -0500 Subject: Revert changes introduced in #546 to fix build breakage. (#562) --- Firebase/Messaging/FIRMessaging.m | 5 +++-- Firebase/Messaging/FIRMessagingContextManagerService.m | 2 +- Firebase/Messaging/FIRMessagingRmq2PersistentStore.m | 10 +++------- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Firebase/Messaging/FIRMessaging.m b/Firebase/Messaging/FIRMessaging.m index 23feee9..782b779 100644 --- a/Firebase/Messaging/FIRMessaging.m +++ b/Firebase/Messaging/FIRMessaging.m @@ -384,6 +384,7 @@ NSString * const FIRMessagingRegistrationTokenRefreshedNotification = id appDelegate = application.delegate; SEL continueUserActivitySelector = @selector(application:continueUserActivity:restorationHandler:); + SEL openURLWithOptionsSelector = @selector(application:openURL:options:); SEL openURLWithSourceApplicationSelector = @selector(application:openURL:sourceApplication:annotation:); SEL handleOpenURLSelector = @selector(application:handleOpenURL:); @@ -402,7 +403,7 @@ NSString * const FIRMessagingRegistrationTokenRefreshedNotification = // Do nothing, as we don't support the app calling this block }]; - } else if (@available(iOS 9.0, *)) { + } else if ([appDelegate respondsToSelector:openURLWithOptionsSelector]) { [appDelegate application:application openURL:url options:@{}]; // Similarly, |application:openURL:sourceApplication:annotation:| will also always be called, due @@ -726,7 +727,7 @@ NSString * const FIRMessagingRegistrationTokenRefreshedNotification = - (void)receiver:(FIRMessagingReceiver *)receiver receivedRemoteMessage:(FIRMessagingRemoteMessage *)remoteMessage { - if (@available(iOS 10.0, *)) { + if ([self.delegate respondsToSelector:@selector(messaging:didReceiveMessage:)]) { [self.delegate messaging:self didReceiveMessage:remoteMessage]; } else if ([self.delegate respondsToSelector:@selector(applicationReceivedRemoteMessage:)]) { #pragma clang diagnostic push diff --git a/Firebase/Messaging/FIRMessagingContextManagerService.m b/Firebase/Messaging/FIRMessagingContextManagerService.m index dffd6ae..232587f 100644 --- a/Firebase/Messaging/FIRMessagingContextManagerService.m +++ b/Firebase/Messaging/FIRMessagingContextManagerService.m @@ -143,7 +143,7 @@ typedef NS_ENUM(NSUInteger, FIRMessagingContextManagerMessageType) { } if ([apsDictionary[kFIRMessagingContextManagerTitleKey] length]) { // |alertTitle| is iOS 8.2+, so check if we can set it - if (@available(iOS 8.2, *)) { + if ([notification respondsToSelector:@selector(setAlertTitle:)]) { notification.alertTitle = apsDictionary[kFIRMessagingContextManagerTitleKey]; } } diff --git a/Firebase/Messaging/FIRMessagingRmq2PersistentStore.m b/Firebase/Messaging/FIRMessagingRmq2PersistentStore.m index e468333..189f366 100644 --- a/Firebase/Messaging/FIRMessagingRmq2PersistentStore.m +++ b/Firebase/Messaging/FIRMessagingRmq2PersistentStore.m @@ -104,13 +104,9 @@ typedef void(^FCMOutgoingRmqMessagesTableHandler)(int64_t rmqId, int8_t tag, NSD // Utility to create an NSString from a sqlite3 result code NSString * _Nonnull FIRMessagingStringFromSQLiteResult(int result) { - const char *errorStr; - if (@available(iOS 8.2, *)) { - errorStr = sqlite3_errstr(result); - } else { - errorStr = "pre iOS 8.2"; - } - return [NSString stringWithFormat:@"%d - %s", result, errorStr]; + const char *errorStr = sqlite3_errstr(result); + NSString *errorString = [NSString stringWithFormat:@"%d - %s", result, errorStr]; + return errorString; } @interface FIRMessagingRmq2PersistentStore () { -- cgit v1.2.3