Skip to content

Commit 11c3562

Browse files
committed
WIP
1 parent 47cbda3 commit 11c3562

File tree

3 files changed

+37
-96
lines changed

3 files changed

+37
-96
lines changed

.github/workflows/ci.yml

+34-36
Original file line numberDiff line numberDiff line change
@@ -15,50 +15,48 @@ concurrency:
1515
cancel-in-progress: true
1616

1717
jobs:
18-
# macOS:
19-
# name: ${{ matrix.platform }} (Swift ${{ matrix.swift }})
20-
# runs-on: ${{ matrix.os }}
21-
# strategy:
22-
# fail-fast: false
23-
# matrix:
24-
# platform:
25-
# - iOS
26-
# - macOS
27-
# - tvOS
28-
# - watchOS
29-
# swift:
30-
# - "5.9"
31-
# - "5.10"
32-
# - "6.0"
33-
# include:
34-
# - swift: "5.9"
35-
# os: macos-13
36-
# - swift: "5.10"
37-
# os: macos-14
38-
# - swift: "6.0"
39-
# os: macos-14
40-
# - action: test
41-
# - platform: tvOS
42-
# action: build
43-
# - platform: watchOS
44-
# action: build
45-
# steps:
46-
# - uses: actions/checkout@v4
47-
# - uses: mxcl/xcodebuild@v2
48-
# with:
49-
# action: ${{ matrix.action }}
50-
# platform: ${{ matrix.platform }}
51-
# swift: ~${{ matrix.swift }}
52-
# scheme: Builders
18+
macOS:
19+
name: ${{ matrix.platform }} (Swift ${{ matrix.swift }})
20+
runs-on: ${{ matrix.os }}
21+
strategy:
22+
fail-fast: false
23+
matrix:
24+
platform:
25+
# - iOS
26+
- macOS
27+
# - tvOS
28+
# - watchOS
29+
# - visionOS
30+
swift:
31+
- "6.0"
32+
- "6.1"
33+
include:
34+
- swift: "6.0"
35+
os: macos-15
36+
- swift: "6.1"
37+
os: macos-15
38+
- action: test
39+
# - platform: tvOS
40+
# action: build
41+
# - platform: watchOS
42+
# action: build
43+
steps:
44+
- uses: actions/checkout@v4
45+
- uses: mxcl/xcodebuild@v3
46+
with:
47+
swift: ~${{ matrix.swift }}
48+
platform: ${{ matrix.platform }}
49+
action: ${{ matrix.action }}
50+
verbosity: xcbeautify
5351
linux:
5452
name: Linux (Swift ${{ matrix.swift }})
5553
runs-on: ubuntu-latest
5654
strategy:
5755
fail-fast: false
5856
matrix:
5957
swift:
60-
- "5.10"
6158
- "6.0"
59+
# - "6.1"
6260
container:
6361
image: swift:${{ matrix.swift }}
6462
steps:

Package.swift

+3-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version: 5.10
1+
// swift-tools-version: 6.0
22

33
import PackageDescription
44
import CompilerPluginSupport
@@ -10,6 +10,7 @@ let package = Package(
1010
.iOS(.v13),
1111
.tvOS(.v13),
1212
.watchOS(.v6),
13+
.visionOS(.v1),
1314
],
1415
products: [
1516
.library(name: "Once", targets: ["Once"]),
@@ -44,15 +45,7 @@ package.dependencies += [
4445
for target in package.targets {
4546
target.swiftSettings = target.swiftSettings ?? []
4647
target.swiftSettings? += [
47-
.enableUpcomingFeature("BareSlashRegexLiterals"),
48-
.enableUpcomingFeature("ConciseMagicFile"),
49-
.enableUpcomingFeature("DeprecateApplicationMain"),
50-
.enableUpcomingFeature("DisableOutwardActorInference"),
48+
.swiftLanguageMode(.v6),
5149
.enableUpcomingFeature("ExistentialAny"),
52-
.enableUpcomingFeature("ForwardTrailingClosures"),
53-
.enableUpcomingFeature("GlobalConcurrency"),
54-
.enableUpcomingFeature("ImportObjcForwardDeclarations"),
55-
.enableUpcomingFeature("IsolatedDefaultValues"),
56-
.enableExperimentalFeature("StrictConcurrency=complete"),
5750
]
5851
}

[email protected]

-50
This file was deleted.

0 commit comments

Comments
 (0)