Skip to content

Commit b594723

Browse files
authored
Update formatters for the Xcode 10.3 Travis image (#3739)
1 parent e374338 commit b594723

File tree

5 files changed

+20
-12
lines changed

5 files changed

+20
-12
lines changed

Example/Database/Tests/Integration/FOrderByTests.m

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,9 @@ - (void)testFiresChildMovedEvents {
235235
moved = YES;
236236
XCTAssertEqualObjects(snapshot.key, @"greg", @"");
237237
XCTAssertEqualObjects(prevName, @"rob", @"");
238-
XCTAssertEqualObjects(snapshot.value, @{@"nuggets" : @57}, @"");
238+
XCTAssertEqualObjects(
239+
snapshot.value,
240+
@{@"nuggets" : @57}, @"");
239241
}];
240242

241243
[ref setValue:initial];

FirebaseInstallations/Source/Tests/Unit/FIRInstallationsAPIServiceTests.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -436,9 +436,9 @@ - (id)refreshTokenRequestValidationArgWithInstallation:(FIRInstallationsItem *)i
436436
error:&error];
437437
XCTAssertNotNil(body, @"Error: %@, test: %@", error, self.name);
438438

439-
XCTAssertEqualObjects(body,
440-
@{@"installation" : @{@"sdkVersion" : [self SDKVersion]}}, @"%@",
441-
self.name);
439+
XCTAssertEqualObjects(
440+
body,
441+
@{@"installation" : @{@"sdkVersion" : [self SDKVersion]}}, @"%@", self.name);
442442

443443
return YES;
444444
}];

FirebaseRemoteConfig/Sources/RCNConfigDBManager.m

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -762,10 +762,11 @@ - (void)loadExperimentWithCompletionHandler:(RCNDBCompletion)handler {
762762

763763
if (handler) {
764764
dispatch_async(dispatch_get_main_queue(), ^{
765-
handler(YES, @{
766-
@RCNExperimentTableKeyPayload : [experimentPayloads copy],
767-
@RCNExperimentTableKeyMetadata : [experimentMetadata copy]
768-
});
765+
handler(
766+
YES, @{
767+
@RCNExperimentTableKeyPayload : [experimentPayloads copy],
768+
@RCNExperimentTableKeyMetadata : [experimentMetadata copy]
769+
});
769770
});
770771
}
771772
});

Firestore/Swift/Tests/Integration/CodableIntegrationTests.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ class CodableIntegrationTests: FSTIntegrationTestCase {
6767
return nil
6868
}) { object, error in
6969
completion?(error)
70-
} }
70+
}
71+
}
7172

7273
awaitExpectations()
7374
}
@@ -147,7 +148,7 @@ class CodableIntegrationTests: FSTIntegrationTestCase {
147148
struct Model: Encodable {
148149
var name: String
149150
var explicitNull: ExplicitNull<String>
150-
var optional: Optional<String>
151+
var optional: String?
151152
}
152153
let model = Model(
153154
name: "name",

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,17 @@ Travis will verify that any code changes are done in a style compliant way. Inst
9898
These commands will get the right versions:
9999

100100
```
101-
brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/773cb75d360b58f32048f5964038d09825a507c8/Formula/clang-format.rb
102-
brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/3dfea1004e0736754bbf49673cca8aaed8a94089/Formula/swiftformat.rb
101+
brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/e3496d9/Formula/clang-format.rb
102+
brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/7963c3d/Formula/swiftformat.rb
103103
```
104104

105105
Note: if you already have a newer version of these installed you may need to
106106
`brew switch` to this version.
107107

108+
To update this section, find the versions of clang-format and swiftformat.rb to
109+
match the versions in the CI failure logs
110+
[here](https://github.com/Homebrew/homebrew-core/tree/master/Formula).
111+
108112
### Running Unit Tests
109113

110114
Select a scheme and press Command-u to build a component and run its unit tests.

0 commit comments

Comments
 (0)