Skip to content

Bump to Swift 6.0 #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,17 @@ jobs:
- mac-catalyst
- tvOS
swift:
- "5.10"
- "6.0"
- "6.1"
steps:
- name: Git Checkout
uses: actions/checkout@v4

- name: Disable Macro Fingerprint Validation
run: |
defaults write com.apple.dt.Xcode IDESkipMacroFingerprintValidation -bool YES
defaults write com.apple.dt.Xcode IDESkipPackagePluginFingerprintValidatation -bool YES

- name: Test Library
uses: mxcl/xcodebuild@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.10
6.0
29 changes: 28 additions & 1 deletion Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 10 additions & 11 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version: 5.10
// swift-tools-version: 6.0

import PackageDescription

Expand Down Expand Up @@ -37,33 +37,31 @@ let package = Package(
]),

.target(name: "UIKitNavigationTransitions", dependencies: [
.product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
"NavigationTransition",
"RuntimeAssociation",
"RuntimeSwizzling",
.product(name: "ObjCRuntimeTools", package: "objc-runtime-tools"),
.product(name: "Once", package: "swift-once-macro"),
]),

.target(name: "SwiftUINavigationTransitions", dependencies: [
"NavigationTransition",
"RuntimeAssociation",
"RuntimeSwizzling",
"UIKitNavigationTransitions",
.product(name: "SwiftUIIntrospect", package: "swiftui-introspect"),
]),

.target(name: "RuntimeAssociation"),
.target(name: "RuntimeSwizzling"),

.target(name: "TestUtils", dependencies: [
.product(name: "CustomDump", package: "swift-custom-dump"),
.product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
"SwiftUINavigationTransitions",
]),
]
],
swiftLanguageModes: [.v5]
)

// MARK: Dependencies

package.dependencies = [
.package(url: "https://github.com/davdroman/objc-runtime-tools", from: "0.1.0"),
.package(url: "https://github.com/davdroman/swift-once-macro", from: "1.0.0"),
.package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.0.0"), // dev
.package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.0.0"),
.package(url: "https://github.com/siteline/swiftui-introspect", from: "1.0.0"),
Expand All @@ -72,6 +70,7 @@ package.dependencies = [
for target in package.targets {
target.swiftSettings = target.swiftSettings ?? []
target.swiftSettings? += [
.enableExperimentalFeature("AccessLevelOnImport"),
.enableUpcomingFeature("ExistentialAny"),
.enableUpcomingFeature("InternalImportsByDefault"),
]
}
79 changes: 0 additions & 79 deletions Package@swift-6.0.swift

This file was deleted.

2 changes: 1 addition & 1 deletion Sources/Animation/InterpolatingSpring.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
internal import UIKit // TODO: remove internal from all imports when Swift 5.10 is dropped
import UIKit

extension Animation {
public static func interpolatingSpring(
Expand Down
2 changes: 1 addition & 1 deletion Sources/Animation/TimingCurve.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
internal import UIKit // TODO: remove internal from all imports when Swift 5.10 is dropped
import UIKit

extension Animation {
public static func timingCurve(
Expand Down
2 changes: 1 addition & 1 deletion Sources/NavigationTransition/Fade.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
internal import AtomicTransition
import AtomicTransition

extension AnyNavigationTransition {
/// A transition that fades the pushed view in, fades the popped view out, or cross-fades both views.
Expand Down
2 changes: 1 addition & 1 deletion Sources/NavigationTransition/Slide.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
internal import AtomicTransition
import AtomicTransition
public import SwiftUI

extension AnyNavigationTransition {
Expand Down
20 changes: 0 additions & 20 deletions Sources/RuntimeAssociation/RuntimeAssociation.swift

This file was deleted.

29 changes: 0 additions & 29 deletions Sources/RuntimeAssociation/RuntimeAssociationPolicy.swift

This file was deleted.

49 changes: 0 additions & 49 deletions Sources/RuntimeSwizzling/Swizzle.swift

This file was deleted.

2 changes: 1 addition & 1 deletion Sources/SwiftUINavigationTransitions/SwiftUISupport.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
public import UIKitNavigationTransitions
public import SwiftUI
@_spi(Advanced) internal import SwiftUIIntrospect
@_spi(Advanced) import SwiftUIIntrospect

extension View {
@MainActor
Expand Down
2 changes: 1 addition & 1 deletion Sources/TestUtils/AnimatorTransientView+Mocks.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@testable public import Animator
internal import UIKit
import IssueReporting
import UIKit

extension AnimatorTransientView {
public static var unimplemented: AnimatorTransientView {
Expand Down
8 changes: 4 additions & 4 deletions Sources/UIKitNavigationTransitions/Delegate.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
internal import Animation
internal import Animator
internal import NavigationTransition
internal import UIKit
import Animation
import Animator
import NavigationTransition
import UIKit

final class NavigationTransitionDelegate: NSObject, UINavigationControllerDelegate {
var transition: AnyNavigationTransition
Expand Down
2 changes: 1 addition & 1 deletion Sources/UIKitNavigationTransitions/Interaction.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
internal import UIKit
import UIKit

extension UINavigationController {
@objc func handleInteraction(_ gestureRecognizer: UIPanGestureRecognizer) {
Expand Down
Loading
Loading