Skip to content

Commit 4efb73b

Browse files
authored
Merge pull request #11 from swhitty/xcode-26.2
Support Xcode 26.2 / Swift 6.2
2 parents 95c2fcb + 7c548b2 commit 4efb73b

File tree

3 files changed

+23
-9
lines changed

3 files changed

+23
-9
lines changed

.github/workflows/build.yml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ on:
66
workflow_dispatch:
77

88
jobs:
9-
xcode_16_4:
10-
runs-on: macos-15
9+
xcode_26_2:
10+
runs-on: macos-26
1111
env:
12-
DEVELOPER_DIR: /Applications/Xcode_16.4.app/Contents/Developer
12+
DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer
1313
steps:
1414
- name: Checkout
1515
uses: actions/checkout@v4
@@ -27,10 +27,24 @@ jobs:
2727
token: ${{ secrets.CODECOV_TOKEN }}
2828
files: ./coverage_report.lcov
2929

30-
xcode_26:
30+
xcode_26_1:
3131
runs-on: macos-15
3232
env:
33-
DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer
33+
DEVELOPER_DIR: /Applications/Xcode_26.1.1.app/Contents/Developer
34+
steps:
35+
- name: Checkout
36+
uses: actions/checkout@v4
37+
- name: Version
38+
run: swift --version
39+
- name: Build
40+
run: swift build --build-tests
41+
- name: Test
42+
run: swift test --skip-build
43+
44+
xcode_16_4:
45+
runs-on: macos-15
46+
env:
47+
DEVELOPER_DIR: /Applications/Xcode_16.4.app/Contents/Developer
3448
steps:
3549
- name: Checkout
3650
uses: actions/checkout@v4

Sources/TimeoutController.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public struct TimeoutController: Sendable {
6363
}
6464

6565
struct State {
66-
var running: Task<Never, any Error>?
66+
var running: Task<Void, any Error>?
6767
var pending: (@Sendable () async throws -> Never)?
6868
var isComplete: Bool = false
6969
}
@@ -122,13 +122,13 @@ extension TimeoutController {
122122
}
123123
}
124124

125-
func startPendingTask() -> Task<Never, any Error>? {
125+
func startPendingTask() -> Task<Void, any Error>? {
126126
return shared.state.withLock { s in
127127
guard let pending = s.pending else {
128128
s.isComplete = true
129129
return nil
130130
}
131-
let task = Task { try await pending() }
131+
let task = Task { _ = try await pending() }
132132
s.pending = nil
133133
s.running = task
134134
return task

Tests/Task+SleepIndefinitelyTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ struct TaskSleepIndefinitelyTests {
5151

5252
@Test
5353
func throwsWhenCancelled() async {
54-
let task = Task {
54+
let task = Task<Void, any Error> {
5555
try await Task.sleepIndefinitely()
5656
}
5757

0 commit comments

Comments
 (0)