Skip to content

Commit e48c78d

Browse files
authored
Merge pull request #875 from Quick/bump-swift-requirement-5.3
[BREAKING] Bump Swift requirement to 5.3 (Xcode 12)
2 parents 2018a98 + f4dd5ef commit e48c78d

File tree

4 files changed

+2
-43
lines changed

4 files changed

+2
-43
lines changed

.github/workflows/ci-swiftpm.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: macos-latest
1717
strategy:
1818
matrix:
19-
xcode: [11.7, 12.4]
19+
xcode: [12.4]
2020
env:
2121
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
2222
steps:
@@ -29,7 +29,6 @@ jobs:
2929
strategy:
3030
matrix:
3131
container:
32-
- swift:5.2
3332
- swift:5.3
3433
- swift:5.4
3534
- swiftlang/swift:nightly

.github/workflows/ci-xcode.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: macos-latest
1717
strategy:
1818
matrix:
19-
xcode: [11.7, 12.4]
19+
xcode: [12.4]
2020
platform: [macos, ios, tvos]
2121
fail-fast: false
2222
env:

[email protected]

Lines changed: 0 additions & 36 deletions
This file was deleted.

Sources/Nimble/Adapters/NimbleXCTestHandler.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,10 @@ public func recordFailure(_ message: String, location: SourceLocation) {
7878
#else
7979
if let testCase = CurrentTestCaseTracker.sharedInstance.currentTestCase {
8080
let line = Int(location.line)
81-
#if swift(>=5.3)
8281
let location = XCTSourceCodeLocation(filePath: location.file, lineNumber: line)
8382
let sourceCodeContext = XCTSourceCodeContext(location: location)
8483
let issue = XCTIssue(type: .assertionFailure, compactDescription: message, sourceCodeContext: sourceCodeContext)
8584
testCase.record(issue)
86-
#else
87-
testCase.recordFailure(withDescription: message, inFile: location.file, atLine: line, expected: true)
88-
#endif
8985
} else {
9086
let msg = """
9187
Attempted to report a test failure to XCTest while no test case was running. The failure was:

0 commit comments

Comments
 (0)