diff --git a/Package.resolved b/Package.resolved index cebdfd5c9723..16f3f5aee6ec 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "0e9a414ac23b15d7d00b87671275679eb6cce1d5dc101ec944f5e8aee4cb097b", + "originHash" : "1313e97b3134138f8ca61f73141726a7e426c0097a38fadeba8e33be243b0d2e", "pins" : [ { "identity" : "combine-schedulers", @@ -15,8 +15,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-case-paths", "state" : { - "revision" : "9810c8d6c2914de251e072312f01d3bf80071852", - "version" : "1.7.1" + "revision" : "6989976265be3f8d2b5802c722f9ba168e227c71", + "version" : "1.7.2" } }, { @@ -42,8 +42,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-concurrency-extras", "state" : { - "revision" : "82a4ae7170d98d8538ec77238b7eb8e7199ef2e8", - "version" : "1.3.1" + "revision" : "5a3825302b1a0d744183200915a47b508c828e6f", + "version" : "1.3.2" } }, { @@ -60,8 +60,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-dependencies", "state" : { - "revision" : "4c90d6b2b9bf0911af87b103bb40f41771891596", - "version" : "1.9.2" + "revision" : "a10f9feeb214bc72b5337b6ef6d5a029360db4cc", + "version" : "1.9.5" } }, { @@ -96,8 +96,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-macro-testing", "state" : { - "revision" : "2de00af725ff4c43c9a90d7893835de312653169", - "version" : "0.6.3" + "revision" : "9ab11325daa51c7c5c10fcf16c92bac906717c7e", + "version" : "0.6.4" } }, { @@ -105,8 +105,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-navigation", "state" : { - "revision" : "4e89284c1966538109dc783497405bc680e9bc96", - "version" : "2.4.0" + "revision" : "6b7f44d218e776bb7a5246efb940440d57c8b2cf", + "version" : "2.4.2" } }, { @@ -114,8 +114,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-perception", "state" : { - "revision" : "f4f57cac7d273cddf0161293d47adbb5a6ba3aed", - "version" : "2.0.0" + "revision" : "30721accd0370d7c9cb5bd0f7cdf5a1a767b383d", + "version" : "2.0.8" } }, { @@ -123,8 +123,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-sharing", "state" : { - "revision" : "5d87dda90ed048f216826efbad404110141161bb", - "version" : "2.6.0" + "revision" : "3bfc408cc2d0bee2287c174da6b1c76768377818", + "version" : "2.7.4" } }, { @@ -132,8 +132,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-snapshot-testing", "state" : { - "revision" : "d7e40607dcd6bc26543f5d9433103f06e0b28f8f", - "version" : "1.18.6" + "revision" : "a8b7c5e0ed33d8ab8887d1654d9b59f2cbad529b", + "version" : "1.18.7" } }, { @@ -141,8 +141,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/swiftlang/swift-syntax", "state" : { - "revision" : "f99ae8aa18f0cf0d53481901f88a0991dc3bd4a2", - "version" : "601.0.1" + "revision" : "4799286537280063c85a32f09884cfbca301b1a1", + "version" : "602.0.0" } }, { @@ -150,8 +150,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay", "state" : { - "revision" : "23e3442166b5122f73f9e3e622cd1e4bafeab3b7", - "version" : "1.6.0" + "revision" : "b2ed9eabefe56202ee4939dd9fc46b6241c88317", + "version" : "1.6.1" } } ], diff --git a/Package.swift b/Package.swift index 815d8b2aef8a..e2c35ed86ab7 100644 --- a/Package.swift +++ b/Package.swift @@ -31,7 +31,7 @@ let package = Package( .package(url: "https://github.com/pointfreeco/swift-sharing", "0.1.2"..<"3.0.0"), .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.3.0"), .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.0"), - .package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"602.0.0"), + .package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"603.0.0"), ], targets: [ .target( diff --git a/Package@swift-6.0.swift b/Package@swift-6.0.swift index 06fff9013621..1ad4969c7db0 100644 --- a/Package@swift-6.0.swift +++ b/Package@swift-6.0.swift @@ -31,7 +31,7 @@ let package = Package( .package(url: "https://github.com/pointfreeco/swift-sharing", "0.1.2"..<"3.0.0"), .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.3.0"), .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.0"), - .package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"602.0.0"), + .package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"603.0.0"), ], targets: [ .target( diff --git a/Tests/ComposableArchitectureMacrosTests/ReducerMacroTests.swift b/Tests/ComposableArchitectureMacrosTests/ReducerMacroTests.swift index 8490b8d95e85..45ef49d6cb0e 100644 --- a/Tests/ComposableArchitectureMacrosTests/ReducerMacroTests.swift +++ b/Tests/ComposableArchitectureMacrosTests/ReducerMacroTests.swift @@ -241,6 +241,12 @@ enum CaseScope { } + + #if swift(<5.10) + @MainActor(unsafe) + #else + @preconcurrency @MainActor + #endif static func scope(_ store: ComposableArchitecture.Store) -> CaseScope { switch store.state { @@ -320,6 +326,12 @@ case tweet(ComposableArchitecture.StoreOf) case alert(AlertState) } + + #if swift(<5.10) + @MainActor(unsafe) + #else + @preconcurrency @MainActor + #endif static func scope(_ store: ComposableArchitecture.Store) -> CaseScope { switch store.state { case .activity: @@ -384,6 +396,12 @@ case timeline(ComposableArchitecture.StoreOf) case meeting(ComposableArchitecture.StoreOf) } + + #if swift(<5.10) + @MainActor(unsafe) + #else + @preconcurrency @MainActor + #endif static func scope(_ store: ComposableArchitecture.Store) -> CaseScope { switch store.state { case .timeline: @@ -432,6 +450,12 @@ enum CaseScope { } + + #if swift(<5.10) + @MainActor(unsafe) + #else + @preconcurrency @MainActor + #endif static func scope(_ store: ComposableArchitecture.Store) -> CaseScope { switch store.state { @@ -482,6 +506,12 @@ } + #if swift(<5.10) + @MainActor(unsafe) + #else + @preconcurrency @MainActor + #endif + package static func scope(_ store: ComposableArchitecture.Store) -> CaseScope { switch store.state { @@ -532,6 +562,12 @@ } + #if swift(<5.10) + @MainActor(unsafe) + #else + @preconcurrency @MainActor + #endif + public static func scope(_ store: ComposableArchitecture.Store) -> CaseScope { switch store.state { @@ -580,6 +616,12 @@ enum CaseScope { case alert(AlertState) } + + #if swift(<5.10) + @MainActor(unsafe) + #else + @preconcurrency @MainActor + #endif static func scope(_ store: ComposableArchitecture.Store) -> CaseScope { switch store.state { case let .alert(v0): @@ -638,6 +680,12 @@ case activity(ComposableArchitecture.StoreOf) case timeline(ComposableArchitecture.StoreOf) } + + #if swift(<5.10) + @MainActor(unsafe) + #else + @preconcurrency @MainActor + #endif static func scope(_ store: ComposableArchitecture.Store) -> CaseScope { switch store.state { case .activity: @@ -697,6 +745,12 @@ case timeline(ComposableArchitecture.StoreOf) case meeting(Meeting) } + + #if swift(<5.10) + @MainActor(unsafe) + #else + @preconcurrency @MainActor + #endif static func scope(_ store: ComposableArchitecture.Store) -> CaseScope { switch store.state { case .timeline: @@ -760,6 +814,12 @@ case dialog(ConfirmationDialogState) case meeting(Meeting, syncUp: SyncUp) } + + #if swift(<5.10) + @MainActor(unsafe) + #else + @preconcurrency @MainActor + #endif static func scope(_ store: ComposableArchitecture.Store) -> CaseScope { switch store.state { case let .alert(v0): @@ -830,6 +890,12 @@ case popover(ComposableArchitecture.StoreOf) case sheet(ComposableArchitecture.StoreOf) } + + #if swift(<5.10) + @MainActor(unsafe) + #else + @preconcurrency @MainActor + #endif static func scope(_ store: ComposableArchitecture.Store) -> CaseScope { switch store.state { case .drillDown: @@ -884,6 +950,12 @@ enum CaseScope { case feature(ComposableArchitecture.StoreOf) } + + #if swift(<5.10) + @MainActor(unsafe) + #else + @preconcurrency @MainActor + #endif static func scope(_ store: ComposableArchitecture.Store) -> CaseScope { switch store.state { case .feature: @@ -1246,6 +1318,12 @@ #endif } + + #if swift(<5.10) + @MainActor(unsafe) + #else + @preconcurrency @MainActor + #endif static func scope(_ store: ComposableArchitecture.Store) -> CaseScope { switch store.state { case .child: