diff options
| author |  Paul Beusterien <paulbeusterien@google.com> | 2018-04-10 17:45:20 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-04-10 17:45:20 -0700 |
| commit | 55eed807df70402d81227056d0f3934c07215295 (patch) | |
| tree | 63254c0c6beedd209b847adce227d2d9241ce2b8 /Firebase | |
| parent | 135e2acc4502460d083564fc18a4b52ed3297fdb (diff) | |
| parent | fb14ee35fa0c666b15574cdedb4efdefe8cf9fca (diff) | |
Merge pull request #1067 from firebase/release-4.12.0
Release 4.12.0
Diffstat (limited to 'Firebase')
| -rw-r--r-- | Firebase/Core/FIROptions.m | 2 | ||||
| -rw-r--r-- | Firebase/Messaging/Public/FIRMessaging.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Firebase/Core/FIROptions.m b/Firebase/Core/FIROptions.m index 56a56ff..5546297 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) - @"18" // Build number (exactly 2 digits) + @"19" // Build number (exactly 2 digits) @"000"; // Fixed "000" // Plist file name. NSString *const kServiceInfoFileName = @"GoogleService-Info"; diff --git a/Firebase/Messaging/Public/FIRMessaging.h b/Firebase/Messaging/Public/FIRMessaging.h index f545147..e5c27ea 100644 --- a/Firebase/Messaging/Public/FIRMessaging.h +++ b/Firebase/Messaging/Public/FIRMessaging.h @@ -467,7 +467,7 @@ NS_SWIFT_NAME(Messaging) * In case of success, nil error is returned. Otherwise, an * appropriate error object is returned. */ -- (void)subscribeToTopic:(NSString *)topic +- (void)subscribeToTopic:(nonnull NSString *)topic completion:(nullable FIRMessagingTopicOperationCompletion)completion; /** @@ -485,7 +485,7 @@ NS_SWIFT_NAME(Messaging) * In case of success, nil error is returned. Otherwise, an * appropriate error object is returned. */ -- (void)unsubscribeFromTopic:(NSString *)topic +- (void)unsubscribeFromTopic:(nonnull NSString *)topic completion:(nullable FIRMessagingTopicOperationCompletion)completion; #pragma mark - Upstream |