Skip to content

Commit fbe408d

Browse files
lks574interactord
authored andcommitted
feat: Support Swift 6
1 parent 648ef4e commit fbe408d

91 files changed

Lines changed: 289 additions & 234 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.

Examples/SingleNavigator/01-SingleBasic/01-SingleBasic.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@
420420
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
421421
SUPPORTS_MACCATALYST = NO;
422422
SWIFT_EMIT_LOC_STRINGS = YES;
423-
SWIFT_VERSION = 5.0;
423+
SWIFT_VERSION = 6.0;
424424
TARGETED_DEVICE_FAMILY = "1,2";
425425
};
426426
name = Debug;
@@ -458,7 +458,7 @@
458458
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
459459
SUPPORTS_MACCATALYST = NO;
460460
SWIFT_EMIT_LOC_STRINGS = YES;
461-
SWIFT_VERSION = 5.0;
461+
SWIFT_VERSION = 6.0;
462462
TARGETED_DEVICE_FAMILY = "1,2";
463463
};
464464
name = Release;
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
import LinkNavigator
22

3-
public typealias RootNavigatorType = LinkNavigatorFindLocationUsable & LinkNavigatorProtocol
4-
5-
// MARK: - AppRouterGroup
3+
public struct AppRouterGroup {
4+
public init() { }
5+
}
66

7-
struct AppRouterGroup<RootNavigator: RootNavigatorType> {
8-
init() { }
7+
extension AppRouterGroup {
98

10-
var routers: [RouteBuilderOf<RootNavigator>] {
9+
@MainActor
10+
func routers() -> [RouteBuilderOf<SingleLinkNavigator>] {
1111
[
12-
HomeRouteBuilder.generate(),
13-
Page1RouteBuilder.generate(),
14-
Page2RouteBuilder.generate(),
15-
Page3RouteBuilder.generate(),
16-
Page4RouteBuilder.generate(),
12+
HomeRouteBuilder().generate(),
13+
Page1RouteBuilder().generate(),
14+
Page2RouteBuilder().generate(),
15+
Page3RouteBuilder().generate(),
16+
Page4RouteBuilder().generate(),
1717
]
1818
}
1919
}

Examples/SingleNavigator/01-SingleBasic/SingleBasic/Page/Home/HomeRouteBuilder.swift

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import LinkNavigator
22
import SwiftUI
33

4-
struct HomeRouteBuilder<RootNavigator: RootNavigatorType> {
4+
struct HomeRouteBuilder {
5+
6+
@MainActor
7+
func generate() -> RouteBuilderOf<SingleLinkNavigator> {
8+
let matchPath: String = "home"
59

6-
static func generate() -> RouteBuilderOf<RootNavigator> {
7-
var matchPath: String { "home" }
810
return .init(matchPath: matchPath) { navigator, _, _ -> RouteViewController? in
911
WrappingController(matchPath: matchPath) {
1012
HomeView(navigator: navigator)

Examples/SingleNavigator/01-SingleBasic/SingleBasic/Page/Home/HomeView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ struct HomeView: View {
55

66
// MARK: Internal
77

8-
let navigator: RootNavigatorType
8+
let navigator: SingleLinkNavigator
99

1010
var body: some View {
1111
VStack(spacing: 30) {

Examples/SingleNavigator/01-SingleBasic/SingleBasic/Page/Page1/Page1RouteBuilder.swift

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import LinkNavigator
22
import SwiftUI
33

4-
struct Page1RouteBuilder<RootNavigator: RootNavigatorType> {
4+
struct Page1RouteBuilder {
5+
6+
@MainActor
7+
func generate() -> RouteBuilderOf<SingleLinkNavigator> {
8+
let matchPath: String = "page1"
59

6-
static func generate() -> RouteBuilderOf<RootNavigator> {
7-
var matchPath: String { "page1" }
810
return .init(matchPath: matchPath) { navigator, _, _ -> RouteViewController? in
911
WrappingController(matchPath: matchPath) {
1012
Page1View(navigator: navigator)

Examples/SingleNavigator/01-SingleBasic/SingleBasic/Page/Page1/Page1View.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ struct Page1View: View {
55

66
// MARK: Internal
77

8-
let navigator: RootNavigatorType
8+
let navigator: SingleLinkNavigator
99

1010
var body: some View {
1111
VStack(spacing: 30) {

Examples/SingleNavigator/01-SingleBasic/SingleBasic/Page/Page2/Page2RouteBuilder.swift

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import LinkNavigator
22
import SwiftUI
33

4-
struct Page2RouteBuilder<RootNavigator: RootNavigatorType> {
4+
struct Page2RouteBuilder {
5+
6+
@MainActor
7+
func generate() -> RouteBuilderOf<SingleLinkNavigator> {
8+
let matchPath: String = "page2"
59

6-
static func generate() -> RouteBuilderOf<RootNavigator> {
7-
var matchPath: String { "page2" }
810
return .init(matchPath: matchPath) { navigator, _, _ -> RouteViewController? in
911
WrappingController(matchPath: matchPath) {
1012
Page2View(navigator: navigator)

Examples/SingleNavigator/01-SingleBasic/SingleBasic/Page/Page2/Page2View.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ struct Page2View: View {
55

66
// MARK: Internal
77

8-
let navigator: RootNavigatorType
8+
let navigator: SingleLinkNavigator
99

1010
var body: some View {
1111
VStack(spacing: 30) {

Examples/SingleNavigator/01-SingleBasic/SingleBasic/Page/Page3/Page3RouteBuilder.swift

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import LinkNavigator
22
import SwiftUI
33

4-
struct Page3RouteBuilder<RootNavigator: RootNavigatorType> {
4+
struct Page3RouteBuilder {
5+
6+
@MainActor
7+
func generate() -> RouteBuilderOf<SingleLinkNavigator> {
8+
let matchPath: String = "page3"
59

6-
static func generate() -> RouteBuilderOf<RootNavigator> {
7-
var matchPath: String { "page3" }
810
return .init(matchPath: matchPath) { navigator, _, _ -> RouteViewController? in
911
WrappingController(matchPath: matchPath) {
1012
Page3View(navigator: navigator)

Examples/SingleNavigator/01-SingleBasic/SingleBasic/Page/Page3/Page3View.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ struct Page3View: View {
55

66
// MARK: Internal
77

8-
let navigator: RootNavigatorType
8+
let navigator: SingleLinkNavigator
99

1010
var body: some View {
1111
VStack(spacing: 30) {

0 commit comments

Comments
 (0)