Skip to content

Commit 05b246c

Browse files
bok-bok-
authored
Merge pull request #129 from unsignedapps/xcode-16
Drop support for Xcode 15
2 parents f0c4867 + 6947ab1 commit 05b246c

22 files changed

+306
-486
lines changed

‎.github/workflows/ios-tests.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ jobs:
2828
if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
2929
needs: check-changes
3030
strategy:
31+
fail-fast: false
3132
matrix:
32-
xcode: [ "15.4", "16.0" ]
33-
os: [ macos-14 ]
33+
xcode: [ "16.0", "16.1" ]
34+
os: [ macos-14, macos-15 ]
3435
runs-on: ${{ matrix.os }}
3536

3637
env:
@@ -43,7 +44,7 @@ jobs:
4344
run: |
4445
set -o pipefail && \
4546
NSUnbufferedIO=YES \
46-
xcrun xcodebuild test -workspace . -scheme Vexil -skipMacroValidation -destination "platform=iOS Simulator,name=iPhone 15" \
47+
xcrun xcodebuild test -workspace . -scheme Vexil -skipMacroValidation -destination "platform=iOS Simulator,name=iPhone 16" \
4748
| xcbeautify --renderer github-actions
4849
4950
build-ios:
@@ -53,5 +54,5 @@ jobs:
5354
needs: build-ios-matrix
5455
steps:
5556
- name: Check build matrix status
56-
if: ${{ needs.build-ios-matrix.result == 'failure' }}
57+
if: ${{ needs.build-ios-matrix.result != 'success' }}
5758
run: exit 1

‎.github/workflows/linux-tests.yml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,10 @@ jobs:
3333
if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
3434
needs: check-changes
3535
strategy:
36+
fail-fast: false
3637
matrix:
37-
swift: [ "swift:5.10.1", "swiftlang/swift:nightly-6.0" ]
38-
os: [ amazonlinux2, focal, jammy, rhel-ubi9, mantic, noble ]
39-
exclude:
40-
- swift: "swiftlang/swift:nightly-6.0"
41-
os: "mantic"
42-
- swift: "swiftlang/swift:nightly-6.0"
43-
os: "noble"
38+
swift: [ "swift:6.0.2" ]
39+
os: [ amazonlinux2, focal, jammy, rhel-ubi9, noble ]
4440

4541
container:
4642
image: ${{ matrix.swift }}-${{ matrix.os }}
@@ -58,5 +54,5 @@ jobs:
5854
needs: matrix
5955
steps:
6056
- name: Check build matrix status
61-
if: ${{ needs.matrix.result == 'failure' }}
57+
if: ${{ needs.matrix.result != 'success' }}
6258
run: exit 1

‎.github/workflows/macos-tests.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ jobs:
2828
if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
2929
needs: check-changes
3030
strategy:
31+
fail-fast: false
3132
matrix:
32-
xcode: [ "15.4", "16.0" ]
33-
os: [ macos-14 ]
33+
xcode: [ "16.0", "16.1" ]
34+
os: [ macos-14, macos-15 ]
3435
runs-on: ${{ matrix.os }}
3536

3637
env:
@@ -53,5 +54,5 @@ jobs:
5354
needs: build-macos-matrix
5455
steps:
5556
- name: Check build matrix status
56-
if: ${{ needs.build-macos-matrix.result == 'failure' }}
57+
if: ${{ needs.build-macos-matrix.result != 'success' }}
5758
run: exit 1

‎.github/workflows/tvos-tests.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ jobs:
2828
if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
2929
needs: check-changes
3030
strategy:
31+
fail-fast: false
3132
matrix:
32-
xcode: [ "15.4", "16.0" ]
33-
os: [ macos-14 ]
33+
xcode: [ "16.0", "16.1" ]
34+
os: [ macos-14, macos-15 ]
3435
runs-on: ${{ matrix.os }}
3536

3637
env:
@@ -53,5 +54,5 @@ jobs:
5354
needs: build-tvos-matrix
5455
steps:
5556
- name: Check build matrix status
56-
if: ${{ needs.build-tvos-matrix.result == 'failure' }}
57+
if: ${{ needs.build-tvos-matrix.result != 'success' }}
5758
run: exit 1

‎.github/workflows/visionos-tests.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ jobs:
2828
if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
2929
needs: check-changes
3030
strategy:
31+
fail-fast: false
3132
matrix:
32-
xcode: [ "15.4", "16.0" ]
33-
os: [ macos-14 ]
33+
xcode: [ "16.0", "16.1" ]
34+
os: [ macos-14, macos-15 ]
3435
runs-on: ${{ matrix.os }}
3536

3637
env:
@@ -53,5 +54,5 @@ jobs:
5354
needs: build-visionos-matrix
5455
steps:
5556
- name: Check build matrix status
56-
if: ${{ needs.build-visionos-matrix.result == 'failure' }}
57+
if: ${{ needs.build-visionos-matrix.result != 'success' }}
5758
run: exit 1

‎.github/workflows/watchos-tests.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ jobs:
2828
if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
2929
needs: check-changes
3030
strategy:
31+
fail-fast: false
3132
matrix:
32-
xcode: [ "15.4", "16.0" ]
33-
os: [ macos-14 ]
33+
xcode: [ "16.0", "16.1" ]
34+
os: [ macos-14, macos-15 ]
3435
runs-on: ${{ matrix.os }}
3536

3637
env:
@@ -43,7 +44,7 @@ jobs:
4344
run: |
4445
set -o pipefail && \
4546
NSUnbufferedIO=YES \
46-
xcrun xcodebuild test -workspace . -scheme Vexil -skipMacroValidation -destination "platform=watchOS Simulator,name=Apple Watch Series 9 (45mm)" \
47+
xcrun xcodebuild test -workspace . -scheme Vexil -skipMacroValidation -destination "platform=watchOS Simulator,name=Apple Watch Series 10 (46mm)" \
4748
| xcbeautify --renderer github-actions
4849
4950
build-watchos:
@@ -53,5 +54,5 @@ jobs:
5354
needs: build-watchos-matrix
5455
steps:
5556
- name: Check build matrix status
56-
if: ${{ needs.build-watchos-matrix.result == 'failure' }}
57+
if: ${{ needs.build-watchos-matrix.result != 'success' }}
5758
run: exit 1

‎Package.swift‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,7 @@ let package = Package(
2323
dependencies: .init {
2424
Package.Dependency.package(url: "https://github.com/apple/swift-async-algorithms.git", from: "1.0.0")
2525
Package.Dependency.package(url: "https://github.com/nicklockwood/SwiftFormat.git", from: "0.54.1")
26-
Package.Dependency.package(url: "https://github.com/swiftlang/swift-syntax.git", exact: "600.0.0-prerelease-2024-06-12")
27-
28-
#if os(Linux)
29-
// Linux does not come bundled with swift-testing
30-
Package.Dependency.package(url: "https://github.com/apple/swift-testing.git", exact: "0.11.0")
31-
#endif
32-
26+
Package.Dependency.package(url: "https://github.com/swiftlang/swift-syntax.git", .upToNextMajor(from: "600.0.1"))
3327
},
3428

3529
targets: .init {
@@ -43,22 +37,16 @@ let package = Package(
4337
.product(name: "AsyncAlgorithms", package: "swift-async-algorithms"),
4438
],
4539
swiftSettings: [
46-
.enableExperimentalFeature("StrictConcurrency"),
40+
.swiftLanguageMode(.v6),
4741
]
4842
)
4943
Target.testTarget(
5044
name: "VexilTests",
5145
dependencies: .init {
5246
Target.Dependency.target(name: "Vexil")
53-
54-
#if os(Linux)
55-
// Linux does not come bundled with swift-testing
56-
Target.Dependency.product(name: "Testing", package: "swift-testing")
57-
#endif
58-
5947
},
6048
swiftSettings: [
61-
.enableExperimentalFeature("StrictConcurrency"),
49+
.swiftLanguageMode(.v6),
6250
]
6351
)
6452

@@ -82,7 +70,7 @@ let package = Package(
8270
.product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
8371
],
8472
swiftSettings: [
85-
.enableExperimentalFeature("StrictConcurrency"),
73+
.swiftLanguageMode(.v6),
8674
]
8775
)
8876

@@ -96,15 +84,15 @@ let package = Package(
9684
.product(name: "SwiftSyntaxMacrosTestSupport", package: "swift-syntax"),
9785
],
9886
swiftSettings: [
99-
.enableExperimentalFeature("StrictConcurrency"),
87+
.swiftLanguageMode(.v6),
10088
]
10189
)
10290

10391
#endif
10492

10593
},
10694

107-
swiftLanguageVersions: [
95+
swiftLanguageModes: [
10896
.v6,
10997
]
11098

‎[email protected]‎

Lines changed: 0 additions & 129 deletions
This file was deleted.

‎Tests/VexilTests/BoxedFlagValueDecodingTests.swift‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,6 @@ import Foundation
1515
import Testing
1616
@testable import Vexil
1717

18-
#if compiler(<6)
19-
20-
import XCTest
21-
22-
final class BoxedFlagValueDecodingTestCase: XCTestCase {
23-
func testSwiftTesting() async {
24-
await XCTestScaffold.runTestsInSuite(BoxedFlagValueDecodingTests.self, hostedBy: self)
25-
}
26-
}
27-
28-
#endif
29-
3018
@Suite("BoxedFlagValue decoding", .tags(.boxing, .codable))
3119
struct BoxedFlagValueDecodingTests {
3220

‎Tests/VexilTests/BoxedFlagValueEncodingTests.swift‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,6 @@ import Foundation
1515
import Testing
1616
@testable import Vexil
1717

18-
#if compiler(<6)
19-
20-
import XCTest
21-
22-
final class BoxedFlagValueEncodingTestCase: XCTestCase {
23-
func testSwiftTesting() async {
24-
await XCTestScaffold.runTestsInSuite(BoxedFlagValueEncodingTests.self, hostedBy: self)
25-
}
26-
}
27-
28-
#endif
29-
3018
@Suite("BoxedFlagValue encoding", .tags(.boxing, .codable))
3119
struct BoxedFlagValueEncodingTests {
3220

0 commit comments

Comments
 (0)