Skip to content

Commit 44dd7c7

Browse files
authored
Merge pull request #152 from unsignedapps/chore/bump-swift-6.2
chore: bump Swift to 6.2 and SwiftFormat to 0.60.1
2 parents 2736aa7 + 79e1e0f commit 44dd7c7

81 files changed

Lines changed: 700 additions & 654 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/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", "swift:6.3" ]
36+
swift: [ "swift:6.2", "swift:6.3" ]
3737
os: [ amazonlinux2, jammy, rhel-ubi9, noble ]
3838

3939
container:

.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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

Examples/Examples/DoubleAndBooleanControlStyle.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ struct DoubleAndBooleanControlStyle: FlagControlStyle {
3434

3535
extension FlagControlStyle where Self == DoubleAndBooleanControlStyle {
3636

37-
static var doubleAndBoolean: Self { Self() }
37+
static var doubleAndBoolean: Self {
38+
Self()
39+
}
3840

3941
}

Examples/Examples/RootView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ struct RootView: View {
3434
}
3535
.flagPole(
3636
Dependencies.current.flags,
37-
editableSource: Dependencies.current.flags._sources.first
37+
editableSource: Dependencies.current.flags._sources.first,
3838
)
3939
.flagControlStyle(.doubleAndBoolean)
4040

Examples/ExamplesTests/ExamplesTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import Testing
1717
struct ExamplesTests {
1818

1919
@Test
20-
func example() async throws {
20+
func example() {
2121
// Write your test here and use APIs like `#expect(...)` to check expected conditions.
2222
}
2323

Examples/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ let package = Package(
66
name: "",
77
products: [],
88
dependencies: [],
9-
targets: []
9+
targets: [],
1010
)

Package.resolved

Lines changed: 42 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)