diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 42e749f..fa09d30 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,12 +3,12 @@ name: CI on: push jobs: - library: - runs-on: macos-latest + test: + runs-on: macos-13 steps: - uses: actions/checkout@v3 - name: Select Xcode 14 - run: sudo xcode-select -s /Applications/Xcode_14.3.app + run: sudo xcode-select -s /Applications/Xcode_14.3.1.app - name: Test run: swift test diff --git a/Package.resolved b/Package.resolved index b4c00c3..d15f3c9 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/shareup/async-extensions.git", "state" : { - "revision" : "59504194f84b8c66a27503b5fd0640ac9b01f42a", - "version" : "4.1.0" + "revision" : "f8dec7a227bbbe15fd4df90c787d4c73e91451ba", + "version" : "4.2.1" } }, { @@ -41,8 +41,17 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-nio.git", "state" : { - "revision" : "9b2848d76f5caad08b97e71a04345aa5bdb23a06", - "version" : "2.49.0" + "revision" : "cf281631ff10ec6111f2761052aa81896a83a007", + "version" : "2.58.0" + } + }, + { + "identity" : "swift-nio-extras", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-nio-extras.git", + "state" : { + "revision" : "0e0d0aab665ff1a0659ce75ac003081f2b1c8997", + "version" : "1.19.0" } }, { @@ -50,8 +59,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-nio-ssl.git", "state" : { - "revision" : "4fb7ead803e38949eb1d6fabb849206a72c580f3", - "version" : "2.23.0" + "revision" : "320bd978cceb8e88c125dcbb774943a92f6286e9", + "version" : "2.25.0" } }, { @@ -59,8 +68,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-nio-transport-services.git", "state" : { - "revision" : "c0d9a144cfaec8d3d596aadde3039286a266c15c", - "version" : "1.15.0" + "revision" : "e7403c35ca6bb539a7ca353b91cc2d8ec0362d58", + "version" : "1.19.0" } }, { @@ -77,8 +86,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/vapor/websocket-kit.git", "state" : { - "revision" : "2b8885974e8d9f522e787805000553f4f7cce8a0", - "version" : "2.7.0" + "revision" : "53fe0639a98903858d0196b699720decb42aee7b", + "version" : "2.14.0" } } ], diff --git a/Sources/WebSocket/SystemWebSocket.swift b/Sources/WebSocket/SystemWebSocket.swift index 8b5dcf9..e81825b 100644 --- a/Sources/WebSocket/SystemWebSocket.swift +++ b/Sources/WebSocket/SystemWebSocket.swift @@ -4,10 +4,11 @@ import AsyncExtensions import os.log import Synchronized -private typealias OpenFuture = AsyncExtensions.Future +private typealias OpenFuture = AsyncThrowingFuture -private typealias CloseFuture = - AsyncExtensions.Future<(code: WebSocketCloseCode, reason: Data?)> +private typealias CloseFuture = AsyncThrowingFuture< + (code: WebSocketCloseCode, reason: Data?) +> final actor SystemWebSocket: Publisher { typealias Output = WebSocketMessage