diff --git a/Examples/xx-messenger/Package.swift b/Examples/xx-messenger/Package.swift index 5df8eb39dd57b9f788e430521dd637d0e48e1b64..70066bd2241017e30bc4702ec1127cc25fed1688 100644 --- a/Examples/xx-messenger/Package.swift +++ b/Examples/xx-messenger/Package.swift @@ -35,7 +35,7 @@ let package = Package( ), .package( url: "https://github.com/pointfreeco/swift-composable-architecture.git", - .upToNextMajor(from: "0.39.0") + .upToNextMajor(from: "0.40.0") ), .package( url: "https://git.xx.network/elixxir/client-ios-db.git", @@ -43,7 +43,7 @@ let package = Package( ), .package( url: "https://github.com/darrarski/swift-composable-presentation.git", - .upToNextMajor(from: "0.5.2") + .upToNextMajor(from: "0.5.3") ), .package( url: "https://github.com/pointfreeco/xctest-dynamic-overlay.git", diff --git a/Examples/xx-messenger/Sources/AppFeature/AppView.swift b/Examples/xx-messenger/Sources/AppFeature/AppView.swift index 2af6d3521c4037f54c34400acd51103c9429451d..64a8411df29fe65ebab6b403ae9f2c88438d140c 100644 --- a/Examples/xx-messenger/Sources/AppFeature/AppView.swift +++ b/Examples/xx-messenger/Sources/AppFeature/AppView.swift @@ -26,7 +26,7 @@ struct AppView: View { } var body: some View { - WithViewStore(store.scope(state: ViewState.init)) { viewStore in + WithViewStore(store, observe: ViewState.init) { viewStore in ZStack { switch viewStore.state { case .loading: diff --git a/Examples/xx-messenger/Sources/ContactFeature/ContactView.swift b/Examples/xx-messenger/Sources/ContactFeature/ContactView.swift index 9869169327924ffcf719f88e0fd71feee16493e8..1cd8fa2eda4f9058cd8ed333f15e15f7588cd2dc 100644 --- a/Examples/xx-messenger/Sources/ContactFeature/ContactView.swift +++ b/Examples/xx-messenger/Sources/ContactFeature/ContactView.swift @@ -36,7 +36,7 @@ public struct ContactView: View { } public var body: some View { - WithViewStore(store.scope(state: ViewState.init)) { viewStore in + WithViewStore(store, observe: ViewState.init) { viewStore in Form { if viewStore.xxContactIsSet { Section { diff --git a/Examples/xx-messenger/Sources/ContactsFeature/ContactsView.swift b/Examples/xx-messenger/Sources/ContactsFeature/ContactsView.swift index b7798685cf75d851adba765f751c6fb5a47ceea0..ce811f9d7bab2d22cb530cc6f2725be004a603e4 100644 --- a/Examples/xx-messenger/Sources/ContactsFeature/ContactsView.swift +++ b/Examples/xx-messenger/Sources/ContactsFeature/ContactsView.swift @@ -23,7 +23,7 @@ public struct ContactsView: View { } public var body: some View { - WithViewStore(store.scope(state: ViewState.init)) { viewStore in + WithViewStore(store, observe: ViewState.init) { viewStore in Form { ForEach(viewStore.contacts) { contact in if contact.id == viewStore.myId { diff --git a/Examples/xx-messenger/Sources/HomeFeature/HomeView.swift b/Examples/xx-messenger/Sources/HomeFeature/HomeView.swift index 414bf928d0f2eb0e17b692cacd7cd2c8030b789a..f1abfb2b9ebf3d4b2ad4d20aa477b2f49d96fb80 100644 --- a/Examples/xx-messenger/Sources/HomeFeature/HomeView.swift +++ b/Examples/xx-messenger/Sources/HomeFeature/HomeView.swift @@ -28,7 +28,7 @@ public struct HomeView: View { } public var body: some View { - WithViewStore(store.scope(state: ViewState.init)) { viewStore in + WithViewStore(store, observe: ViewState.init) { viewStore in NavigationView { Form { Section { diff --git a/Examples/xx-messenger/Sources/RegisterFeature/RegisterView.swift b/Examples/xx-messenger/Sources/RegisterFeature/RegisterView.swift index c3601630ea07f3acdd2e6a5ba497705b06d12417..4b168c2765f7a2f67afad164362807e0daa5a819 100644 --- a/Examples/xx-messenger/Sources/RegisterFeature/RegisterView.swift +++ b/Examples/xx-messenger/Sources/RegisterFeature/RegisterView.swift @@ -24,7 +24,7 @@ public struct RegisterView: View { } public var body: some View { - WithViewStore(store.scope(state: ViewState.init)) { viewStore in + WithViewStore(store, observe: ViewState.init) { viewStore in NavigationView { Form { Section { diff --git a/Examples/xx-messenger/Sources/RestoreFeature/RestoreView.swift b/Examples/xx-messenger/Sources/RestoreFeature/RestoreView.swift index 137b55069b5c0e5df287b2351e181309abbe7181..b2cf3e86cdaa2db59c2ce37eb3c8b33f0da38868 100644 --- a/Examples/xx-messenger/Sources/RestoreFeature/RestoreView.swift +++ b/Examples/xx-messenger/Sources/RestoreFeature/RestoreView.swift @@ -13,7 +13,7 @@ public struct RestoreView: View { } public var body: some View { - WithViewStore(store.scope(state: ViewState.init)) { viewStore in + WithViewStore(store, observe: ViewState.init) { viewStore in NavigationView { Form { Section { diff --git a/Examples/xx-messenger/Sources/SendRequestFeature/SendRequestView.swift b/Examples/xx-messenger/Sources/SendRequestFeature/SendRequestView.swift index fbfd9958fbc721504586ee04a1927166c340fa6e..809d45be72436067d4e04c35bdef1995f7ed5a9d 100644 --- a/Examples/xx-messenger/Sources/SendRequestFeature/SendRequestView.swift +++ b/Examples/xx-messenger/Sources/SendRequestFeature/SendRequestView.swift @@ -39,7 +39,7 @@ public struct SendRequestView: View { } public var body: some View { - WithViewStore(store.scope(state: ViewState.init)) { viewStore in + WithViewStore(store, observe: ViewState.init) { viewStore in Form { Section { Button { diff --git a/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchView.swift b/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchView.swift index c694411972c9227955d33a1a3b0776a829d16546..b3a1f0a48be3ca73751906bd5c72e88363234535 100644 --- a/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchView.swift +++ b/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchView.swift @@ -29,7 +29,7 @@ public struct UserSearchView: View { } public var body: some View { - WithViewStore(store.scope(state: ViewState.init)) { viewStore in + WithViewStore(store, observe: ViewState.init) { viewStore in Form { Section { TextField( diff --git a/Examples/xx-messenger/Sources/WelcomeFeature/WelcomeView.swift b/Examples/xx-messenger/Sources/WelcomeFeature/WelcomeView.swift index 1205c67eece34b9214ce16b3eb6e22df93d37c4b..32312386644b0331d069a386e337f17b4003d41c 100644 --- a/Examples/xx-messenger/Sources/WelcomeFeature/WelcomeView.swift +++ b/Examples/xx-messenger/Sources/WelcomeFeature/WelcomeView.swift @@ -17,7 +17,7 @@ public struct WelcomeView: View { } public var body: some View { - WithViewStore(store.scope(state: ViewState.init)) { viewStore in + WithViewStore(store, observe: ViewState.init) { viewStore in NavigationView { Form { Section { diff --git a/Examples/xx-messenger/XXMessenger.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Examples/xx-messenger/XXMessenger.xcworkspace/xcshareddata/swiftpm/Package.resolved index b9909a307686e48727475bb07420e0efc4cd13cd..2edb1e10d880cea3447a78dce30ec3a7875d8339 100644 --- a/Examples/xx-messenger/XXMessenger.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Examples/xx-messenger/XXMessenger.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/combine-schedulers", "state" : { - "revision" : "9e42b4b0453da417a44daa17174103e7d1c5be07", - "version" : "0.7.3" + "revision" : "11973960af9c5426f22d337628cec4342c5e660d", + "version" : "0.7.4" } }, { @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/groue/GRDB.swift", "state" : { - "revision" : "23f4254ae36fa19aecd73047c0577a9f49850d1c", - "version" : "5.26.0" + "revision" : "dd7e7f39e8e4d7a22d258d9809a882f914690b01", + "version" : "5.26.1" } }, { @@ -50,8 +50,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-collections", "state" : { - "revision" : "48254824bb4248676bf7ce56014ff57b142b77eb", - "version" : "1.0.2" + "revision" : "f504716c27d2e5d4144fa4794b12129301d17729", + "version" : "1.0.3" } }, { @@ -59,8 +59,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-composable-architecture.git", "state" : { - "revision" : "a518935116b2bada7234f47073159b433d432af1", - "version" : "0.39.1" + "revision" : "5b78fbcb0583568392762b15a262b3106cfb5185", + "version" : "0.40.0" } }, {