Skip to content

Commit ace4008

Browse files
authored
Bump to Swift 6.0 (#152)
1 parent 4148cc2 commit ace4008

File tree

17 files changed

+160
-306
lines changed

17 files changed

+160
-306
lines changed

.github/workflows/ci.yml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,31 @@ jobs:
2626
- mac-catalyst
2727
- tvOS
2828
swift:
29-
- "5.10"
30-
- "6.0"
31-
- "6.1"
29+
- "6.0" # Xcode 16.2
30+
- "6.1" # Xcode 16.4
31+
- "6.2" # Xcode 26.0
3232
steps:
3333
- name: Git Checkout
3434
uses: actions/checkout@v4
3535

36+
- name: Disable Macro Fingerprint Validation
37+
run: |
38+
defaults write com.apple.dt.Xcode IDESkipMacroFingerprintValidation -bool YES
39+
defaults write com.apple.dt.Xcode IDESkipPackagePluginFingerprintValidatation -bool YES
40+
41+
- name: Select Xcode version
42+
uses: mxcl/xcodebuild@v3
43+
with:
44+
swift: ${{ matrix.swift }}
45+
action: none
46+
47+
- name: List Runtimes
48+
run: xcrun simctl list runtimes
49+
50+
- if: matrix.platform != 'mac-catalyst'
51+
name: Download Required Runtimes
52+
run: xcodebuild -downloadPlatform ${{ matrix.platform }}
53+
3654
- name: Test Library
3755
uses: mxcl/xcodebuild@v3
3856
with:

.swift-version

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

Package.resolved

Lines changed: 28 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 10 additions & 11 deletions
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

@@ -37,33 +37,31 @@ let package = Package(
3737
]),
3838

3939
.target(name: "UIKitNavigationTransitions", dependencies: [
40+
.product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
4041
"NavigationTransition",
41-
"RuntimeAssociation",
42-
"RuntimeSwizzling",
42+
.product(name: "ObjCRuntimeTools", package: "objc-runtime-tools"),
43+
.product(name: "Once", package: "swift-once-macro"),
4344
]),
4445

4546
.target(name: "SwiftUINavigationTransitions", dependencies: [
46-
"NavigationTransition",
47-
"RuntimeAssociation",
48-
"RuntimeSwizzling",
4947
"UIKitNavigationTransitions",
5048
.product(name: "SwiftUIIntrospect", package: "swiftui-introspect"),
5149
]),
5250

53-
.target(name: "RuntimeAssociation"),
54-
.target(name: "RuntimeSwizzling"),
55-
5651
.target(name: "TestUtils", dependencies: [
5752
.product(name: "CustomDump", package: "swift-custom-dump"),
5853
.product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
5954
"SwiftUINavigationTransitions",
6055
]),
61-
]
56+
],
57+
swiftLanguageModes: [.v5]
6258
)
6359

6460
// MARK: Dependencies
6561

6662
package.dependencies = [
63+
.package(url: "https://github.com/davdroman/objc-runtime-tools", from: "0.1.0"),
64+
.package(url: "https://github.com/davdroman/swift-once-macro", from: "1.0.0"),
6765
.package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.0.0"), // dev
6866
.package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.0.0"),
6967
.package(url: "https://github.com/siteline/swiftui-introspect", from: "1.0.0"),
@@ -72,6 +70,7 @@ package.dependencies = [
7270
for target in package.targets {
7371
target.swiftSettings = target.swiftSettings ?? []
7472
target.swiftSettings? += [
75-
.enableExperimentalFeature("AccessLevelOnImport"),
73+
.enableUpcomingFeature("ExistentialAny"),
74+
.enableUpcomingFeature("InternalImportsByDefault"),
7675
]
7776
}

Package@swift-6.0.swift

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

Sources/Animation/InterpolatingSpring.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
internal import UIKit // TODO: remove internal from all imports when Swift 5.10 is dropped
1+
import UIKit
22

33
extension Animation {
44
public static func interpolatingSpring(

Sources/Animation/TimingCurve.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
internal import UIKit // TODO: remove internal from all imports when Swift 5.10 is dropped
1+
import UIKit
22

33
extension Animation {
44
public static func timingCurve(

Sources/NavigationTransition/Fade.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
internal import AtomicTransition
1+
import AtomicTransition
22

33
extension AnyNavigationTransition {
44
/// A transition that fades the pushed view in, fades the popped view out, or cross-fades both views.

Sources/NavigationTransition/Slide.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
internal import AtomicTransition
1+
import AtomicTransition
22
public import SwiftUI
33

44
extension AnyNavigationTransition {

Sources/RuntimeAssociation/RuntimeAssociation.swift

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

0 commit comments

Comments
 (0)