Merge pull request #163 from swhitty/swift-6.2

swhitty · web-flow · commit 6380e565d2aa · 2025-07-01T13:16:42.000+10:00
Swift 6.2
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -39,10 +39,10 @@ jobs:
           junit: result-swift-testing.xml
           coverage: .build/debug/codecov/FlyingFox.json
 
-  xcode_16_2:
+  xcode_26:
     runs-on: macos-15
     env:
-      DEVELOPER_DIR: /Applications/Xcode_16.2.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -53,10 +53,10 @@ jobs:
       - name: Test
         run: swift test --skip-build
 
-  xcode_15_4:
-    runs-on: macos-14
+  xcode_16_2:
+    runs-on: macos-15
     env:
-      DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_16.2.app/Contents/Developer
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -67,10 +67,10 @@ jobs:
       - name: Test
         run: swift test --skip-build
 
-  xcode_15_2:
+  xcode_15_4:
     runs-on: macos-14
     env:
-      DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -94,9 +94,9 @@ jobs:
       - name: Test
         run: swift test --skip-build
 
-  linux_swift_5_9:
+  linux_swift_6_0:
     runs-on: ubuntu-latest
-    container: swift:5.9
+    container: swift:6.0
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -107,9 +107,9 @@ jobs:
       - name: Test
         run: swift test --skip-build
 
-  linux_swift_6_0:
+  linux_swift_6_1:
     runs-on: ubuntu-latest
-    container: swift:6.0
+    container: swift:6.1.2
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -120,9 +120,9 @@ jobs:
       - name: Test
         run: swift test --skip-build
 
-  linux_swift_6_1:
+  linux_swift_6_2:
     runs-on: ubuntu-latest
-    container: swift:6.1.2
+    container: swiftlang/swift:nightly-6.2-noble
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/FlyingSocks/Sources/SwiftSupport.swift b/FlyingSocks/Sources/SwiftSupport.swift
@@ -29,6 +29,6 @@
 //  SOFTWARE.
 //
 
-#if compiler(<5.10)
-#warning("FlyingFox will soon remove support for Swift 5.9")
+#if compiler(<6.0)
+#warning("FlyingFox will soon remove support for Swift 5.10")
 #endif
diff --git a/FlyingSocks/Tests/IdentifiableContinuationTests.swift b/FlyingSocks/Tests/IdentifiableContinuationTests.swift
@@ -219,40 +219,30 @@ private actor Waiter<T: Sendable, E: Error> {
     }
 
     private func addContinuation(_ continuation: Continuation) {
-        safeAssertIsolated()
+        assertIsolated()
         waiting[continuation.id] = continuation
     }
 
     private func resumeID(_ id: Continuation.ID, returning value: T) {
-        safeAssertIsolated()
+        assertIsolated()
         if let continuation = waiting.removeValue(forKey: id) {
             continuation.resume(returning: value)
         }
     }
 
     private func resumeID(_ id: Continuation.ID, throwing error: E) {
-        safeAssertIsolated()
+        assertIsolated()
         if let continuation = waiting.removeValue(forKey: id) {
             continuation.resume(throwing: error)
         }
     }
 
     private func resumeID(_ id: Continuation.ID, with result: Result<T, E>) {
-        safeAssertIsolated()
+        assertIsolated()
         if let continuation = waiting.removeValue(forKey: id) {
             continuation.resume(with: result)
         }
     }
-
-    private func safeAssertIsolated() {
-#if compiler(>=5.10)
-        assertIsolated()
-#elseif compiler(>=5.9)
-        if #available(macOS 14.0, iOS 17.0, watchOS 10.0, tvOS 17.0, *) {
-            assertIsolated()
-        }
-#endif
-    }
 }
 
 private extension Actor {
diff --git a/FlyingSocks/XCTests/IdentifiableContinuationTests.swift b/FlyingSocks/XCTests/IdentifiableContinuationTests.swift
@@ -202,40 +202,30 @@ private actor Waiter<T: Sendable, E: Error> {
     }
 
     private func addContinuation(_ continuation: Continuation) {
-        safeAssertIsolated()
+        assertIsolated()
         waiting[continuation.id] = continuation
     }
 
     private func resumeID(_ id: Continuation.ID, returning value: T) {
-        safeAssertIsolated()
+        assertIsolated()
         if let continuation = waiting.removeValue(forKey: id) {
             continuation.resume(returning: value)
         }
     }
 
     private func resumeID(_ id: Continuation.ID, throwing error: E) {
-        safeAssertIsolated()
+        assertIsolated()
         if let continuation = waiting.removeValue(forKey: id) {
             continuation.resume(throwing: error)
         }
     }
 
     private func resumeID(_ id: Continuation.ID, with result: Result<T, E>) {
-        safeAssertIsolated()
+        assertIsolated()
         if let continuation = waiting.removeValue(forKey: id) {
             continuation.resume(with: result)
         }
     }
-
-    private func safeAssertIsolated() {
-#if compiler(>=5.10)
-        assertIsolated()
-#elseif compiler(>=5.9)
-        if #available(macOS 14.0, iOS 17.0, watchOS 10.0, tvOS 17.0, *) {
-            assertIsolated()
-        }
-#endif
-    }
 }
 
 private extension Actor {
diff --git a/FlyingSocks/XCTests/Task+TimeoutTests.swift b/FlyingSocks/XCTests/Task+TimeoutTests.swift
@@ -149,9 +149,9 @@ final class TaskTimeoutTests: XCTestCase {
     @MainActor
     func testMainActor_ReturnsValue() async throws {
         let val = try await withThrowingTimeout(seconds: 1) {
-            MainActor.safeAssertIsolated()
+            MainActor.assertIsolated()
             try await Task.sleep(nanoseconds: 1_000)
-            MainActor.safeAssertIsolated()
+            MainActor.assertIsolated()
             return "Fish"
         }
         XCTAssertEqual(val, "Fish")
@@ -161,8 +161,8 @@ final class TaskTimeoutTests: XCTestCase {
     func testMainActorThrowsError_WhenTimeoutExpires() async {
         do {
             try await withThrowingTimeout(seconds: 0.05) {
-                MainActor.safeAssertIsolated()
-                defer { MainActor.safeAssertIsolated() }
+                MainActor.assertIsolated()
+                defer { MainActor.assertIsolated() }
                 try await Task.sleep(nanoseconds: 60_000_000_000)
             }
             XCTFail("Expected Error")
@@ -262,21 +262,8 @@ private final actor TestActor<T: Sendable> {
     func returningValue(after sleep: TimeInterval = 0, timeout: TimeInterval = 1) async throws -> T {
         try await withThrowingTimeout(seconds: timeout) {
             try await Task.sleep(nanoseconds: UInt64(sleep * 1_000_000_000))
-            #if compiler(>=5.10)
             self.assertIsolated()
-            #endif
             return self.value
         }
     }
 }
-
-private extension MainActor {
-
-    static func safeAssertIsolated() {
-    #if compiler(>=5.10)
-        assertIsolated()
-    #else
-        precondition(Thread.isMainThread)
-    #endif
-    }
-}
diff --git a/Package@swift-5.10.swift b/Package@swift-5.10.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.9
+// swift-tools-version:5.10
 
 import PackageDescription
 
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@
 
 FlyingFox can be installed by using Swift Package Manager.
 
-**Note:** FlyingFox requires Swift 5.9 on Xcode 15+. It runs on iOS 13+, tvOS 13+, watchOS 8+, macOS 10.15+ and Linux. Android and Windows 10 support is experimental.
+**Note:** FlyingFox requires Swift 5.10 on Xcode 15.4+. It runs on iOS 13+, tvOS 13+, watchOS 8+, macOS 10.15+ and Linux. Android and Windows 10 support is experimental.
 
 To install using Swift Package Manager, add this to the `dependencies:` section in your Package.swift file:
 

Original file line number	Diff line number	Diff line change
`@@ -219,40 +219,30 @@ private actor Waiter<T: Sendable, E: Error> {`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`private func addContinuation(_ continuation: Continuation) {`
`222`		`- safeAssertIsolated()`
	`222`	`+ assertIsolated()`
`223`	`223`	`waiting[continuation.id] = continuation`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`private func resumeID(_ id: Continuation.ID, returning value: T) {`
`227`		`- safeAssertIsolated()`
	`227`	`+ assertIsolated()`
`228`	`228`	`if let continuation = waiting.removeValue(forKey: id) {`
`229`	`229`	`continuation.resume(returning: value)`
`230`	`230`	`}`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`private func resumeID(_ id: Continuation.ID, throwing error: E) {`
`234`		`- safeAssertIsolated()`
	`234`	`+ assertIsolated()`
`235`	`235`	`if let continuation = waiting.removeValue(forKey: id) {`
`236`	`236`	`continuation.resume(throwing: error)`
`237`	`237`	`}`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`private func resumeID(_ id: Continuation.ID, with result: Result<T, E>) {`
`241`		`- safeAssertIsolated()`
	`241`	`+ assertIsolated()`
`242`	`242`	`if let continuation = waiting.removeValue(forKey: id) {`
`243`	`243`	`continuation.resume(with: result)`
`244`	`244`	`}`
`245`	`245`	`}`
`246`		`-`
`247`		`- private func safeAssertIsolated() {`
`248`		`-#if compiler(>=5.10)`
`249`		`- assertIsolated()`
`250`		`-#elseif compiler(>=5.9)`
`251`		`- if #available(macOS 14.0, iOS 17.0, watchOS 10.0, tvOS 17.0, *) {`
`252`		`- assertIsolated()`
`253`		`- }`
`254`		`-#endif`
`255`		`- }`
`256`	`246`	`}`
`257`	`247`
`258`	`248`	`private extension Actor {`
Original file line number	Diff line number	Diff line change
`@@ -202,40 +202,30 @@ private actor Waiter<T: Sendable, E: Error> {`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`private func addContinuation(_ continuation: Continuation) {`
`205`		`- safeAssertIsolated()`
	`205`	`+ assertIsolated()`
`206`	`206`	`waiting[continuation.id] = continuation`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`private func resumeID(_ id: Continuation.ID, returning value: T) {`
`210`		`- safeAssertIsolated()`
	`210`	`+ assertIsolated()`
`211`	`211`	`if let continuation = waiting.removeValue(forKey: id) {`
`212`	`212`	`continuation.resume(returning: value)`
`213`	`213`	`}`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`private func resumeID(_ id: Continuation.ID, throwing error: E) {`
`217`		`- safeAssertIsolated()`
	`217`	`+ assertIsolated()`
`218`	`218`	`if let continuation = waiting.removeValue(forKey: id) {`
`219`	`219`	`continuation.resume(throwing: error)`
`220`	`220`	`}`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`private func resumeID(_ id: Continuation.ID, with result: Result<T, E>) {`
`224`		`- safeAssertIsolated()`
	`224`	`+ assertIsolated()`
`225`	`225`	`if let continuation = waiting.removeValue(forKey: id) {`
`226`	`226`	`continuation.resume(with: result)`
`227`	`227`	`}`
`228`	`228`	`}`
`229`		`-`
`230`		`- private func safeAssertIsolated() {`
`231`		`-#if compiler(>=5.10)`
`232`		`- assertIsolated()`
`233`		`-#elseif compiler(>=5.9)`
`234`		`- if #available(macOS 14.0, iOS 17.0, watchOS 10.0, tvOS 17.0, *) {`
`235`		`- assertIsolated()`
`236`		`- }`
`237`		`-#endif`
`238`		`- }`
`239`	`229`	`}`
`240`	`230`
`241`	`231`	`private extension Actor {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// swift-tools-version:5.9`
	`1`	`+// swift-tools-version:5.10`
`2`	`2`
`3`	`3`	`import PackageDescription`
`4`	`4`