chore(ios): bump swift-composable-architecture to 1.14.0

autoreleasefool · Sep 9, 2024 · 1c3ddbf · 1c3ddbf
1 parent 7bb7fc5
commit 1c3ddbf
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 47 deletions.
diff --git a/ios/Approach.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/Approach.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "8771c5711a41a827692553652185989bf6059d4b3867614dd33b8f3e35c7c9a9",
+  "originHash" : "4f792e11d41fc7e791a67e2c83bb5dfd95ee81a7e0879043f853d6c0793c807e",
   "pins" : [
     {
       "identity" : "cocoalumberjack",
@@ -69,8 +69,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-case-paths",
       "state" : {
-        "revision" : "8d712376c99fc0267aa0e41fea732babe365270a",
-        "version" : "1.3.3"
+        "revision" : "642e6aab8e03e5f992d9c83e38c5be98cfad5078",
+        "version" : "1.5.5"
       }
     },
     {
@@ -96,8 +96,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-composable-architecture.git",
       "state" : {
-        "revision" : "1f952d8c69ace5e53bb69a218e6ed00e03a4695c",
-        "version" : "1.11.2"
+        "revision" : "0d8980f5bcc5fe6941f1788758667ff2b8c10f03",
+        "version" : "1.14.0"
       }
     },
     {
@@ -114,8 +114,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-custom-dump",
       "state" : {
-        "revision" : "f01efb26f3a192a0e88dcdb7c3c391ec2fc25d9c",
-        "version" : "1.3.0"
+        "revision" : "82645ec760917961cfa08c9c0c7104a57a0fa4b1",
+        "version" : "1.3.3"
       }
     },
     {
@@ -145,6 +145,15 @@
         "version" : "1.5.4"
       }
     },
+    {
+      "identity" : "swift-navigation",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-navigation",
+      "state" : {
+        "revision" : "e834b3760731160d7d448509ee6a1408c8582a6b",
+        "version" : "2.2.0"
+      }
+    },
     {
       "identity" : "swift-numerics",
       "kind" : "remoteSourceControl",
@@ -159,8 +168,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-perception",
       "state" : {
-        "revision" : "8e8ca36c02abc7775a3ab81f9468c0df5fe22c2c",
-        "version" : "1.1.7"
+        "revision" : "bc67aa8e461351c97282c2419153757a446ae1c9",
+        "version" : "1.3.5"
       }
     },
     {
@@ -199,15 +208,6 @@
         "version" : "2.2.1"
       }
     },
-    {
-      "identity" : "swiftui-navigation",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/pointfreeco/swiftui-navigation",
-      "state" : {
-        "revision" : "2ec6c3a15293efff6083966b38439a4004f25565",
-        "version" : "1.3.0"
-      }
-    },
     {
       "identity" : "toastui",
       "kind" : "remoteSourceControl",

diff --git a/ios/Approach/Package.swift b/ios/Approach/Package.swift
@@ -156,7 +156,7 @@ let package = Package(
 		.package(url: "https://github.com/CocoaLumberjack/CocoaLumberjack.git", from: "3.8.5"),
 		.package(url: "https://github.com/getsentry/sentry-cocoa.git", from: "8.36.0"),
 		.package(url: "https://github.com/groue/GRDB.swift.git", from: "6.29.3"),
-		.package(url: "https://github.com/pointfreeco/swift-composable-architecture.git", from: "1.11.2"),
+		.package(url: "https://github.com/pointfreeco/swift-composable-architecture.git", from: "1.14.0"),
 		.package(url: "https://github.com/pointfreeco/swift-dependencies.git", from: "1.3.9"),
 		.package(url: "https://github.com/pointfreeco/swift-identified-collections.git", from: "1.1.0"),
 		.package(url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.17.4"),

diff --git a/ios/Approach/Package.swift.toml b/ios/Approach/Package.swift.toml
@@ -482,7 +482,7 @@ from = "1.1.3"
 
 [dependencies.ComposableArchitecture]
 url = "https://github.com/pointfreeco/swift-composable-architecture.git"
-from = "1.11.2"
+from = "1.14.0"
 
 [dependencies.Dependencies]
 dep_ref = "Dependencies"

diff --git a/ios/Approach/Sources/AccessoriesOverviewFeature/AccessoriesOverview.swift b/ios/Approach/Sources/AccessoriesOverviewFeature/AccessoriesOverview.swift
@@ -305,16 +305,16 @@ public struct AccessoriesOverview: Reducer, Sendable {
 
 extension AccessoriesOverview {
 	static func alert(toDeleteItem: Item) -> AlertState<AlertAction> {
-		AlertState(
-			title: TextState(Strings.Form.Prompt.delete(toDeleteItem.name)),
-			primaryButton: .destructive(
-				TextState(Strings.Action.delete),
-				action: .send(.didTapDeleteItemButton(toDeleteItem))
-			),
-			secondaryButton: .cancel(
-				TextState(Strings.Action.cancel),
-				action: .send(.didTapDismissButton)
-			)
-		)
+		AlertState {
+			TextState(Strings.Form.Prompt.delete(toDeleteItem.name))
+		} actions: {
+			ButtonState(role: .destructive, action: .send(.didTapDeleteItemButton(toDeleteItem))) {
+				TextState(Strings.Action.delete)
+			}
+
+			ButtonState(role: .cancel, action: .send(.didTapDismissButton)) {
+				TextState(Strings.Action.cancel)
+			}
+		}
 	}
 }
diff --git a/ios/Approach/Sources/ImportExportFeature/Import.swift b/ios/Approach/Sources/ImportExportFeature/Import.swift
@@ -220,18 +220,19 @@ public struct Import: Reducer, Sendable {
 
 extension Import {
 	static func restore(toDate: Date) -> AlertState<AlertAction> {
-		AlertState(
-			title: TextState(Strings.Import.Restore.title),
-			message: TextState(Strings.Import.Restore.message(toDate.mediumFormat)),
-			primaryButton: .destructive(
-				TextState(Strings.Import.Action.restore),
-				action: .send(.didTapRestoreButton)
-			),
-			secondaryButton: .cancel(
-				TextState(Strings.Action.cancel),
-				action: .send(.didTapDismissButton)
-			)
-		)
+		AlertState {
+			TextState(Strings.Import.Restore.title)
+		} actions: {
+			ButtonState(role: .destructive, action: .send(.didTapRestoreButton)) {
+				TextState(Strings.Import.Action.restore)
+			}
+
+			ButtonState(role: .cancel, action: .send(.didTapDismissButton)) {
+				TextState(Strings.Action.cancel)
+			}
+		} message: {
+			TextState(Strings.Import.Restore.message(toDate.mediumFormat))
+		}
 	}
 }
 

diff --git a/ios/Approach/Sources/LeaguesListFeature/LeaguesList.swift b/ios/Approach/Sources/LeaguesListFeature/LeaguesList.swift
@@ -1,3 +1,4 @@
+// swiftlint:disable file_length
 import AnalyticsServiceInterface
 import AssetsLibrary
 import ComposableArchitecture

diff --git a/ios/Approach/Sources/ScoreKeeperLibrary/ScoreKeeper.swift b/ios/Approach/Sources/ScoreKeeperLibrary/ScoreKeeper.swift
@@ -49,7 +49,7 @@ public class ScoreKeeper {
 		let standingPinValue = Pin.fullDeck.value - pinsDowned.value
 		if Frame.isLast(frameIndex) {
 			let framesNeededForStandingPinValue = standingPinValue > 0 ? 1 : 0
-			return Pin.fullDeck.value * 
+			return Pin.fullDeck.value *
 				(Frame.NUMBER_OF_ROLLS - frame.count - framesNeededForStandingPinValue) +
 				standingPinValue
 		} else {

diff --git a/ios/Approach/Sources/ToastLibrary/ToastState.swift b/ios/Approach/Sources/ToastLibrary/ToastState.swift
@@ -117,7 +117,7 @@ extension View {
 		let toastState = store?.withState { $0 }
 
 		self.toast(
-			isPresented: item.isPresent(),
+			isPresented: Binding(item),
 			dismissAfter: toastState?.duration ?? 3.0,
 			onDismiss: { store?.send(.didFinishDismissing) },
 			content: {

diff --git a/ios/ApproachIOS/Source/ContentView.swift b/ios/ApproachIOS/Source/ContentView.swift
@@ -11,7 +11,7 @@ import TestDatabaseUtilitiesLibrary
 #endif
 
 public struct ContentView: View {
-	let store: Store = {
+	@MainActor static let store: Store = {
 		#if DEBUG
 		return .init(
 			initialState: App.State(),
@@ -34,7 +34,7 @@ public struct ContentView: View {
 	}()
 
 	public var body: some View {
-		AppView(store: store)
+		AppView(store: Self.store)
 	}
 }