Skip to content

Commit e8a66c3

Browse files
committed
fix: conflicting rules of swiftlint and swiftformat
1 parent a388dd2 commit e8a66c3

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

.swiftlint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ excluded:
44
- .build
55

66
disabled_rules:
7+
- opening_brace
78

89
analyzer_rules:
910
- capture_variable
@@ -49,7 +50,7 @@ opt_in_rules:
4950
- explicit_enum_raw_value
5051
- explicit_init
5152
#- explicit_top_level_acl
52-
- explicit_type_interface
53+
#- explicit_type_interface
5354
- extension_access_modifier
5455
- fallthrough
5556
- fatal_error_message
@@ -95,7 +96,6 @@ opt_in_rules:
9596
- number_separator
9697
#- object_literal
9798
- one_declaration_per_file # has been added to the source, but has not been released yet
98-
- opening_brace
9999
- operator_usage_whitespace
100100
- optional_enum_case_matching
101101
- overridden_super_call

Tests/VersionCompareTests/VersionTests.swift

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,11 @@ final class VersionTests: XCTestCase {
9898
for validVersionData in validVersionData {
9999
let version: Version? = Version(validVersionData.0)
100100
XCTAssertNotNil(version, "Expected object from string `\(validVersionData.0)` not to be nil!")
101-
XCTAssertEqual(version!.coreString, validVersionData.1, "Expected versionCode to be \(validVersionData.1), is: \(version!.coreString)")
101+
XCTAssertEqual(
102+
version!.coreString,
103+
validVersionData.1,
104+
"Expected versionCode to be \(validVersionData.1), is: \(version!.coreString)"
105+
)
102106
XCTAssertEqual(version!.debugDescription, version!.description)
103107
if let expectedExtension = validVersionData.2 {
104108
XCTAssertEqual(
@@ -117,7 +121,11 @@ final class VersionTests: XCTestCase {
117121
// equivalent to `let version: Version = ""`
118122
let version = Version(stringLiteral: validVersionData.0)
119123
XCTAssertNotNil(version, "Expected object from string `\(validVersionData.0)` not to be nil!")
120-
XCTAssertEqual(version.coreString, validVersionData.1, "Expected versionCode to be \(validVersionData.1), is: \(version.coreString)")
124+
XCTAssertEqual(
125+
version.coreString,
126+
validVersionData.1,
127+
"Expected versionCode to be \(validVersionData.1), is: \(version.coreString)"
128+
)
121129
XCTAssertEqual(version.debugDescription, version.description)
122130
if let expectedExtension = validVersionData.2 {
123131
XCTAssertEqual(
@@ -135,7 +143,11 @@ final class VersionTests: XCTestCase {
135143
// equivalent to `let version: Version = ""`
136144
let version: Version = "\(validVersionData.0)"
137145
XCTAssertNotNil(version, "Expected object from string `\(validVersionData.0)` not to be nil!")
138-
XCTAssertEqual(version.coreString, validVersionData.1, "Expected versionCode to be \(validVersionData.1), is: \(version.coreString)")
146+
XCTAssertEqual(
147+
version.coreString,
148+
validVersionData.1,
149+
"Expected versionCode to be \(validVersionData.1), is: \(version.coreString)"
150+
)
139151
XCTAssertEqual(version.debugDescription, version.description)
140152
if let expectedExtension = validVersionData.2 {
141153
XCTAssertEqual(

0 commit comments

Comments
 (0)