Merge pull request #20 from corteggo/feature/swift-6

heinzl · web-flow · commit ea2bfd69b348 · 2026-04-14T13:55:08.000+02:00
Migrate to Swift 6
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   test:
-    runs-on: macos-14
+    runs-on: macos-26
     steps:
       - uses: actions/checkout@v4.2.2
       - name: Run tests
@@ -29,7 +29,7 @@ jobs:
               -derivedDataPath DerivedData \
               -clonedSourcePackagesDirPath ClonedSourcePackages \
               -enableCodeCoverage YES \
-              -destination 'platform=iOS Simulator,name=iPhone 15' \
+              -destination 'platform=iOS Simulator,name=iPhone 17' \
               | xcpretty --report junit --output test_report.xml
       - name: Extract code coverage
         run: |
diff --git a/Examples/ComposableNavigation-Examples/ComposableNavigation-Examples.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Examples/ComposableNavigation-Examples/ComposableNavigation-Examples.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.9
+// swift-tools-version:6.0
 
 import PackageDescription
 
diff --git a/Sources/ComposableNavigation/ModalNavigation/ModalNavigation.swift b/Sources/ComposableNavigation/ModalNavigation/ModalNavigation.swift
@@ -3,8 +3,10 @@ import ComposableArchitecture
 
 /// `ModalNavigation` models state and actions of a commonly used modal view presentation.
 /// Views can be presented with a certain style and dismissed.
-public struct ModalNavigation<Item: Equatable>: Reducer {
-	public init() {}
+public struct ModalNavigation<Item: Equatable>: Reducer
+    where Item: SendableMetatype {
+	
+    public init() {}
 	
 	public struct State: Equatable {
 		public var styledItem: StyledItem?
@@ -56,3 +58,7 @@ public struct ModalNavigation<Item: Equatable>: Reducer {
 		}
 	}
 }
+
+extension ModalNavigation.State: Sendable where Item: Sendable { }
+extension ModalNavigation.Action: Sendable where Item: Sendable { }
+extension ModalNavigation.StyledItem: Sendable where Item: Sendable { }
diff --git a/Sources/ComposableNavigation/ModalNavigation/ModalNavigationHandler.swift b/Sources/ComposableNavigation/ModalNavigation/ModalNavigationHandler.swift
@@ -8,8 +8,10 @@ import ComposableArchitecture
 /// Additionally, it acts as the `UIAdaptivePresentationControllerDelegate` and automatically updates the state
 /// for pull-to-dismiss for views presented as a sheet.
 @MainActor
-public class ModalNavigationHandler<ViewProvider: ViewProviding>: NSObject, UIAdaptivePresentationControllerDelegate {
-	public typealias Item = ViewProvider.Item
+public class ModalNavigationHandler<ViewProvider: ViewProviding>: NSObject, UIAdaptivePresentationControllerDelegate
+    where ViewProvider.Item: SendableMetatype {
+	
+    public typealias Item = ViewProvider.Item
 	public typealias Navigation = ModalNavigation<Item>
 	
 	internal let viewStore: ViewStore<Navigation.State, Navigation.Action>
diff --git a/Sources/ComposableNavigation/ModalNavigation/ModalNavigationViewController.swift b/Sources/ComposableNavigation/ModalNavigation/ModalNavigationViewController.swift
@@ -4,8 +4,10 @@ import ComposableArchitecture
 /// A convenience container view controller intended to decouple the content and modal presented views.
 /// This way the content view can be reused in multiple contexts without
 /// tying the content view's implementation and the navigation logic together.
-public class ModalNavigationViewController<ViewProvider: ViewProviding>: UIViewController {
-	internal let navigationHandler: ModalNavigationHandler<ViewProvider>
+public class ModalNavigationViewController<ViewProvider: ViewProviding>: UIViewController
+    where ViewProvider.Item: SendableMetatype {
+	
+    internal let navigationHandler: ModalNavigationHandler<ViewProvider>
 	
 	public convenience init(
 		contentViewController: UIViewController,
diff --git a/Sources/ComposableNavigation/StackNavigation/StackNavigation.swift b/Sources/ComposableNavigation/StackNavigation/StackNavigation.swift
@@ -3,8 +3,10 @@ import OrderedCollections
 
 /// `StackNavigation` models state and actions of a stack-based scheme for navigating hierarchical content.
 /// Views can be pushed on the stack or popped from the stack. Even mutations to the whole stack can be performed.
-public struct StackNavigation<Item: Equatable>: Reducer {
-	public init() {}
+public struct StackNavigation<Item: Equatable>: Reducer
+    where Item: SendableMetatype {
+	
+    public init() {}
 	
 	public struct State: Equatable {
 		public var items: [Item]
@@ -64,3 +66,6 @@ public struct StackNavigation<Item: Equatable>: Reducer {
 		state.areAnimationsEnabled = animated
 	}
 }
+
+extension StackNavigation.State: Sendable where Item: Sendable { }
+extension StackNavigation.Action: Sendable where Item: Sendable { }
diff --git a/Sources/ComposableNavigation/StackNavigation/StackNavigationHandler.swift b/Sources/ComposableNavigation/StackNavigation/StackNavigationHandler.swift
@@ -7,8 +7,10 @@ import OrderedCollections
 ///
 /// It also supports automatic state updates for popping items via the leading-edge swipe gesture or the long press back-button menu.
 @MainActor
-public class StackNavigationHandler<ViewProvider: ViewProviding>: NSObject, UINavigationControllerDelegate {
-	public typealias Item = ViewProvider.Item
+public class StackNavigationHandler<ViewProvider: ViewProviding>: NSObject, UINavigationControllerDelegate
+    where ViewProvider.Item: SendableMetatype {
+	
+    public typealias Item = ViewProvider.Item
 	public typealias Navigation = StackNavigation<Item>
 	
 	internal let viewStore: ViewStore<Navigation.State, Navigation.Action>
diff --git a/Sources/ComposableNavigation/StackNavigation/StackNavigationViewController.swift b/Sources/ComposableNavigation/StackNavigation/StackNavigationViewController.swift
@@ -2,8 +2,10 @@ import UIKit
 import ComposableArchitecture
 
 /// A convenience UINavigationController implementation containing a `StackNavigationHandler`.
-public class StackNavigationViewController<ViewProvider: ViewProviding>: UINavigationController {
-	internal let navigationHandler: StackNavigationHandler<ViewProvider>
+public class StackNavigationViewController<ViewProvider: ViewProviding>: UINavigationController
+    where ViewProvider.Item: SendableMetatype {
+	
+    internal let navigationHandler: StackNavigationHandler<ViewProvider>
 	
 	public convenience init(
 		store: Store<StackNavigation<ViewProvider.Item>.State, StackNavigation<ViewProvider.Item>.Action>,
diff --git a/Sources/ComposableNavigation/TabNavigation/TabNavigation.swift b/Sources/ComposableNavigation/TabNavigation/TabNavigation.swift
@@ -6,8 +6,10 @@ import OrderedCollections
 ///
 /// The active navigation item can be changed by setting a new item. Mutations to the items array
 /// are reflected as well (e.g. changing the tab order).
-public struct TabNavigation<Item: Equatable>: Reducer {
-	public init() {}
+public struct TabNavigation<Item: Equatable>: Reducer
+    where Item: SendableMetatype {
+	
+    public init() {}
 	
 	public struct State: Equatable {
 		public var items: [Item]
@@ -62,3 +64,6 @@ public struct TabNavigation<Item: Equatable>: Reducer {
 		state.activeItem = item
 	}
 }
+
+extension TabNavigation.State: Sendable where Item: Sendable { }
+extension TabNavigation.Action: Sendable where Item: Sendable { }
diff --git a/Sources/ComposableNavigation/TabNavigation/TabNavigationHandler.swift b/Sources/ComposableNavigation/TabNavigation/TabNavigationHandler.swift
@@ -8,8 +8,9 @@ import ComposableArchitecture
 /// Additionally, it acts as the `UITabBarControllerDelegate` and automatically updates the state
 /// when the active tab is changed by the user.
 @MainActor
-public class TabNavigationHandler<ViewProvider: ViewProviding>: NSObject, UITabBarControllerDelegate {
-	public typealias Item = ViewProvider.Item
+public class TabNavigationHandler<ViewProvider: ViewProviding>: NSObject, UITabBarControllerDelegate where ViewProvider.Item: SendableMetatype {
+	
+    public typealias Item = ViewProvider.Item
 	public typealias Navigation = TabNavigation<Item>
 	
 	internal let viewStore: ViewStore<Navigation.State, Navigation.Action>
diff --git a/Sources/ComposableNavigation/TabNavigation/TabNavigationViewController.swift b/Sources/ComposableNavigation/TabNavigation/TabNavigationViewController.swift
@@ -2,8 +2,10 @@ import UIKit
 import ComposableArchitecture
 
 /// A convenience UITabBarController implementation containing a `TabNavigationHandler`.
-public class TabNavigationViewController<ViewProvider: ViewProviding>: UITabBarController {
-	internal let navigationHandler: TabNavigationHandler<ViewProvider>
+public class TabNavigationViewController<ViewProvider: ViewProviding>: UITabBarController
+    where ViewProvider.Item: SendableMetatype {
+	
+    internal let navigationHandler: TabNavigationHandler<ViewProvider>
 	
 	public convenience init(
 		store: Store<TabNavigation<ViewProvider.Item>.State, TabNavigation<ViewProvider.Item>.Action>,
diff --git a/Sources/ComposableNavigation/Utils/Store+CompactMap.swift b/Sources/ComposableNavigation/Utils/Store+CompactMap.swift
@@ -4,7 +4,7 @@ public extension Store where State: Equatable {
 	func compactMap<NonOptionalState, Unwrapped>(
 		_ transform: (Store<NonOptionalState, Action>) -> Unwrapped
 	) -> Unwrapped? where State == NonOptionalState? {
-		if var state = self.withState({ $0 }) {
+        if var state = self.withState({ $0 }) {
 			return transform(
 				self.scope(
 					state: {
diff --git a/Sources/ComposableNavigation/ViewProviding.swift b/Sources/ComposableNavigation/ViewProviding.swift
@@ -4,6 +4,7 @@ import SwiftUI
 @MainActor
 public protocol ViewProviding {
 	associatedtype Item: Hashable
+    
 	func makePresentable(for navigationItem: Item) -> Presentable
 }
 
diff --git a/Tests/ComposableNavigationTests/ModalNavigationTests.swift b/Tests/ComposableNavigationTests/ModalNavigationTests.swift
@@ -3,8 +3,8 @@ import XCTest
 import ComposableArchitecture
 @testable import ComposableNavigation
 
+@MainActor
 class ModalNavigationTests: XCTestCase {
-	@MainActor
 	func testPresentingFullScreenItem() async {
 		let store = makeStore(.init(styledItem: nil))
 		
@@ -13,7 +13,6 @@ class ModalNavigationTests: XCTestCase {
 		}
 	}
 	
-	@MainActor
 	func testPresentingSheetItem() async {
 		let store = makeStore(.init(styledItem: nil))
 		
@@ -22,7 +21,6 @@ class ModalNavigationTests: XCTestCase {
 		}
 	}
 	
-	@MainActor
 	func testSettingModalItem() async {
 		let store = makeStore(.init(styledItem: nil))
 		
@@ -31,7 +29,6 @@ class ModalNavigationTests: XCTestCase {
 		}
 	}
 	
-	@MainActor
 	func testDismissingItem() async {
 		let store = makeStore(.init(styledItem: .init(item: 1, style: .pageSheet)))
 		
@@ -40,7 +37,6 @@ class ModalNavigationTests: XCTestCase {
 		}
 	}
 	
-	@MainActor
 	func testDismissingWithoutItem() async {
 		let store = makeStore(.init(styledItem: nil))
 		store.exhaustivity = .off
@@ -50,7 +46,6 @@ class ModalNavigationTests: XCTestCase {
 		}
 	}
 	
-	@MainActor
 	func testChangingStyle() async {
 		let store = makeStore(.init(styledItem: .init(item: 1, style: .pageSheet)))
 		
@@ -59,7 +54,6 @@ class ModalNavigationTests: XCTestCase {
 		}
 	}
 	
-	@MainActor
 	func testChangingItem() async {
 		let store = makeStore(.init(styledItem: .init(item: 1, style: .pageSheet)))
 		
@@ -68,7 +62,6 @@ class ModalNavigationTests: XCTestCase {
 		}
 	}
 	
-	@MainActor
 	func testDisablingAnimation() async {
 		let store = makeStore(.init(styledItem: nil))
 		
diff --git a/Tests/ComposableNavigationTests/StackNavigationTests.swift b/Tests/ComposableNavigationTests/StackNavigationTests.swift
diff --git a/Tests/ComposableNavigationTests/StoreCompactMapTest.swift b/Tests/ComposableNavigationTests/StoreCompactMapTest.swift
diff --git a/Tests/ComposableNavigationTests/TabNavigationTests.swift b/Tests/ComposableNavigationTests/TabNavigationTests.swift

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// swift-tools-version:5.9`
	`1`	`+// swift-tools-version:6.0`
`2`	`2`
`3`	`3`	`import PackageDescription`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,10 @@ import ComposableArchitecture`
`3`	`3`
`4`	`4`	/// `ModalNavigation` models state and actions of a commonly used modal view presentation.
`5`	`5`	`/// Views can be presented with a certain style and dismissed.`
`6`		`-public struct ModalNavigation<Item: Equatable>: Reducer {`
`7`		`- public init() {}`
	`6`	`+public struct ModalNavigation<Item: Equatable>: Reducer`
	`7`	`+ where Item: SendableMetatype {`
	`8`	`+`
	`9`	`+ public init() {}`
`8`	`10`
`9`	`11`	`public struct State: Equatable {`
`10`	`12`	`public var styledItem: StyledItem?`
`@@ -56,3 +58,7 @@ public struct ModalNavigation<Item: Equatable>: Reducer {`
`56`	`58`	`}`
`57`	`59`	`}`
`58`	`60`	`}`
	`61`	`+`
	`62`	`+extension ModalNavigation.State: Sendable where Item: Sendable { }`
	`63`	`+extension ModalNavigation.Action: Sendable where Item: Sendable { }`
	`64`	`+extension ModalNavigation.StyledItem: Sendable where Item: Sendable { }`