From 17ae98ff7186dac08df6bd3971f716dfdb6c6feb Mon Sep 17 00:00:00 2001 From: p-x9 <50244599+p-x9@users.noreply.github.com> Date: Sat, 12 Apr 2025 23:50:06 +0900 Subject: [PATCH 1/4] Support `swift-syntax` version <602.0.0 --- Package.resolved | 34 ++++++++++++++++++++++++++-------- Package.swift | 6 +++--- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/Package.resolved b/Package.resolved index b5f5cdd..c425da6 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,12 +1,21 @@ { "pins" : [ + { + "identity" : "swift-custom-dump", + "kind" : "remoteSourceControl", + "location" : "https://github.com/pointfreeco/swift-custom-dump", + "state" : { + "revision" : "82645ec760917961cfa08c9c0c7104a57a0fa4b1", + "version" : "1.3.3" + } + }, { "identity" : "swift-literal-type-inference", "kind" : "remoteSourceControl", "location" : "https://github.com/p-x9/swift-literal-type-inference.git", "state" : { - "revision" : "59480c8b9dbd4fcd414d86abf11ba4d749b7d5ff", - "version" : "0.3.0" + "revision" : "7235a8e47b257bbd54da76191b043976509c4b8c", + "version" : "0.4.0" } }, { @@ -14,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-macro-testing.git", "state" : { - "revision" : "20c1a8f3b624fb5d1503eadcaa84743050c350f4", - "version" : "0.5.2" + "revision" : "cfe474c7e97d429ea31eefed2e9ab8c7c74260f9", + "version" : "0.6.2" } }, { @@ -32,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-snapshot-testing", "state" : { - "revision" : "6d932a79e7173b275b96c600c86c603cf84f153c", - "version" : "1.17.4" + "revision" : "1be8144023c367c5de701a6313ed29a3a10bf59b", + "version" : "1.18.3" } }, { @@ -41,8 +50,17 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/swiftlang/swift-syntax.git", "state" : { - "revision" : "2bc86522d115234d1f588efe2bcb4ce4be8f8b82", - "version" : "510.0.3" + "revision" : "f99ae8aa18f0cf0d53481901f88a0991dc3bd4a2", + "version" : "601.0.1" + } + }, + { + "identity" : "xctest-dynamic-overlay", + "kind" : "remoteSourceControl", + "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay", + "state" : { + "revision" : "39de59b2d47f7ef3ca88a039dff3084688fe27f4", + "version" : "1.5.2" } } ], diff --git a/Package.swift b/Package.swift index 3f0d3cb..152a7e5 100644 --- a/Package.swift +++ b/Package.swift @@ -18,11 +18,11 @@ let package = Package( dependencies: [ .package( url: "https://github.com/swiftlang/swift-syntax.git", - "509.0.0"..<"511.0.0" + "509.0.0"..<"602.0.0" ), .package( url: "https://github.com/p-x9/swift-literal-type-inference.git", - from: "0.3.0" + from: "0.4.0" ), .package( url: "https://github.com/p-x9/swift-object-association.git", @@ -30,7 +30,7 @@ let package = Package( ), .package( url: "https://github.com/pointfreeco/swift-macro-testing.git", - from: "0.5.1" + from: "0.6.1" ) ], From 92c74137bfb10717295f1b14c3a6489865957f95 Mon Sep 17 00:00:00 2001 From: p-x9 <50244599+p-x9@users.noreply.github.com> Date: Mon, 14 Apr 2025 17:26:34 +0900 Subject: [PATCH 2/4] Bump swift version to 6.1.0 on CI --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 929ce4b..f8a3a18 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,13 +22,13 @@ env: jobs: build: name: Build & Test - runs-on: macos-13 + runs-on: macos-14 steps: - name: Checkout uses: actions/checkout@v4 - - name: Select Xcode 15 - run: sudo xcode-select -s /Applications/Xcode_15.0.app + - name: Select Xcode 16 + run: sudo xcode-select -s /Applications/Xcode_16.3.app - name: Build run: swift build @@ -43,7 +43,7 @@ jobs: - name: Install Swift uses: swift-actions/setup-swift@v2 with: - swift-version: '5.10.1' + swift-version: '6.1.0' - uses: actions/checkout@v4 From 7f86d4e77b9944a89938639d4171da5b9dcbda98 Mon Sep 17 00:00:00 2001 From: p-x9 <50244599+p-x9@users.noreply.github.com> Date: Mon, 14 Apr 2025 17:37:53 +0900 Subject: [PATCH 3/4] Bump macOS version to 15.x --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f8a3a18..5a268fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ env: jobs: build: name: Build & Test - runs-on: macos-14 + runs-on: macos-15 steps: - name: Checkout uses: actions/checkout@v4 From d7e42dc047a2069e3221cc171092585a81d0bd1f Mon Sep 17 00:00:00 2001 From: p-x9 <50244599+p-x9@users.noreply.github.com> Date: Mon, 14 Apr 2025 17:44:12 +0900 Subject: [PATCH 4/4] Fix `DEVELOPER_DIR` --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5a268fb..9c4c6cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ permissions: contents: read env: - DEVELOPER_DIR: /Applications/Xcode_15.0.app + DEVELOPER_DIR: /Applications/Xcode_16.3.app jobs: build: