From 45ed726847c057065f7d567688309720e696b63f Mon Sep 17 00:00:00 2001 From: Stephen Celis Date: Mon, 10 Nov 2025 14:32:47 -0800 Subject: [PATCH 1/4] Update package versioning SPM recommends `Package.swift` point to the latest version, but we're doing the opposite. --- Package.swift | 7 ++++--- Package@swift-6.0.swift => Package@swift-5.9.swift | 7 +++---- 2 files changed, 7 insertions(+), 7 deletions(-) rename Package@swift-6.0.swift => Package@swift-5.9.swift (92%) diff --git a/Package.swift b/Package.swift index c5a3dcd..a32eb13 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version: 5.9 +// swift-tools-version: 6.0 import PackageDescription @@ -17,7 +17,7 @@ let package = Package( ) ], dependencies: [ - .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.18.0"), + .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.17.4"), .package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"603.0.0"), ], targets: [ @@ -38,5 +38,6 @@ let package = Package( "MacroTesting" ] ), - ] + ], + swiftLanguageModes: [.v5] ) diff --git a/Package@swift-6.0.swift b/Package@swift-5.9.swift similarity index 92% rename from Package@swift-6.0.swift rename to Package@swift-5.9.swift index a32eb13..c5a3dcd 100644 --- a/Package@swift-6.0.swift +++ b/Package@swift-5.9.swift @@ -1,4 +1,4 @@ -// swift-tools-version: 6.0 +// swift-tools-version: 5.9 import PackageDescription @@ -17,7 +17,7 @@ let package = Package( ) ], dependencies: [ - .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.17.4"), + .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.18.0"), .package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"603.0.0"), ], targets: [ @@ -38,6 +38,5 @@ let package = Package( "MacroTesting" ] ), - ], - swiftLanguageModes: [.v5] + ] ) From 8322d5801e7b448884f8cb9c8ac1c4eaae2a7fe6 Mon Sep 17 00:00:00 2001 From: Stephen Celis Date: Fri, 14 Nov 2025 12:34:47 -0800 Subject: [PATCH 2/4] Disable Android workflow in CI configuration Comment out the Android CI workflow section in ci.yml --- .github/workflows/ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a787a98..fa5f477 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,15 +69,15 @@ jobs: # - name: Run tests # run: swift test - android: - strategy: - matrix: - swift: - - "6.0.3" - name: Android - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: skiptools/swift-android-action@v2 + # android: + # strategy: + # matrix: + # swift: + # - "6.0.3" + # name: Android + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v4 + # - uses: skiptools/swift-android-action@v2 with: swift-version: ${{ matrix.swift }} From 3ab23f32dc0106d4b0402be9f34603924eea3146 Mon Sep 17 00:00:00 2001 From: Stephen Celis Date: Fri, 14 Nov 2025 12:37:04 -0800 Subject: [PATCH 3/4] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fa5f477..47ad3a6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,5 +79,5 @@ jobs: # steps: # - uses: actions/checkout@v4 # - uses: skiptools/swift-android-action@v2 - with: - swift-version: ${{ matrix.swift }} + # with: + # swift-version: ${{ matrix.swift }} From 1e334352b7768a61944289e53dcf18d8fa0cf259 Mon Sep 17 00:00:00 2001 From: Stephen Celis Date: Fri, 14 Nov 2025 12:52:30 -0800 Subject: [PATCH 4/4] Enable Android build with updated Swift version --- .github/workflows/ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 47ad3a6..9da184a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,15 +69,15 @@ jobs: # - name: Run tests # run: swift test - # android: - # strategy: - # matrix: - # swift: - # - "6.0.3" - # name: Android - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v4 - # - uses: skiptools/swift-android-action@v2 - # with: - # swift-version: ${{ matrix.swift }} + android: + strategy: + matrix: + swift: + - "6.2" + name: Android + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: skiptools/swift-android-action@v2 + with: + swift-version: ${{ matrix.swift }}