diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 07af3a72d2..81ad384768 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,16 +11,16 @@ on: jobs: macos_tests: - runs-on: macos-12 + runs-on: macos-14 strategy: matrix: xcode: - - "14.2" # Swift 5.7.2 + - "15.4" command: - test - benchmarks steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Select Xcode ${{ matrix.xcode }} run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app - name: System @@ -36,7 +36,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build run: swift build - name: Run tests diff --git a/Package.resolved b/Package.resolved index 3aace392cf..d7d911ae56 100644 --- a/Package.resolved +++ b/Package.resolved @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-case-paths", "state" : { - "revision" : "5da6989aae464f324eef5c5b52bdb7974725ab81", - "version" : "1.0.0" + "revision" : "031704ba0634b45e02fe875b8ddddc7f30a07f49", + "version" : "1.5.3" } }, { @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-collections", "state" : { - "revision" : "937e904258d22af6e447a0b72c0bc67583ef64a2", - "version" : "1.0.4" + "revision" : "3d2dc41a01f9e49d84f0a3925fb858bed64f702d", + "version" : "1.1.2" } }, { @@ -41,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-docc-plugin", "state" : { - "revision" : "9b1258905c21fc1b97bf03d1b4ca12c4ec4e5fda", - "version" : "1.2.0" + "revision" : "26ac5758409154cc448d7ab82389c520fa8a8247", + "version" : "1.3.0" } }, { @@ -54,6 +54,15 @@ "version" : "1.0.0" } }, + { + "identity" : "swift-issue-reporting", + "kind" : "remoteSourceControl", + "location" : "https://github.com/pointfreeco/swift-issue-reporting", + "state" : { + "revision" : "926f43898706eaa127db79ac42138e1ad7e85a3f", + "version" : "1.2.0" + } + }, { "identity" : "swift-parsing", "kind" : "remoteSourceControl", @@ -64,12 +73,12 @@ } }, { - "identity" : "xctest-dynamic-overlay", + "identity" : "swift-syntax", "kind" : "remoteSourceControl", - "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay", + "location" : "https://github.com/swiftlang/swift-syntax", "state" : { - "revision" : "302891700c7fa3b92ebde9fe7b42933f8349f3c7", - "version" : "1.0.0" + "revision" : "4c6cc0a3b9e8f14b3ae2307c5ccae4de6167ac2c", + "version" : "600.0.0-prerelease-2024-06-12" } } ], diff --git a/Package.swift b/Package.swift index 0341742371..4c4d289a1b 100644 --- a/Package.swift +++ b/Package.swift @@ -17,17 +17,17 @@ let package = Package( .package(url: "https://github.com/apple/swift-argument-parser", from: "0.5.0"), .package(url: "https://github.com/apple/swift-collections", from: "1.0.3"), .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"), + .package(url: "https://github.com/pointfreeco/swift-issue-reporting", from: "1.2.0"), .package(url: "https://github.com/pointfreeco/swift-parsing", from: "0.13.0"), - .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.0.0"), .package(url: "https://github.com/google/swift-benchmark", from: "0.1.1"), ], targets: [ .target( name: "URLRouting", dependencies: [ + .product(name: "IssueReporting", package: "swift-issue-reporting"), .product(name: "OrderedCollections", package: "swift-collections"), .product(name: "Parsing", package: "swift-parsing"), - .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"), ] ), .testTarget( diff --git a/Sources/URLRouting/Client/Client.swift b/Sources/URLRouting/Client/Client.swift index 7f69536df9..b0d71f8de5 100644 --- a/Sources/URLRouting/Client/Client.swift +++ b/Sources/URLRouting/Client/Client.swift @@ -1,6 +1,6 @@ import Foundation +import IssueReporting import Parsing -import XCTestDynamicOverlay #if canImport(FoundationNetworking) import FoundationNetworking @@ -130,7 +130,7 @@ extension URLRoutingClient { Use '\(Self.self).override' to supply a default response for this route. """ - XCTFail(message) + reportIssue(message) throw UnimplementedEndpoint(message: message) } }