Travis to Xcode 10.1 and clang-format to 8.0.0 (tags/google/stable/2018-08-24)

.travis.yml

@@ -1,5 +1,5 @@
 os: osx
-osx_image: xcode10
+osx_image: xcode10.1
 language: objective-c
 cache:
   - bundler

Example/Core/Tests/FIRAnalyticsConfigurationTest.m

@@ -99,19 +99,15 @@ - (void)testSettingAnalyticsCollectionEnabled {
   [self.observerMock setExpectationOrderMatters:YES];
   [[self.observerMock expect] notificationWithName:notificationName
                                             object:config
-                                          userInfo:@{
-                                            notificationName : @YES
-                                          }];
+                                          userInfo:@{notificationName : @YES}];
 
   // Test setting to enabled.
   [config setAnalyticsCollectionEnabled:YES];
 
   // Expect the second notification.
   [[self.observerMock expect] notificationWithName:notificationName
                                             object:config
-                                          userInfo:@{
-                                            notificationName : @NO
-                                          }];
+                                          userInfo:@{notificationName : @NO}];
 
   // Test setting to disabled.
   [config setAnalyticsCollectionEnabled:NO];

Example/Core/Tests/FIROptionsTest.m

@@ -82,8 +82,8 @@ - (void)testDefaultOptions {
 }
 
 - (void)testInitCustomizedOptions {
-  FIROptions *options =
-      [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID GCMSenderID:kGCMSenderID];
+  FIROptions *options = [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID
+                                                    GCMSenderID:kGCMSenderID];
   options.APIKey = kAPIKey;
   options.bundleID = kBundleID;
   options.clientID = kClientID;
@@ -98,8 +98,8 @@ - (void)testInitCustomizedOptions {
 }
 
 - (void)testInitWithContentsOfFile {
-  NSString *filePath =
-      [[NSBundle mainBundle] pathForResource:@"GoogleService-Info" ofType:@"plist"];
+  NSString *filePath = [[NSBundle mainBundle] pathForResource:@"GoogleService-Info"
+                                                       ofType:@"plist"];
   FIROptions *options = [[FIROptions alloc] initWithContentsOfFile:filePath];
   [self assertOptionsMatchDefaults:options andProjectID:YES];
   XCTAssertNil(options.deepLinkURLScheme);
@@ -136,8 +136,8 @@ - (void)assertOptionsMatchDefaults:(FIROptions *)options andProjectID:(BOOL)matc
 
 - (void)testCopyingProperties {
   NSMutableString *mutableString;
-  FIROptions *options =
-      [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID GCMSenderID:kGCMSenderID];
+  FIROptions *options = [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID
+                                                    GCMSenderID:kGCMSenderID];
   mutableString = [[NSMutableString alloc] initWithString:@"1"];
   options.APIKey = mutableString;
   [mutableString appendString:@"2"];
@@ -208,8 +208,8 @@ - (void)testCopyWithZone {
   XCTAssertEqualObjects(newOptions.deepLinkURLScheme, kDeepLinkURLScheme);
 
   // customized options
-  FIROptions *customizedOptions =
-      [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID GCMSenderID:kGCMSenderID];
+  FIROptions *customizedOptions = [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID
+                                                              GCMSenderID:kGCMSenderID];
   customizedOptions.deepLinkURLScheme = kDeepLinkURLScheme;
   FIROptions *copyCustomizedOptions = [customizedOptions copy];
   [copyCustomizedOptions setDeepLinkURLScheme:kNewDeepLinkURLScheme];
@@ -466,20 +466,16 @@ - (void)testAnalyticsCollectionGlobalSwitchOverrideToDisable {
   OCMStub([appMock isDataCollectionDefaultEnabled]).andReturn(YES);
 
   // Test the three Analytics flags that override to disable Analytics collection.
-  FIROptions *collectionEnabledOptions = [[FIROptions alloc] initInternalWithOptionsDictionary:@{
-    kFIRIsAnalyticsCollectionEnabled : @NO
-  }];
+  FIROptions *collectionEnabledOptions = [[FIROptions alloc]
+      initInternalWithOptionsDictionary:@{kFIRIsAnalyticsCollectionEnabled : @NO}];
   XCTAssertFalse(collectionEnabledOptions.isAnalyticsCollectionEnabled);
 
-  FIROptions *collectionDeactivatedOptions =
-      [[FIROptions alloc] initInternalWithOptionsDictionary:@{
-        kFIRIsAnalyticsCollectionDeactivated : @YES
-      }];
+  FIROptions *collectionDeactivatedOptions = [[FIROptions alloc]
+      initInternalWithOptionsDictionary:@{kFIRIsAnalyticsCollectionDeactivated : @YES}];
   XCTAssertFalse(collectionDeactivatedOptions.isAnalyticsCollectionEnabled);
 
-  FIROptions *measurementEnabledOptions = [[FIROptions alloc] initInternalWithOptionsDictionary:@{
-    kFIRIsMeasurementEnabled : @NO
-  }];
+  FIROptions *measurementEnabledOptions =
+      [[FIROptions alloc] initInternalWithOptionsDictionary:@{kFIRIsMeasurementEnabled : @NO}];
   XCTAssertFalse(measurementEnabledOptions.isAnalyticsCollectionEnabled);
 }
 
@@ -491,14 +487,12 @@ - (void)testAnalyticsCollectionGlobalSwitchOverrideToEnable {
   OCMStub([appMock isDataCollectionDefaultEnabled]).andReturn(NO);
 
   // Test the two Analytics flags that can override and enable collection.
-  FIROptions *collectionEnabledOptions = [[FIROptions alloc] initInternalWithOptionsDictionary:@{
-    kFIRIsAnalyticsCollectionEnabled : @YES
-  }];
+  FIROptions *collectionEnabledOptions = [[FIROptions alloc]
+      initInternalWithOptionsDictionary:@{kFIRIsAnalyticsCollectionEnabled : @YES}];
   XCTAssertTrue(collectionEnabledOptions.isAnalyticsCollectionEnabled);
 
-  FIROptions *measurementEnabledOptions = [[FIROptions alloc] initInternalWithOptionsDictionary:@{
-    kFIRIsMeasurementEnabled : @YES
-  }];
+  FIROptions *measurementEnabledOptions =
+      [[FIROptions alloc] initInternalWithOptionsDictionary:@{kFIRIsMeasurementEnabled : @YES}];
   XCTAssertTrue(measurementEnabledOptions.isAnalyticsCollectionEnabled);
 }
 
@@ -534,31 +528,27 @@ - (void)testAnalyticsCollectionExplicitlySet {
 
   // Test the old measurement flag.
   options = [[FIROptions alloc] initInternalWithOptionsDictionary:@{}];
-  analyticsOptions = [options analyticsOptionsDictionaryWithInfoDictionary:@{
-    kFIRIsMeasurementEnabled : @YES
-  }];
+  analyticsOptions =
+      [options analyticsOptionsDictionaryWithInfoDictionary:@{kFIRIsMeasurementEnabled : @YES}];
   XCTAssertTrue([options isAnalyticsCollectionExpicitlySet]);
 
   options = [[FIROptions alloc] initInternalWithOptionsDictionary:@{}];
-  analyticsOptions = [options analyticsOptionsDictionaryWithInfoDictionary:@{
-    kFIRIsMeasurementEnabled : @NO
-  }];
+  analyticsOptions =
+      [options analyticsOptionsDictionaryWithInfoDictionary:@{kFIRIsMeasurementEnabled : @NO}];
   XCTAssertTrue([options isAnalyticsCollectionExpicitlySet]);
 
   // For good measure, a combination of all 3 (even if they conflict).
   optionsDictionary =
-      @{kFIRIsAnalyticsCollectionDeactivated : @YES,
-        kFIRIsAnalyticsCollectionEnabled : @YES};
+      @{kFIRIsAnalyticsCollectionDeactivated : @YES, kFIRIsAnalyticsCollectionEnabled : @YES};
   options = [[FIROptions alloc] initInternalWithOptionsDictionary:optionsDictionary];
-  analyticsOptions = [options analyticsOptionsDictionaryWithInfoDictionary:@{
-    kFIRIsMeasurementEnabled : @NO
-  }];
+  analyticsOptions =
+      [options analyticsOptionsDictionaryWithInfoDictionary:@{kFIRIsMeasurementEnabled : @NO}];
   XCTAssertTrue([options isAnalyticsCollectionExpicitlySet]);
 }
 
 - (void)testModifyingOptionsThrows {
-  FIROptions *options =
-      [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID GCMSenderID:kGCMSenderID];
+  FIROptions *options = [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID
+                                                    GCMSenderID:kGCMSenderID];
   options.editingLocked = YES;
 
   // Modification to every property should result in an exception.

Example/DynamicLinks/FDLBuilderTestAppObjCTests/FDLBuilderTestAppObjCEarlGreyTests.m

@@ -33,8 +33,9 @@ @implementation FDLBuilderTestAppObjCEarlGreyTests
 - (void)testOpenFDLFromAppGeneratedLink {
   // On first launch, a null FDL Received alert is displayed (by design); in
   // this case, we need to dismiss it in order to proceed
-  BOOL hasFirstInstallAlertDisplayed =
-      [self confirmPresenceOfFDLAlertWithURL:@"(null)" matchType:@"0" minimumAppVersion:@"(null)"];
+  BOOL hasFirstInstallAlertDisplayed = [self confirmPresenceOfFDLAlertWithURL:@"(null)"
+                                                                    matchType:@"0"
+                                                            minimumAppVersion:@"(null)"];
   if (hasFirstInstallAlertDisplayed) {
     [[EarlGrey selectElementWithMatcher:[GREYMatchers matcherForText:@"Dismiss"]]
         performAction:grey_tap()];

Example/DynamicLinks/Tests/FDLURLComponentsTests.m

@@ -104,8 +104,9 @@ - (void)testAnalyticsParamsDictionaryRepresentationReturnsCorrectDictionaryEmpty
 }
 
 - (void)testAnalyticsParamsFactoryWithParamsReturnsInstanceOfCorrectClass {
-  id returnValue =
-      [FIRDynamicLinkGoogleAnalyticsParameters parametersWithSource:@"s" medium:@"m" campaign:@"c"];
+  id returnValue = [FIRDynamicLinkGoogleAnalyticsParameters parametersWithSource:@"s"
+                                                                          medium:@"m"
+                                                                        campaign:@"c"];
   XCTAssertTrue([returnValue isKindOfClass:[FIRDynamicLinkGoogleAnalyticsParameters class]]);
 }
 

Example/DynamicLinks/Tests/UtilitiesTests.m

@@ -29,10 +29,9 @@ - (void)testFDLCookieRetrievalURLCreatesCorrectURL {
   static NSString *const kCustomScheme = @"customscheme";
   static NSString *const kBundleID = @"com.My.Bundle.ID";
 
-  NSString *expectedURLString = [NSString stringWithFormat:
-                                              @"https://goo.gl/app/_/deeplink?fdl_ios_"
-                                               "bundle_id=%@&fdl_ios_url_scheme=%@",
-                                              kBundleID, kCustomScheme];
+  NSString *expectedURLString = [NSString stringWithFormat:@"https://goo.gl/app/_/deeplink?fdl_ios_"
+                                                            "bundle_id=%@&fdl_ios_url_scheme=%@",
+                                                           kBundleID, kCustomScheme];
 
   NSURL *url = FIRDLCookieRetrievalURL(kCustomScheme, kBundleID);
 
@@ -149,20 +148,19 @@ - (void)testDeepLinkURLWithInviteIDDeepLinkStringWeakMatchEndpointCreatesExpecte
   NSString *matchType = @"unique";
 
   NSString *expectedURLString =
-      [NSString stringWithFormat:
-                    @"%@://google/link/?utm_campaign=%@"
-                    @"&deep_link_id=%@&utm_medium=%@&invitation_weakMatchEndpoint=%@"
-                    @"&utm_source=%@&invitation_id=%@&match_type=%@",
-                    kURLScheme, utmCampaign, encodedDeepLinkString, utmMedium, weakMatchEndpoint,
-                    utmSource, inviteID, matchType];
+      [NSString stringWithFormat:@"%@://google/link/?utm_campaign=%@"
+                                 @"&deep_link_id=%@&utm_medium=%@&invitation_weakMatchEndpoint=%@"
+                                 @"&utm_source=%@&invitation_id=%@&match_type=%@",
+                                 kURLScheme, utmCampaign, encodedDeepLinkString, utmMedium,
+                                 weakMatchEndpoint, utmSource, inviteID, matchType];
   NSURLComponents *expectedURLComponents = [NSURLComponents componentsWithString:expectedURLString];
 
   NSURL *actualURL =
       FIRDLDeepLinkURLWithInviteID(inviteID, deepLinkString, utmSource, utmMedium, utmCampaign, NO,
                                    weakMatchEndpoint, nil, kURLScheme, nil);
 
-  NSURLComponents *actualURLComponents =
-      [NSURLComponents componentsWithURL:actualURL resolvingAgainstBaseURL:NO];
+  NSURLComponents *actualURLComponents = [NSURLComponents componentsWithURL:actualURL
+                                                    resolvingAgainstBaseURL:NO];
 
   // Since the parameters are not guaranteed to be in any specific order, we must compare
   // arrays of properties of the URLs rather than the URLs themselves.

Example/Shared/FIRSampleAppUtilities.m

@@ -26,13 +26,12 @@
 NSString *const kGithubRepoURLString = @"https://github.com/firebase/firebase-ios-sdk/";
 // Alert contents
 NSString *const kInvalidPlistAlertTitle = @"GoogleService-Info.plist";
-NSString *const kInvalidPlistAlertMessage =
-    @"This sample app needs to be updated with a valid "
-    @"GoogleService-Info.plist file in order to configure "
-    @"Firebase.\n\n"
-    @"Please update the app with a valid plist file, "
-    @"following the instructions in the Firebase Github "
-    @"repository at: %@";
+NSString *const kInvalidPlistAlertMessage = @"This sample app needs to be updated with a valid "
+                                            @"GoogleService-Info.plist file in order to configure "
+                                            @"Firebase.\n\n"
+                                            @"Please update the app with a valid plist file, "
+                                            @"following the instructions in the Firebase Github "
+                                            @"repository at: %@";
 
 @implementation FIRSampleAppUtilities
 
@@ -52,8 +51,8 @@ + (BOOL)containsRealServiceInfoPlistInBundle:(NSBundle *)bundle {
     return NO;
   }
 
-  NSString *plistFilePath =
-      [bundle pathForResource:kServiceInfoFileName ofType:kServiceInfoFileType];
+  NSString *plistFilePath = [bundle pathForResource:kServiceInfoFileName
+                                             ofType:kServiceInfoFileType];
   if (!plistFilePath.length) {
     return NO;
   }
@@ -91,8 +90,9 @@ + (void)presentAlertForInvalidServiceInfoPlistFromViewController:
               }];
   [alertController addAction:viewReadmeAction];
 
-  UIAlertAction *cancelAction =
-      [UIAlertAction actionWithTitle:@"Close" style:UIAlertActionStyleCancel handler:nil];
+  UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"Close"
+                                                         style:UIAlertActionStyleCancel
+                                                       handler:nil];
   [alertController addAction:cancelAction];
 
   [viewController presentViewController:alertController animated:YES completion:nil];

Example/Storage/Tests/Integration/FIRStorageIntegrationTests.m

@@ -69,8 +69,8 @@ - (void)setUp {
     XCTestExpectation *expectation = [self expectationWithDescription:@"setup"];
 
     FIRStorageReference *ref = [[FIRStorage storage].reference child:@"ios/public/1mb"];
-    NSData *data = [NSData
-        dataWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"1mb" ofType:@"dat"]];
+    NSData *data = [NSData dataWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"1mb"
+                                                                                  ofType:@"dat"]];
     XCTAssertNotNil(data, "Could not load bundled file");
     [ref putData:data
           metadata:nil

Example/Storage/Tests/Unit/FIRStorageComponentTests.m

@@ -64,8 +64,8 @@ - (void)testMultipleComponentInstancesCreated {
   // App isn't used in any of this, so a simple class mock works for simplicity.
   id app = OCMClassMock([FIRApp class]);
   NSMutableSet *registrants = [NSMutableSet setWithObject:[FIRStorageComponent class]];
-  FIRComponentContainer *container =
-      [[FIRComponentContainer alloc] initWithApp:app registrants:registrants];
+  FIRComponentContainer *container = [[FIRComponentContainer alloc] initWithApp:app
+                                                                    registrants:registrants];
   id<FIRStorageMultiBucketProvider> provider1 =
       FIR_COMPONENT(FIRStorageMultiBucketProvider, container);
   XCTAssertNotNil(provider1);
@@ -84,8 +84,8 @@ - (void)testMultipleStorageInstancesCreated {
   // implementation.
   id app = [self appMockWithOptions];
   NSMutableSet *registrants = [NSMutableSet setWithObject:[FIRStorageComponent class]];
-  FIRComponentContainer *container =
-      [[FIRComponentContainer alloc] initWithApp:app registrants:registrants];
+  FIRComponentContainer *container = [[FIRComponentContainer alloc] initWithApp:app
+                                                                    registrants:registrants];
   id<FIRStorageMultiBucketProvider> provider =
       FIR_COMPONENT(FIRStorageMultiBucketProvider, container);
   XCTAssertNotNil(provider);

Example/Storage/Tests/Unit/FIRStorageTestHelpers.m

@@ -45,8 +45,8 @@ + (FIRApp *)mockedApp {
   // correct contents.
   id app = OCMClassMock([FIRApp class]);
   NSMutableSet<Class> *registrants = [NSMutableSet setWithObject:[FIRStorageComponent class]];
-  FIRComponentContainer *container =
-      [[FIRComponentContainer alloc] initWithApp:app registrants:registrants];
+  FIRComponentContainer *container = [[FIRComponentContainer alloc] initWithApp:app
+                                                                    registrants:registrants];
   OCMStub([app container]).andReturn(container);
   return app;
 }

Example/Storage/Tests/Unit/FIRStorageTests.m

@@ -57,8 +57,8 @@ - (void)testBucketNotEnforced {
 }
 
 - (void)testBucketEnforced {
-  FIRStorage *storage =
-      [FIRStorage storageForApp:self.app URL:@"gs://benwu-test1.storage.firebase.com"];
+  FIRStorage *storage = [FIRStorage storageForApp:self.app
+                                              URL:@"gs://benwu-test1.storage.firebase.com"];
   [storage referenceForURL:@"gs://benwu-test1.storage.firebase.com/child"];
   storage = [FIRStorage storageForApp:self.app URL:@"gs://benwu-test1.storage.firebase.com/"];
   [storage referenceForURL:@"gs://benwu-test1.storage.firebase.com/child"];

Example/Storage/Tests/Unit/FIRStorageTokenAuthorizerTests.m

@@ -32,8 +32,9 @@ - (void)setUp {
   self.fetcher = [GTMSessionFetcher fetcherWithRequest:fetchRequest];
 
   GTMSessionFetcherService *fetcherService = [[GTMSessionFetcherService alloc] init];
-  FIRAuthInteropFake *auth =
-      [[FIRAuthInteropFake alloc] initWithToken:kFIRStorageTestAuthToken userID:nil error:nil];
+  FIRAuthInteropFake *auth = [[FIRAuthInteropFake alloc] initWithToken:kFIRStorageTestAuthToken
+                                                                userID:nil
+                                                                 error:nil];
   self.fetcher.authorizer = [[FIRStorageTokenAuthorizer alloc] initWithGoogleAppID:@"dummyAppID"
                                                                     fetcherService:fetcherService
                                                                       authProvider:auth];
@@ -78,8 +79,9 @@ - (void)testUnsuccessfulAuth {
   NSError *authError = [NSError errorWithDomain:FIRStorageErrorDomain
                                            code:FIRStorageErrorCodeUnauthenticated
                                        userInfo:nil];
-  FIRAuthInteropFake *failedAuth =
-      [[FIRAuthInteropFake alloc] initWithToken:nil userID:nil error:authError];
+  FIRAuthInteropFake *failedAuth = [[FIRAuthInteropFake alloc] initWithToken:nil
+                                                                      userID:nil
+                                                                       error:authError];
   GTMSessionFetcherService *fetcherService = [[GTMSessionFetcherService alloc] init];
   self.fetcher.authorizer = [[FIRStorageTokenAuthorizer alloc] initWithGoogleAppID:@"dummyAppID"
                                                                     fetcherService:fetcherService