Cherry picks for 6.9.0 (#3871)

* fixed "expiclitlySet" typo. (#3853)

* Mark unused variables (#3854)

* Mute FCM deprecated warnings with Xcode 11 and min iOS >= 10 (#3857)

* Add a third slash to make sure generated docs include these comments.b/13812238 (#3846)

Author: paulb777

Example/Core/Tests/FIRAppTest.m

@@ -651,7 +651,7 @@ - (void)testAnalyticsSetByGlobalDataCollectionSwitch {
   // Test that the global data collection switch triggers setting Analytics when no explicit flag is
   // set.
   id optionsMock = OCMClassMock([FIROptions class]);
-  OCMStub([optionsMock isAnalyticsCollectionExpicitlySet]).andReturn(NO);
+  OCMStub([optionsMock isAnalyticsCollectionExplicitlySet]).andReturn(NO);
 
   // We need to use the default app name since Analytics only associates with the default app.
   FIRApp *defaultApp = [[FIRApp alloc] initInstanceWithName:kFIRDefaultAppName options:optionsMock];
@@ -670,7 +670,7 @@ - (void)testAnalyticsSetByGlobalDataCollectionSwitch {
 - (void)testAnalyticsNotSetByGlobalDataCollectionSwitch {
   // Test that the global data collection switch doesn't override an explicitly set Analytics flag.
   id optionsMock = OCMClassMock([FIROptions class]);
-  OCMStub([optionsMock isAnalyticsCollectionExpicitlySet]).andReturn(YES);
+  OCMStub([optionsMock isAnalyticsCollectionExplicitlySet]).andReturn(YES);
   FIRApp *app = [[FIRApp alloc] initInstanceWithName:@"testAnalyticsNotSet" options:optionsMock];
 
   id configurationMock = OCMClassMock([FIRAnalyticsConfiguration class]);

Example/Core/Tests/FIROptionsTest.m

@@ -510,50 +510,50 @@ - (void)testAnalyticsCollectionExplicitlySet {
   NSDictionary *optionsDictionary = @{};
   FIROptions *options = [[FIROptions alloc] initInternalWithOptionsDictionary:optionsDictionary];
   NSDictionary *analyticsOptions = [options analyticsOptionsDictionaryWithInfoDictionary:@{}];
-  XCTAssertFalse([options isAnalyticsCollectionExpicitlySet]);
+  XCTAssertFalse([options isAnalyticsCollectionExplicitlySet]);
 
   // Test deactivation flag.
   optionsDictionary = @{kFIRIsAnalyticsCollectionDeactivated : @YES};
   options = [[FIROptions alloc] initInternalWithOptionsDictionary:optionsDictionary];
   analyticsOptions = [options analyticsOptionsDictionaryWithInfoDictionary:@{}];
-  XCTAssertTrue([options isAnalyticsCollectionExpicitlySet]);
+  XCTAssertTrue([options isAnalyticsCollectionExplicitlySet]);
 
   // If "deactivated" == NO, that doesn't mean it's explicitly set / enabled so it should be treated
   // as if it's not set.
   optionsDictionary = @{kFIRIsAnalyticsCollectionDeactivated : @NO};
   options = [[FIROptions alloc] initInternalWithOptionsDictionary:optionsDictionary];
   analyticsOptions = [options analyticsOptionsDictionaryWithInfoDictionary:@{}];
-  XCTAssertFalse([options isAnalyticsCollectionExpicitlySet]);
+  XCTAssertFalse([options isAnalyticsCollectionExplicitlySet]);
 
   // Test the collection enabled flag.
   optionsDictionary = @{kFIRIsAnalyticsCollectionEnabled : @YES};
   options = [[FIROptions alloc] initInternalWithOptionsDictionary:optionsDictionary];
   analyticsOptions = [options analyticsOptionsDictionaryWithInfoDictionary:@{}];
-  XCTAssertTrue([options isAnalyticsCollectionExpicitlySet]);
+  XCTAssertTrue([options isAnalyticsCollectionExplicitlySet]);
 
   optionsDictionary = @{kFIRIsAnalyticsCollectionEnabled : @NO};
   options = [[FIROptions alloc] initInternalWithOptionsDictionary:optionsDictionary];
   analyticsOptions = [options analyticsOptionsDictionaryWithInfoDictionary:@{}];
-  XCTAssertTrue([options isAnalyticsCollectionExpicitlySet]);
+  XCTAssertTrue([options isAnalyticsCollectionExplicitlySet]);
 
   // Test the old measurement flag.
   options = [[FIROptions alloc] initInternalWithOptionsDictionary:@{}];
   analyticsOptions =
       [options analyticsOptionsDictionaryWithInfoDictionary:@{kFIRIsMeasurementEnabled : @YES}];
-  XCTAssertTrue([options isAnalyticsCollectionExpicitlySet]);
+  XCTAssertTrue([options isAnalyticsCollectionExplicitlySet]);
 
   options = [[FIROptions alloc] initInternalWithOptionsDictionary:@{}];
   analyticsOptions =
       [options analyticsOptionsDictionaryWithInfoDictionary:@{kFIRIsMeasurementEnabled : @NO}];
-  XCTAssertTrue([options isAnalyticsCollectionExpicitlySet]);
+  XCTAssertTrue([options isAnalyticsCollectionExplicitlySet]);
 
   // For good measure, a combination of all 3 (even if they conflict).
   optionsDictionary =
       @{kFIRIsAnalyticsCollectionDeactivated : @YES, kFIRIsAnalyticsCollectionEnabled : @YES};
   options = [[FIROptions alloc] initInternalWithOptionsDictionary:optionsDictionary];
   analyticsOptions =
       [options analyticsOptionsDictionaryWithInfoDictionary:@{kFIRIsMeasurementEnabled : @NO}];
-  XCTAssertTrue([options isAnalyticsCollectionExpicitlySet]);
+  XCTAssertTrue([options isAnalyticsCollectionExplicitlySet]);
 }
 
 - (void)testModifyingOptionsThrows {

Example/Messaging/Tests/FIRMessagingContextManagerServiceTest.m

@@ -83,8 +83,10 @@ - (void)testMessageWithFutureStartTime {
   XCTAssertTrue([FIRMessagingContextManagerService handleContextManagerMessage:message]);
 
   XCTAssertEqual(self.scheduledLocalNotifications.count, 1);
-
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
   UILocalNotification *notification = [self.scheduledLocalNotifications firstObject];
+#pragma clang diagnostic pop
   NSDate *date = [self.dateFormatter dateFromString:startTimeString];
   XCTAssertEqual([notification.fireDate compare:date], NSOrderedSame);
 #endif
@@ -134,7 +136,10 @@ - (void)testMessageWithPastStartAndFutureEndTime {
   XCTAssertTrue([FIRMessagingContextManagerService handleContextManagerMessage:message]);
 
   XCTAssertEqual(self.scheduledLocalNotifications.count, 1);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
   UILocalNotification *notification = [self.scheduledLocalNotifications firstObject];
+#pragma clang diagnostic pop
   // schedule notification after start date
   XCTAssertEqual([notification.fireDate compare:startDate], NSOrderedDescending);
   // schedule notification after end date
@@ -163,7 +168,10 @@ - (void)testTimedNotificationsUserInfo {
   XCTAssertTrue([FIRMessagingContextManagerService handleContextManagerMessage:message]);
 
   XCTAssertEqual(self.scheduledLocalNotifications.count, 1);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
   UILocalNotification *notification = [self.scheduledLocalNotifications firstObject];
+#pragma clang diagnostic pop
   XCTAssertEqualObjects(notification.userInfo[messageIdentifierKey], messageIdentifier);
   XCTAssertEqualObjects(notification.userInfo[customDataKey], customData);
 #endif
@@ -175,6 +183,8 @@ - (void)testTimedNotificationsUserInfo {
 - (void)mockSchedulingLocalNotifications {
 #if TARGET_OS_IOS
   id mockApplication = OCMPartialMock([UIApplication sharedApplication]);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
   __block UILocalNotification *notificationToSchedule;
   [[[mockApplication stub]
       andDo:^(NSInvocation *invocation) {
@@ -189,6 +199,7 @@ - (void)mockSchedulingLocalNotifications {
         }
         return NO;
       }]];
+#pragma clang diagnostic pop
 #endif
 }
 

Firebase/Core/CHANGELOG.md

@@ -1,5 +1,6 @@
 # v6.3.0 -- M56
 - [changed] Transitive GoogleDataTransport dependency incremented to v2.0.0. (#3729)
+- [fixed] Fixed "expiclitlySet" typo. (#3853)
 
 # v6.2.0 -- M53
 - [added] Added AppKit dependency on macOS and UIKit dependency on iOS and tvOS. (#3459)

Firebase/Core/FIRApp.m

@@ -352,7 +352,7 @@ - (void)setDataCollectionDefaultEnabled:(BOOL)dataCollectionDefaultEnabled {
   }
 
   // Check if the Analytics flag is explicitly set. If so, no further actions are necessary.
-  if ([self.options isAnalyticsCollectionExpicitlySet]) {
+  if ([self.options isAnalyticsCollectionExplicitlySet]) {
     return;
   }
 

Firebase/Core/FIROptions.m

@@ -399,7 +399,7 @@ - (BOOL)isMeasurementEnabled {
   return [value boolValue];
 }
 
-- (BOOL)isAnalyticsCollectionExpicitlySet {
+- (BOOL)isAnalyticsCollectionExplicitlySet {
   // If it's de-activated, it classifies as explicity set. If not, it's not a good enough indication
   // that the developer wants FirebaseAnalytics enabled so continue checking.
   if (self.isAnalyticsCollectionDeactivated) {

Firebase/Core/Private/FIROptionsInternal.h

@@ -65,7 +65,7 @@ extern NSString *const kServiceInfoFileType;
  * Indicates whether or not Analytics collection was explicitly enabled via a plist flag or at
  * runtime.
  */
-@property(nonatomic, readonly) BOOL isAnalyticsCollectionExpicitlySet;
+@property(nonatomic, readonly) BOOL isAnalyticsCollectionExplicitlySet;
 
 /**
  * Whether or not Analytics Collection was enabled. Analytics Collection is enabled unless

Firebase/Messaging/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 2019-09 -- v4.1.5
+- [fixed] Mute FCM deprecated warnings with Xcode 11 and min iOS >= 10. (#3857)
+
 # 2019-09-03 -- v4.1.4
 - [fixed] Fixed notification open event is not logged when scheduling a local timezone message. (#3670, #3638)
 - [fixed] Fixed FirebaseApp.delete() results in unusable Messaging singleton. (#3411)

Firebase/Messaging/FIRMessaging.m

@@ -874,7 +874,7 @@ - (void)receiver:(FIRMessagingReceiver *)receiver
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunguarded-availability"
     [self.delegate messaging:self didReceiveMessage:remoteMessage];
-#pragma pop
+#pragma clang diagnostic pop
   } else {
     // Delegate methods weren't implemented, so messages are being dropped, log a warning
     FIRMessagingLoggerWarn(kFIRMessagingMessageCodeRemoteMessageDelegateMethodNotImplemented,

Firebase/Messaging/FIRMessagingContextManagerService.m

@@ -149,7 +149,7 @@ + (void)scheduleLocalNotificationForMessage:(NSDictionary *)message
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunguarded-availability"
       notification.alertTitle = apsDictionary[kFIRMessagingContextManagerTitleKey];
-#pragma pop
+#pragma clang diagnostic pop
     }
   }
 
@@ -175,7 +175,10 @@ + (void)scheduleLocalNotificationForMessage:(NSDictionary *)message
   if (!application) {
     return;
   }
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
   [application scheduleLocalNotification:notification];
+#pragma clang diagnostic pop
 #endif
 }