From 9a30dd55dd6f82d25f14a7859797ebd0b378a70e Mon Sep 17 00:00:00 2001
From: Dariusz Rybicki <dariusz@elixxir.io>
Date: Thu, 8 Sep 2022 19:14:25 +0200
Subject: [PATCH 1/2] Update package dependencies
---
Examples/xx-messenger/Package.swift | 4 ++--
.../xcshareddata/swiftpm/Package.resolved | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Examples/xx-messenger/Package.swift b/Examples/xx-messenger/Package.swift
index 5df8eb39..70066bd2 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/XXMessenger.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Examples/xx-messenger/XXMessenger.xcworkspace/xcshareddata/swiftpm/Package.resolved
index b9909a30..2edb1e10 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"
}
},
{
--
GitLab
From 510ab87eb682dfeef7a8e2d7b3c9dcd1f6b985e8 Mon Sep 17 00:00:00 2001
From: Dariusz Rybicki <dariusz@elixxir.io>
Date: Thu, 8 Sep 2022 19:20:43 +0200
Subject: [PATCH 2/2] Update WithViewStore usage
---
Examples/xx-messenger/Sources/AppFeature/AppView.swift | 2 +-
Examples/xx-messenger/Sources/ContactFeature/ContactView.swift | 2 +-
.../xx-messenger/Sources/ContactsFeature/ContactsView.swift | 2 +-
Examples/xx-messenger/Sources/HomeFeature/HomeView.swift | 2 +-
.../xx-messenger/Sources/RegisterFeature/RegisterView.swift | 2 +-
Examples/xx-messenger/Sources/RestoreFeature/RestoreView.swift | 2 +-
.../Sources/SendRequestFeature/SendRequestView.swift | 2 +-
.../xx-messenger/Sources/UserSearchFeature/UserSearchView.swift | 2 +-
Examples/xx-messenger/Sources/WelcomeFeature/WelcomeView.swift | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Examples/xx-messenger/Sources/AppFeature/AppView.swift b/Examples/xx-messenger/Sources/AppFeature/AppView.swift
index 2af6d352..64a8411d 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 98691693..1cd8fa2e 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 b7798685..ce811f9d 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 414bf928..f1abfb2b 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 c3601630..4b168c27 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 137b5506..b2cf3e86 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 fbfd9958..809d45be 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 c6944119..b3a1f0a4 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 1205c67e..32312386 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 {
--
GitLab