Merge pull request #129 from unsignedapps/xcode-16

Drop support for Xcode 15
unsignedapps · Dec 11, 2024 · 05b246c · 05b246c
2 parents f0c4867 + 6947ab1
commit 05b246c
Show file tree

Hide file tree

Showing 22 changed files with 306 additions and 486 deletions.
diff --git a/.github/workflows/ios-tests.yml b/.github/workflows/ios-tests.yml
@@ -28,9 +28,10 @@ jobs:
     if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
     needs: check-changes
     strategy:
+      fail-fast: false
       matrix:
-        xcode: [ "15.4", "16.0" ]
-        os: [ macos-14 ]
+        xcode: [ "16.0", "16.1" ]
+        os: [ macos-14, macos-15 ]
     runs-on: ${{ matrix.os }}
 
     env:
@@ -43,7 +44,7 @@ jobs:
         run: |
           set -o pipefail && \
           NSUnbufferedIO=YES \
-          xcrun xcodebuild test -workspace . -scheme Vexil -skipMacroValidation -destination "platform=iOS Simulator,name=iPhone 15" \
+          xcrun xcodebuild test -workspace . -scheme Vexil -skipMacroValidation -destination "platform=iOS Simulator,name=iPhone 16" \
           | xcbeautify --renderer github-actions
 
   build-ios:
@@ -53,5 +54,5 @@ jobs:
     needs: build-ios-matrix
     steps:
       - name: Check build matrix status
-        if: ${{ needs.build-ios-matrix.result == 'failure' }}
+        if: ${{ needs.build-ios-matrix.result != 'success' }}
         run: exit 1
diff --git a/.github/workflows/linux-tests.yml b/.github/workflows/linux-tests.yml
@@ -33,14 +33,10 @@ jobs:
     if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
     needs: check-changes
     strategy:
+      fail-fast: false
       matrix:
-        swift: [ "swift:5.10.1", "swiftlang/swift:nightly-6.0" ]
-        os: [ amazonlinux2, focal, jammy, rhel-ubi9, mantic, noble ]
-        exclude:
-          - swift: "swiftlang/swift:nightly-6.0"
-            os: "mantic"
-          - swift: "swiftlang/swift:nightly-6.0"
-            os: "noble"
+        swift: [ "swift:6.0.2" ]
+        os: [ amazonlinux2, focal, jammy, rhel-ubi9, noble ]
 
     container:
       image: ${{ matrix.swift }}-${{ matrix.os }}
@@ -58,5 +54,5 @@ jobs:
     needs: matrix
     steps:
       - name: Check build matrix status
-        if: ${{ needs.matrix.result == 'failure' }}
+        if: ${{ needs.matrix.result != 'success' }}
         run: exit 1
diff --git a/.github/workflows/macos-tests.yml b/.github/workflows/macos-tests.yml
@@ -28,9 +28,10 @@ jobs:
     if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
     needs: check-changes
     strategy:
+      fail-fast: false
       matrix:
-        xcode: [ "15.4", "16.0" ]
-        os: [ macos-14 ]
+        xcode: [ "16.0", "16.1" ]
+        os: [ macos-14, macos-15 ]
     runs-on: ${{ matrix.os }}
 
     env:
@@ -53,5 +54,5 @@ jobs:
     needs: build-macos-matrix
     steps:
       - name: Check build matrix status
-        if: ${{ needs.build-macos-matrix.result == 'failure' }}
+        if: ${{ needs.build-macos-matrix.result != 'success' }}
         run: exit 1
diff --git a/.github/workflows/tvos-tests.yml b/.github/workflows/tvos-tests.yml
@@ -28,9 +28,10 @@ jobs:
     if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
     needs: check-changes
     strategy:
+      fail-fast: false
       matrix:
-        xcode: [ "15.4", "16.0" ]
-        os: [ macos-14 ]
+        xcode: [ "16.0", "16.1" ]
+        os: [ macos-14, macos-15 ]
     runs-on: ${{ matrix.os }}
 
     env:
@@ -53,5 +54,5 @@ jobs:
     needs: build-tvos-matrix
     steps:
       - name: Check build matrix status
-        if: ${{ needs.build-tvos-matrix.result == 'failure' }}
+        if: ${{ needs.build-tvos-matrix.result != 'success' }}
         run: exit 1
diff --git a/.github/workflows/visionos-tests.yml b/.github/workflows/visionos-tests.yml
@@ -28,9 +28,10 @@ jobs:
     if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
     needs: check-changes
     strategy:
+      fail-fast: false
       matrix:
-        xcode: [ "15.4", "16.0" ]
-        os: [ macos-14 ]
+        xcode: [ "16.0", "16.1" ]
+        os: [ macos-14, macos-15 ]
     runs-on: ${{ matrix.os }}
 
     env:
@@ -53,5 +54,5 @@ jobs:
     needs: build-visionos-matrix
     steps:
       - name: Check build matrix status
-        if: ${{ needs.build-visionos-matrix.result == 'failure' }}
+        if: ${{ needs.build-visionos-matrix.result != 'success' }}
         run: exit 1
diff --git a/.github/workflows/watchos-tests.yml b/.github/workflows/watchos-tests.yml
@@ -28,9 +28,10 @@ jobs:
     if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
     needs: check-changes
     strategy:
+      fail-fast: false
       matrix:
-        xcode: [ "15.4", "16.0" ]
-        os: [ macos-14 ]
+        xcode: [ "16.0", "16.1" ]
+        os: [ macos-14, macos-15 ]
     runs-on: ${{ matrix.os }}
 
     env:
@@ -43,7 +44,7 @@ jobs:
         run: |
           set -o pipefail && \
           NSUnbufferedIO=YES \
-          xcrun xcodebuild test -workspace . -scheme Vexil -skipMacroValidation -destination "platform=watchOS Simulator,name=Apple Watch Series 9 (45mm)" \
+          xcrun xcodebuild test -workspace . -scheme Vexil -skipMacroValidation -destination "platform=watchOS Simulator,name=Apple Watch Series 10 (46mm)" \
           | xcbeautify --renderer github-actions
 
   build-watchos:
@@ -53,5 +54,5 @@ jobs:
     needs: build-watchos-matrix
     steps:
       - name: Check build matrix status
-        if: ${{ needs.build-watchos-matrix.result == 'failure' }}
+        if: ${{ needs.build-watchos-matrix.result != 'success' }}
         run: exit 1
diff --git a/Package.swift b/Package.swift
@@ -23,13 +23,7 @@ let package = Package(
     dependencies: .init {
         Package.Dependency.package(url: "https://github.com/apple/swift-async-algorithms.git", from: "1.0.0")
         Package.Dependency.package(url: "https://github.com/nicklockwood/SwiftFormat.git", from: "0.54.1")
-        Package.Dependency.package(url: "https://github.com/swiftlang/swift-syntax.git", exact: "600.0.0-prerelease-2024-06-12")
-
-#if os(Linux)
-        // Linux does not come bundled with swift-testing
-        Package.Dependency.package(url: "https://github.com/apple/swift-testing.git", exact: "0.11.0")
-#endif
-
+        Package.Dependency.package(url: "https://github.com/swiftlang/swift-syntax.git", .upToNextMajor(from: "600.0.1"))
     },
 
     targets: .init {
@@ -43,22 +37,16 @@ let package = Package(
                 .product(name: "AsyncAlgorithms", package: "swift-async-algorithms"),
             ],
             swiftSettings: [
-                .enableExperimentalFeature("StrictConcurrency"),
+                .swiftLanguageMode(.v6),
             ]
         )
         Target.testTarget(
             name: "VexilTests",
             dependencies: .init {
                 Target.Dependency.target(name: "Vexil")
-
-#if os(Linux)
-                // Linux does not come bundled with swift-testing
-                Target.Dependency.product(name: "Testing", package: "swift-testing")
-#endif
-
             },
             swiftSettings: [
-                .enableExperimentalFeature("StrictConcurrency"),
+                .swiftLanguageMode(.v6),
             ]
         )
 
@@ -82,7 +70,7 @@ let package = Package(
                 .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
             ],
             swiftSettings: [
-                .enableExperimentalFeature("StrictConcurrency"),
+                .swiftLanguageMode(.v6),
             ]
         )
 
@@ -96,15 +84,15 @@ let package = Package(
                 .product(name: "SwiftSyntaxMacrosTestSupport", package: "swift-syntax"),
             ],
             swiftSettings: [
-                .enableExperimentalFeature("StrictConcurrency"),
+                .swiftLanguageMode(.v6),
             ]
         )
 
 #endif
 
     },
 
-    swiftLanguageVersions: [
+    swiftLanguageModes: [
         .v6,
     ]
 

diff --git a/[email protected] b/[email protected]
diff --git a/Tests/VexilTests/BoxedFlagValueDecodingTests.swift b/Tests/VexilTests/BoxedFlagValueDecodingTests.swift
@@ -15,18 +15,6 @@ import Foundation
 import Testing
 @testable import Vexil
 
-#if compiler(<6)
-
-import XCTest
-
-final class BoxedFlagValueDecodingTestCase: XCTestCase {
-    func testSwiftTesting() async {
-        await XCTestScaffold.runTestsInSuite(BoxedFlagValueDecodingTests.self, hostedBy: self)
-    }
-}
-
-#endif
-
 @Suite("BoxedFlagValue decoding", .tags(.boxing, .codable))
 struct BoxedFlagValueDecodingTests {
 

diff --git a/Tests/VexilTests/BoxedFlagValueEncodingTests.swift b/Tests/VexilTests/BoxedFlagValueEncodingTests.swift
@@ -15,18 +15,6 @@ import Foundation
 import Testing
 @testable import Vexil
 
-#if compiler(<6)
-
-import XCTest
-
-final class BoxedFlagValueEncodingTestCase: XCTestCase {
-    func testSwiftTesting() async {
-        await XCTestScaffold.runTestsInSuite(BoxedFlagValueEncodingTests.self, hostedBy: self)
-    }
-}
-
-#endif
-
 @Suite("BoxedFlagValue encoding", .tags(.boxing, .codable))
 struct BoxedFlagValueEncodingTests {
 

diff --git a/Tests/VexilTests/EquatableTests.swift b/Tests/VexilTests/EquatableTests.swift
@@ -18,18 +18,6 @@ import Combine
 import Testing
 @testable import Vexil
 
-#if compiler(<6)
-
-import XCTest
-
-final class EquatableTestCase: XCTestCase {
-    func testSwiftTesting() async {
-        await XCTestScaffold.runTestsInSuite(EquatableTests.self, hostedBy: self)
-    }
-}
-
-#endif
-
 @Suite("Equatable Tests", .tags(.pole))
 struct EquatableTests {