Swift 5.10

swhitty · Mar 10, 2024 · d2c6607 · d2c6607
1 parent 73f0374
commit d2c6607
Show file tree

Hide file tree

Showing 8 changed files with 114 additions and 40 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,10 +6,10 @@ on:
   workflow_dispatch:
 
 jobs:
-  xcode_14_3:
-    runs-on: macos-13
+  xcode_15_2:
+    runs-on: macos-14
     env:
-      DEVELOPER_DIR: /Applications/Xcode_14.3.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -26,10 +26,10 @@ jobs:
         with:
           files: ./coverage_report.lcov
 
-  xcode_14_2:
+  xcode_14_3_1:
     runs-on: macos-13
     env:
-      DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_14.3.1.app/Contents/Developer
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -65,3 +65,29 @@ jobs:
         run: swift build --build-tests
       - name: Test
         run: swift test --skip-build
+
+  linux_swift_5_9:
+    runs-on: ubuntu-latest
+    container: swift:5.9
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Version
+        run: swift --version
+      - name: Build
+        run: swift build --build-tests
+      - name: Test
+        run: swift test --skip-build
+
+  linux_swift_5_10:
+    runs-on: ubuntu-latest
+    container: swift:5.10
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Version
+        run: swift --version
+      - name: Build
+        run: swift build --build-tests
+      - name: Test
+        run: swift test --skip-build
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.7
+// swift-tools-version:5.8
 
 import PackageDescription
 
@@ -16,12 +16,24 @@ let package = Package(
     targets: [
         .target(
             name: "IdentifiableContinuation",
-            path: "Sources"
+            path: "Sources",
+            swiftSettings: .upcomingFeatures
         ),
         .testTarget(
             name: "IdentifiableContinuationTests",
             dependencies: ["IdentifiableContinuation"],
-            path: "Tests"
+            path: "Tests",
+            swiftSettings: .upcomingFeatures
         )
     ]
 )
+
+extension Array where Element == SwiftSetting {
+
+    static var upcomingFeatures: [SwiftSetting] {
+        [
+            .enableUpcomingFeature("ExistentialAny"),
+            .enableExperimentalFeature("StrictConcurrency")
+        ]
+    }
+}
diff --git a/[email protected] b/[email protected]
@@ -0,0 +1,27 @@
+// swift-tools-version:5.7
+
+import PackageDescription
+
+let package = Package(
+    name: "IdentifiableContinuation",
+    platforms: [
+        .macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6)
+    ],
+    products: [
+        .library(
+            name: "IdentifiableContinuation",
+            targets: ["IdentifiableContinuation"]
+        )
+    ],
+    targets: [
+        .target(
+            name: "IdentifiableContinuation",
+            path: "Sources"
+        ),
+        .testTarget(
+            name: "IdentifiableContinuationTests",
+            dependencies: ["IdentifiableContinuation"],
+            path: "Tests"
+        )
+    ]
+)
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 [![Build](https://github.com/swhitty/IdentifiableContinuation/actions/workflows/build.yml/badge.svg)](https://github.com/swhitty/IdentifiableContinuation/actions/workflows/build.yml)
 [![Codecov](https://codecov.io/gh/swhitty/IdentifiableContinuation/graphs/badge.svg)](https://codecov.io/gh/swhitty/IdentifiableContinuation)
 [![Platforms](https://img.shields.io/badge/platforms-iOS%20|%20Mac%20|%20tvOS%20|%20Linux%20|%20Windows-lightgray.svg)](https://github.com/swhitty/IdentifiableContinuation/blob/main/Package.swift)
-[![Swift 5.8](https://img.shields.io/badge/swift-5.7%20–%205.8-red.svg?style=flat)](https://developer.apple.com/swift)
+[![Swift 5.10](https://img.shields.io/badge/swift-5.7%20–%205.10-red.svg?style=flat)](https://developer.apple.com/swift)
 [![License](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://opensource.org/licenses/MIT)
 [![Twitter](https://img.shields.io/badge/[email protected])](http://twitter.com/simonwhitty)
 

diff --git a/Sources/IdentifiableContinuation.swift b/Sources/IdentifiableContinuation.swift
@@ -44,7 +44,7 @@ public func withIdentifiableContinuation<T>(
 @inlinable
 public func withThrowingIdentifiableContinuation<T>(
     function: String = #function,
-    body: (IdentifiableContinuation<T, Error>) -> Void
+    body: (IdentifiableContinuation<T, any Error>) -> Void
 ) async throws -> T {
     try await withCheckedThrowingContinuation(function: function) {
         body(IdentifiableContinuation(storage: .checked($0)))
@@ -62,7 +62,7 @@ public func withIdentifiableUnsafeContinuation<T>(
 
 @inlinable
 public func withThrowingIdentifiableUnsafeContinuation<T>(
-    body: (IdentifiableContinuation<T, Error>) -> Void
+    body: (IdentifiableContinuation<T, any Error>) -> Void
 ) async throws -> T {
     try await withUnsafeThrowingContinuation {
         body(IdentifiableContinuation(storage: .unsafe($0)))
@@ -104,10 +104,10 @@ public func withIdentifiableContinuation<T>(
 @inlinable
 public func withThrowingIdentifiableContinuation<T>(
     function: String = #function,
-    body: (IdentifiableContinuation<T, Error>) -> Void,
-    onCancel: (IdentifiableContinuation<T, Error>.ID) -> Void
+    body: (IdentifiableContinuation<T, any Error>) -> Void,
+    onCancel: (IdentifiableContinuation<T, any Error>.ID) -> Void
 ) async throws -> T {
-    let id = IdentifiableContinuation<T, Error>.ID()
+    let id = IdentifiableContinuation<T, any Error>.ID()
     return try await withoutActuallyEscaping(body, onCancel, result: T.self) {
         let state = LockedState(body: $0, onCancel: $1)
         return try await withTaskCancellationHandler {
@@ -124,8 +124,8 @@ public func withThrowingIdentifiableContinuation<T>(
 @inlinable
 public func withThrowingIdentifiableContinuation<T>(
     function: String = #function,
-    body: (IdentifiableContinuation<T, Error>) async -> Void,
-    onCancel: (IdentifiableContinuation<T, Error>.ID) async -> Void
+    body: (IdentifiableContinuation<T, any Error>) async -> Void,
+    onCancel: (IdentifiableContinuation<T, any Error>.ID) async -> Void
 ) async throws -> T {
     try await withoutActuallyEscaping(body, onCancel, result: T.self) {
         let state = AsyncLockedState(body: $0, onCancel: $1)
@@ -165,10 +165,10 @@ public func withIdentifiableUnsafeContinuation<T>(
 
 @inlinable
 public func withThrowingIdentifiableUnsafeContinuation<T>(
-    body: (IdentifiableContinuation<T, Error>) -> Void,
-    onCancel: (IdentifiableContinuation<T, Error>.ID) -> Void
+    body: (IdentifiableContinuation<T, any Error>) -> Void,
+    onCancel: (IdentifiableContinuation<T, any Error>.ID) -> Void
 ) async throws -> T {
-    let id = IdentifiableContinuation<T, Error>.ID()
+    let id = IdentifiableContinuation<T, any Error>.ID()
     return try await withoutActuallyEscaping(body, onCancel, result: T.self) {
         let state = LockedState(body: $0, onCancel: $1)
         return try await withTaskCancellationHandler {
@@ -184,8 +184,8 @@ public func withThrowingIdentifiableUnsafeContinuation<T>(
 
 @inlinable
 public func withThrowingIdentifiableUnsafeContinuation<T>(
-    body: (IdentifiableContinuation<T, Error>) async -> Void,
-    onCancel: (IdentifiableContinuation<T, Error>.ID) async -> Void
+    body: (IdentifiableContinuation<T, any Error>) async -> Void,
+    onCancel: (IdentifiableContinuation<T, any Error>.ID) async -> Void
 ) async throws -> T {
     try await withoutActuallyEscaping(body, onCancel, result: T.self) {
         let state = AsyncLockedState(body: $0, onCancel: $1)
@@ -352,7 +352,7 @@ final class AsyncLockedState<T, Failure: Error>: @unchecked Sendable {
     }
 
     @usableFromInline
-    func startCheckedThrowingContinuation(function: String) async throws -> T where Failure == Error {
+    func startCheckedThrowingContinuation(function: String) async throws -> T where Failure == any Error {
         let id = IdentifiableContinuation<T, Failure>.ID()
         return try await withTaskCancellationHandler {
             do {
@@ -387,7 +387,7 @@ final class AsyncLockedState<T, Failure: Error>: @unchecked Sendable {
     }
 
     @usableFromInline
-    func startUnsafeThrowingContinuation() async throws -> T where Failure == Error {
+    func startUnsafeThrowingContinuation() async throws -> T where Failure == any Error {
         let id = IdentifiableContinuation<T, Failure>.ID()
         return try await withTaskCancellationHandler {
             do {

diff --git a/Tests/IdentifiableContinuationAsyncTests.swift b/Tests/IdentifiableContinuationAsyncTests.swift
@@ -96,9 +96,9 @@ final class IdentifiableContinuationAsyncTests: XCTestCase {
     }
 
     func testThrowingCancels_After_Created() async {
-        let waiter = Waiter<String, Error>()
+        let waiter = Waiter<String, any Error>()
 
-        let task = Task<String?, Error> {
+        let task = Task<String?, any Error> {
             try await withThrowingIdentifiableContinuation {
                 await waiter.addContinuation($0)
             } onCancel: {
@@ -116,9 +116,9 @@ final class IdentifiableContinuationAsyncTests: XCTestCase {
     }
 
     func testThrowingCancels_Before_Created() async {
-        let waiter = Waiter<String, Error>()
+        let waiter = Waiter<String, any Error>()
 
-        let task = Task<String?, Error> {
+        let task = Task<String?, any Error> {
             await Task.sleep(seconds: 0.1)
             return try await withThrowingIdentifiableContinuation {
                 await waiter.addContinuation($0)
@@ -176,9 +176,9 @@ final class IdentifiableContinuationAsyncTests: XCTestCase {
     }
 
     func testUnsafeThrowingCancels_After_Created() async {
-        let waiter = Waiter<String, Error>()
+        let waiter = Waiter<String, any Error>()
 
-        let task = Task<String?, Error> {
+        let task = Task<String?, any Error> {
             try await withThrowingIdentifiableUnsafeContinuation {
                 await waiter.addContinuation($0)
             } onCancel: {
@@ -196,9 +196,9 @@ final class IdentifiableContinuationAsyncTests: XCTestCase {
     }
 
     func testUnsafeThrowingCancels_Before_Created() async {
-        let waiter = Waiter<String, Error>()
+        let waiter = Waiter<String, any Error>()
 
-        let task = Task<String?, Error> {
+        let task = Task<String?, any Error> {
             await Task.sleep(seconds: 0.1)
             return try await withThrowingIdentifiableUnsafeContinuation {
                 await waiter.addContinuation($0)

diff --git a/Tests/IdentifiableContinuationTests.swift b/Tests/IdentifiableContinuationTests.swift
@@ -99,9 +99,9 @@ final class IdentifiableContinuationTests: XCTestCase {
     }
 
     func testThrowingCancels_After_Created() async {
-        let waiter = Waiter<String, Error>()
+        let waiter = Waiter<String, any Error>()
 
-        let task = Task<String?, Error> {
+        let task = Task<String?, any Error> {
             try await withThrowingIdentifiableContinuation {
                 waiter.addContinuation($0)
             } onCancel: {
@@ -118,9 +118,9 @@ final class IdentifiableContinuationTests: XCTestCase {
     }
 
     func testThrowingCancels_Before_Created() async {
-        let waiter = Waiter<String, Error>()
+        let waiter = Waiter<String, any Error>()
 
-        let task = Task<String?, Error> {
+        let task = Task<String?, any Error> {
             await Task.sleep(seconds: 0.1)
             return try await withThrowingIdentifiableContinuation {
                 waiter.addContinuation($0)
@@ -201,9 +201,9 @@ final class IdentifiableContinuationTests: XCTestCase {
 
 
     func testUnsafeThrowingCancels_After_Created() async {
-        let waiter = Waiter<String, Error>()
+        let waiter = Waiter<String, any Error>()
 
-        let task = Task<String?, Error> {
+        let task = Task<String?, any Error> {
             try await withThrowingIdentifiableUnsafeContinuation {
                 waiter.addContinuation($0)
             } onCancel: {
@@ -220,9 +220,9 @@ final class IdentifiableContinuationTests: XCTestCase {
     }
 
     func testUnsafeThrowingCancels_Before_Created() async {
-        let waiter = Waiter<String, Error>()
+        let waiter = Waiter<String, any Error>()
 
-        let task = Task<String?, Error> {
+        let task = Task<String?, any Error> {
             await Task.sleep(seconds: 0.1)
             return try await withThrowingIdentifiableUnsafeContinuation {
                 waiter.addContinuation($0)
@@ -239,7 +239,7 @@ final class IdentifiableContinuationTests: XCTestCase {
     }
 }
 
-private final class Waiter<T, E: Error> {
+private final class Waiter<T, E: Error>: @unchecked Sendable {
     typealias Continuation = IdentifiableContinuation<T, E>
 
     private var waiting = [Continuation.ID: Continuation]()

diff --git a/docker-run-tests.sh b/docker-run-tests.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -eu
+
+docker run -it \
+  --rm \
+  --mount src="$(pwd)",target=/package,type=bind \
+  swift:5.10-jammy \
+  /usr/bin/swift test --package-path /package