remove Swift 5.9 support

Author: swhitty

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

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 {

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 {

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
-    }
-}

[email protected] renamed to [email protected]

@@ -1,4 +1,4 @@
-// swift-tools-version:5.9
+// swift-tools-version:5.10
 
 import PackageDescription
 

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: