Skip to content

Commit c0fe67b

Browse files
authored
Merge branch 'main' into chore/swift-syntax-603.0.0-support
2 parents 99207b7 + 44dd7c7 commit c0fe67b

109 files changed

Lines changed: 816 additions & 766 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ios-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
strategy:
2929
fail-fast: false
3030
matrix:
31-
xcode: [ "26.1" ]
31+
xcode: [ "26.2", "26.3", "26.4" ]
3232
os: [ macos-26 ]
3333
runs-on: ${{ matrix.os }}
3434

@@ -42,7 +42,7 @@ jobs:
4242
run: |
4343
set -o pipefail && \
4444
NSUnbufferedIO=YES \
45-
xcrun xcodebuild build -workspace . -scheme Vexil -skipMacroValidation -destination "platform=iOS Simulator,name=iPhone 16e" \
45+
xcrun xcodebuild build -workspace . -scheme Vexil -skipMacroValidation -destination "platform=iOS Simulator,name=iPhone 17" \
4646
| xcbeautify --renderer github-actions
4747
4848
build-ios:

.github/workflows/lint.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Linting
22

33
on:
44
pull_request:
5-
branches: [ main ]
5+
branches: [main]
66

77
jobs:
88
check-changes:
@@ -24,9 +24,11 @@ jobs:
2424
2525
Lint:
2626
runs-on: ubuntu-latest
27+
container:
28+
image: swift:6.2-jammy
2729
if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
2830
needs: check-changes
2931
steps:
3032
- uses: actions/checkout@v3
3133
- name: "🧹 Lint changed files"
32-
run: make lint
34+
run: swift package plugin --allow-writing-to-package-directory swiftformat . --lint

.github/workflows/linux-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
strategy:
3434
fail-fast: false
3535
matrix:
36-
swift: [ "swift:6.1", "swift:6.2" ]
36+
swift: [ "swift:6.2", "swift:6.3" ]
3737
os: [ amazonlinux2, jammy, rhel-ubi9, noble ]
3838

3939
container:

.github/workflows/macos-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
strategy:
2929
fail-fast: false
3030
matrix:
31-
xcode: [ "26.1" ]
31+
xcode: [ "26.2", "26.3", "26.4" ]
3232
os: [ macos-26 ]
3333
runs-on: ${{ matrix.os }}
3434

.github/workflows/tvos-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
strategy:
2929
fail-fast: false
3030
matrix:
31-
xcode: [ "26.1" ]
31+
xcode: [ "26.2", "26.3", "26.4" ]
3232
os: [ macos-26 ]
3333
runs-on: ${{ matrix.os }}
3434

.github/workflows/visionos-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
strategy:
2929
fail-fast: false
3030
matrix:
31-
xcode: [ "26.1" ]
31+
xcode: [ "26.2", "26.3", "26.4" ]
3232
os: [ macos-26 ]
3333
runs-on: ${{ matrix.os }}
3434

.github/workflows/watchos-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
strategy:
2929
fail-fast: false
3030
matrix:
31-
xcode: [ "26.1" ]
31+
xcode: [ "26.2", "26.3", "26.4" ]
3232
os: [ macos-26 ]
3333
runs-on: ${{ matrix.os }}
3434

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@
66
/Packages
77
/*.xcodeproj
88
xcuserdata/
9-
/Release
10-
/Package.resolved
9+
/Release

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.10
1+
6.2

Examples/Examples/Dependencies.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// This source file is part of the Vexil open source project
44
//
5-
// Copyright (c) 2025 Unsigned Apps and the open source contributors.
5+
// Copyright (c) 2026 Unsigned Apps and the open source contributors.
66
// Licensed under the MIT license
77
//
88
// See LICENSE for license information
@@ -16,7 +16,7 @@ import Vexil
1616
struct Dependencies {
1717
var flags = FlagPole(
1818
hoist: FeatureFlags.self,
19-
sources: FlagPole<FeatureFlags>.defaultSources + [RemoteFlags.values]
19+
sources: FlagPole<FeatureFlags>.defaultSources + [RemoteFlags.values],
2020
)
2121

2222
@TaskLocal

0 commit comments

Comments
 (0)