Skip to content

Commit 3847660

Browse files
authored
Merge pull request #551 from firebase/mrschmidt-format
Running scripts/style.sh
2 parents b3b3987 + 03ab864 commit 3847660

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

Example/Core/Tests/FIRAppTest.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ - (void)testConfigure {
9595
}
9696

9797
- (void)testConfigureWithOptions {
98-
// nil options
98+
// nil options
9999
#pragma clang diagnostic push
100100
#pragma clang diagnostic ignored "-Wnonnull"
101101
XCTAssertThrows([FIRApp configureWithOptions:nil]);
@@ -119,7 +119,7 @@ - (void)testConfigureWithOptions {
119119
}
120120

121121
- (void)testConfigureWithCustomizedOptions {
122-
// valid customized options
122+
// valid customized options
123123
#pragma clang diagnostic push
124124
#pragma clang diagnostic ignored "-Wnonnull"
125125
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
@@ -194,7 +194,7 @@ - (void)testConfigureWithNameAndCustomizedOptions {
194194
XCTAssertTrue([FIRApp allApps].count == 1);
195195
self.app = [FIRApp appNamed:kFIRTestAppName1];
196196

197-
// Configure a different app with valid customized options
197+
// Configure a different app with valid customized options
198198
#pragma clang diagnostic push
199199
#pragma clang diagnostic ignored "-Wnonnull"
200200
#pragma clang diagnostic ignored "-Wdeprecated-declarations"

Example/Core/Tests/FIRLoggerTest.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ - (void)testMessageCodeFormat {
148148
// Lowercase should fail.
149149
XCTAssertThrows(FIRLogError(kFIRLoggerCore, @"I-app000001", @"Message."));
150150

151-
// nil or empty message code should fail.
151+
// nil or empty message code should fail.
152152
#pragma clang diagnostic push
153153
#pragma clang diagnostic ignored "-Wnonnull"
154154
XCTAssertThrows(FIRLogError(kFIRLoggerCore, nil, @"Message."));

Example/Core/Tests/FIROptionsTest.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ - (void)testInitCustomizedOptions {
111111
XCTAssertEqualObjects(options2.deepLinkURLScheme, kDeepLinkURLScheme);
112112
XCTAssertFalse(options.usingOptionsFromDefaultPlist);
113113

114-
// nil GoogleAppID should throw an exception
114+
// nil GoogleAppID should throw an exception
115115
#pragma clang diagnostic push
116116
#pragma clang diagnostic ignored "-Wnonnull"
117117
#pragma clang diagnostic ignored "-Wdeprecated-declarations"

Firebase/Core/FIRApp.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,8 @@ + (void)configureDefaultAppWithOptions:(FIROptions *)options
142142

143143
NSString *minVersion = info[@"MinimumOSVersion"];
144144
if ([minVersion hasPrefix:@"7."]) {
145-
FIRLogNotice(kFIRLoggerCore, @"I-COR000026", @"Support for iOS 7 is deprecated and will "
145+
FIRLogNotice(kFIRLoggerCore, @"I-COR000026",
146+
@"Support for iOS 7 is deprecated and will "
146147
@"stop working in the future. Please upgrade your app to target iOS 8 or "
147148
@"above.");
148149
}

0 commit comments

Comments
 (0)