Cherry picks for 6.9.0 (#3871)

paulb777 · web-flow · commit d69e1bcd2a62 · 2019-09-17T08:04:55.000-07:00
* 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)
diff --git a/Example/Core/Tests/FIRAppTest.m b/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]);
diff --git a/Example/Core/Tests/FIROptionsTest.m b/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 {
diff --git a/Example/Messaging/Tests/FIRMessagingContextManagerServiceTest.m b/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
 }
 
diff --git a/Firebase/Core/CHANGELOG.md b/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)
diff --git a/Firebase/Core/FIRApp.m b/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;
   }
 
diff --git a/Firebase/Core/FIROptions.m b/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) {
diff --git a/Firebase/Core/Private/FIROptionsInternal.h b/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
diff --git a/Firebase/Messaging/CHANGELOG.md b/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)
diff --git a/Firebase/Messaging/FIRMessaging.m b/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,
diff --git a/Firebase/Messaging/FIRMessagingContextManagerService.m b/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
 }
 
diff --git a/Firebase/Messaging/FIRMessagingRmq2PersistentStore.m b/Firebase/Messaging/FIRMessagingRmq2PersistentStore.m
@@ -106,7 +106,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunguarded-availability"
   const char *errorStr = sqlite3_errstr(result);
-#pragma pop
+#pragma clang diagnostic pop
   NSString *errorString = [NSString stringWithFormat:@"%d - %s", result, errorStr];
   return errorString;
 }
diff --git a/FirebaseMessaging.podspec b/FirebaseMessaging.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseMessaging'
-  s.version          = '4.1.4'
+  s.version          = '4.1.5'
   s.summary          = 'Firebase Messaging for iOS'
 
   s.description      = <<-DESC
diff --git a/FirebaseRemoteConfig/CHANGELOG.md b/FirebaseRemoteConfig/CHANGELOG.md
@@ -1,3 +1,7 @@
+Version 4.4.1
+==================================
+- Fix docs issue. (#3846)
+
 Version 4.3.0
 ==================================
 - Open source. (TBD)
diff --git a/FirebaseRemoteConfig/Sources/Public/FIRRemoteConfig.h b/FirebaseRemoteConfig/Sources/Public/FIRRemoteConfig.h
@@ -44,12 +44,12 @@ typedef NS_ENUM(NSInteger, FIRRemoteConfigFetchStatus) {
 
 /// Indicates whether updated data was successfully fetched and activated.
 typedef NS_ENUM(NSInteger, FIRRemoteConfigFetchAndActivateStatus) {
-  // The remote fetch succeeded and fetched data was activated.
+  /// The remote fetch succeeded and fetched data was activated.
   FIRRemoteConfigFetchAndActivateStatusSuccessFetchedFromRemote,
-  // The fetch and activate succeeded from already fetched but yet unexpired config data. You can
-  // control this using minimumFetchInterval property in FIRRemoteConfigSettings.
+  /// The fetch and activate succeeded from already fetched but yet unexpired config data. You can
+  /// control this using minimumFetchInterval property in FIRRemoteConfigSettings.
   FIRRemoteConfigFetchAndActivateStatusSuccessUsingPreFetchedData,
-  // The fetch and activate failed.
+  /// The fetch and activate failed.
   FIRRemoteConfigFetchAndActivateStatusError
 } NS_SWIFT_NAME(RemoteConfigFetchAndActivateStatus);
 
diff --git a/GoogleUtilities/CHANGELOG.md b/GoogleUtilities/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 6.3.0
+- GULSecureCoding introduced. (#3707)
+- Mark unused variables. (#3854)
+
 # 6.2.5
 - Remove test-only method and update tests to include Catalyst. (#3544)
 
diff --git a/GoogleUtilities/ISASwizzler/GULObjectSwizzler.m b/GoogleUtilities/ISASwizzler/GULObjectSwizzler.m
@@ -99,12 +99,9 @@ - (void)copySelector:(SEL)selector fromClass:(Class)aClass isClassSelector:(BOOL
   Class targetClass = isClassSelector ? object_getClass(_generatedClass) : _generatedClass;
   IMP implementation = method_getImplementation(method);
   const char *typeEncoding = method_getTypeEncoding(method);
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-variable"
-  BOOL success = class_addMethod(targetClass, selector, implementation, typeEncoding);
+  BOOL success __unused = class_addMethod(targetClass, selector, implementation, typeEncoding);
   NSAssert(success, @"Unable to add selector %@ to class %@", NSStringFromSelector(selector),
            NSStringFromClass(targetClass));
-#pragma clang diagnostic pop
 }
 
 - (void)setAssociatedObjectWithKey:(NSString *)key
@@ -139,12 +136,9 @@ - (void)swizzle {
     NSAssert(class_getInstanceSize(_originalClass) == class_getInstanceSize(_generatedClass),
              @"The instance size of the generated class must be equal to the original class.");
     objc_registerClassPair(_generatedClass);
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-variable"
-    Class doubleCheckOriginalClass = object_setClass(_swizzledObject, _generatedClass);
+    Class doubleCheckOriginalClass __unused = object_setClass(_swizzledObject, _generatedClass);
     NSAssert(_originalClass == doubleCheckOriginalClass,
              @"The original class must be the same as the class returned by object_setClass");
-#pragma clang diagnostic pop
   } else {
     NSAssert(NO, @"You can't swizzle a nil object");
   }
diff --git a/Metrics/Tests/MetricsTests/example_report.json b/Metrics/Tests/MetricsTests/example_report.json
@@ -3404,7 +3404,7 @@
               "coverage": 0.8181818181818182
             },
             {
-              "name": "-[FIROptions isAnalyticsCollectionExpicitlySet]",
+              "name": "-[FIROptions isAnalyticsCollectionExplicitlySet]",
               "coverage": 1
             },
             {
@@ -4837,7 +4837,7 @@
               "coverage": 0.8181818181818182
             },
             {
-              "name": "-[FIROptions isAnalyticsCollectionExpicitlySet]",
+              "name": "-[FIROptions isAnalyticsCollectionExplicitlySet]",
               "coverage": 1
             },
             {
@@ -11611,7 +11611,7 @@
               "coverage": 0.8181818181818182
             },
             {
-              "name": "-[FIROptions isAnalyticsCollectionExpicitlySet]",
+              "name": "-[FIROptions isAnalyticsCollectionExplicitlySet]",
               "coverage": 1
             },
             {
@@ -15694,7 +15694,7 @@
               "coverage": 0.8181818181818182
             },
             {
-              "name": "-[FIROptions isAnalyticsCollectionExpicitlySet]",
+              "name": "-[FIROptions isAnalyticsCollectionExplicitlySet]",
               "coverage": 1
             },
             {
@@ -21414,7 +21414,7 @@
               "coverage": 0.8181818181818182
             },
             {
-              "name": "-[FIROptions isAnalyticsCollectionExpicitlySet]",
+              "name": "-[FIROptions isAnalyticsCollectionExplicitlySet]",
               "coverage": 1
             },
             {
@@ -25941,7 +25941,7 @@
               "coverage": 0.8181818181818182
             },
             {
-              "name": "-[FIROptions isAnalyticsCollectionExpicitlySet]",
+              "name": "-[FIROptions isAnalyticsCollectionExplicitlySet]",
               "coverage": 1
             },
             {
@@ -37299,7 +37299,7 @@
               "coverage": 0.8181818181818182
             },
             {
-              "name": "-[FIROptions isAnalyticsCollectionExpicitlySet]",
+              "name": "-[FIROptions isAnalyticsCollectionExplicitlySet]",
               "coverage": 1
             },
             {
diff --git a/Releases/Manifests/6.9.0.json b/Releases/Manifests/6.9.0.json
@@ -2,6 +2,7 @@
   "FirebaseCore":"6.3.0",
   "FirebaseCoreDiagnostics":"1.1.0",
   "FirebaseFirestore":"1.5.1",
+  "FirebaseMessaging":"4.1.5",
   "FirebaseRemoteConfig":"4.4.1",
   "GoogleDataTransport":"2.0.0",
   "GoogleDataTransportCCTSupport":"1.1.0"

Original file line number	Diff line number	Diff line change
`@@ -352,7 +352,7 @@ - (void)setDataCollectionDefaultEnabled:(BOOL)dataCollectionDefaultEnabled {`
`352`	`352`	`}`
`353`	`353`
`354`	`354`	`// Check if the Analytics flag is explicitly set. If so, no further actions are necessary.`
`355`		`- if ([self.options isAnalyticsCollectionExpicitlySet]) {`
	`355`	`+ if ([self.options isAnalyticsCollectionExplicitlySet]) {`
`356`	`356`	`return;`
`357`	`357`	`}`
`358`	`358`
Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,7 @@ - (BOOL)isMeasurementEnabled {`
`399`	`399`	`return [value boolValue];`
`400`	`400`	`}`
`401`	`401`
`402`		`-- (BOOL)isAnalyticsCollectionExpicitlySet {`
	`402`	`+- (BOOL)isAnalyticsCollectionExplicitlySet {`
`403`	`403`	`// If it's de-activated, it classifies as explicity set. If not, it's not a good enough indication`
`404`	`404`	`// that the developer wants FirebaseAnalytics enabled so continue checking.`
`405`	`405`	`if (self.isAnalyticsCollectionDeactivated) {`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ + (void)scheduleLocalNotificationForMessage:(NSDictionary *)message`
`149`	`149`	`#pragma clang diagnostic push`
`150`	`150`	`#pragma clang diagnostic ignored "-Wunguarded-availability"`
`151`	`151`	`notification.alertTitle = apsDictionary[kFIRMessagingContextManagerTitleKey];`
`152`		`-#pragma pop`
	`152`	`+#pragma clang diagnostic pop`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`
`@@ -175,7 +175,10 @@ + (void)scheduleLocalNotificationForMessage:(NSDictionary *)message`
`175`	`175`	`if (!application) {`
`176`	`176`	`return;`
`177`	`177`	`}`
	`178`	`+#pragma clang diagnostic push`
	`179`	`+#pragma clang diagnostic ignored "-Wdeprecated-declarations"`
`178`	`180`	`[application scheduleLocalNotification:notification];`
	`181`	`+#pragma clang diagnostic pop`
`179`	`182`	`#endif`
`180`	`183`	`}`
`181`	`184`