Update project (#46)

darrarski · Apr 18, 2024 · 3335b81 · 3335b81
2 parents 43be4f4 + 9887088
commit 3335b81
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 42 deletions.
diff --git a/DarrarskiApp.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DarrarskiApp.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,4 +1,5 @@
 {
+  "originHash" : "8e259585f127cf26d3f3659936668078ce3737a9f8f073c221211042c1410c44",
   "pins" : [
     {
       "identity" : "combine-schedulers",
@@ -23,8 +24,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-case-paths",
       "state" : {
-        "revision" : "e593aba2c6222daad7c4f2732a431eed2c09bb07",
-        "version" : "1.3.0"
+        "revision" : "79623dbe2c7672f5e450d8325613d231454390b3",
+        "version" : "1.3.2"
       }
     },
     {
@@ -50,8 +51,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-composable-architecture.git",
       "state" : {
-        "revision" : "115fe5af41d333b6156d4924d7c7058bc77fd580",
-        "version" : "1.9.2"
+        "revision" : "899a68ce3c4eca42a42e6bad2c925b82dcab5187",
+        "version" : "1.9.3"
       }
     },
     {
@@ -68,8 +69,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-custom-dump",
       "state" : {
-        "revision" : "3ce83179e5f0c83ad54c305779c6b438e82aaf1d",
-        "version" : "1.2.1"
+        "revision" : "f01efb26f3a192a0e88dcdb7c3c391ec2fc25d9c",
+        "version" : "1.3.0"
       }
     },
     {
@@ -95,35 +96,35 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-macro-testing.git",
       "state" : {
-        "revision" : "90e38eec4bf661ec0da1bbfd3ec507d0f0c05310",
-        "version" : "0.3.0"
+        "revision" : "5c4a1b9d7c23cd5c08ea50677d8e89080365cb00",
+        "version" : "0.4.0"
       }
     },
     {
       "identity" : "swift-perception",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-perception",
       "state" : {
-        "revision" : "a5bb578d963fcdbffe4fd56c92b2e222f5b02c8a",
-        "version" : "1.1.2"
+        "revision" : "052bd30a2079d9eb2400f0bc66707cc93c015152",
+        "version" : "1.1.5"
       }
     },
     {
       "identity" : "swift-snapshot-testing",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-snapshot-testing.git",
       "state" : {
-        "revision" : "5b0c434778f2c1a4c9b5ebdb8682b28e84dd69bd",
-        "version" : "1.15.4"
+        "revision" : "625ccca8570773dd84a34ee51a81aa2bc5a4f97a",
+        "version" : "1.16.0"
       }
     },
     {
       "identity" : "swift-syntax",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-syntax",
       "state" : {
-        "revision" : "64889f0c732f210a935a0ad7cda38f77f876262d",
-        "version" : "509.1.1"
+        "revision" : "fa8f95c2d536d6620cc2f504ebe8a6167c9fc2dd",
+        "version" : "510.0.1"
       }
     },
     {
@@ -158,8 +159,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/scinfu/SwiftSoup.git",
       "state" : {
-        "revision" : "1d39e56d364cba79ce43b341f9661b534cccb18d",
-        "version" : "2.7.1"
+        "revision" : "028487d4a8a291b2fe1b4392b5425b6172056148",
+        "version" : "2.7.2"
       }
     },
     {
@@ -176,19 +177,19 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swiftui-navigation",
       "state" : {
-        "revision" : "d9e72f3083c08375794afa216fb2f89c0114f303",
-        "version" : "1.2.1"
+        "revision" : "2ec6c3a15293efff6083966b38439a4004f25565",
+        "version" : "1.3.0"
       }
     },
     {
       "identity" : "xctest-dynamic-overlay",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
       "state" : {
-        "revision" : "b13b1d1a8e787a5ffc71ac19dcaf52183ab27ba2",
-        "version" : "1.1.1"
+        "revision" : "6f30bdba373bbd7fbfe241dddd732651f2fbd1e2",
+        "version" : "1.1.2"
       }
     }
   ],
-  "version" : 2
+  "version" : 3
 }
diff --git a/app/Package.swift b/app/Package.swift
@@ -19,7 +19,7 @@ let package = Package(
   dependencies: [
     .package(url: "https://github.com/ActuallyTaylor/SwiftHTMLToMarkdown.git", from: "1.1.1"),
     .package(url: "https://github.com/TelemetryDeck/SwiftClient.git", from: "1.5.0"),
-    .package(url: "https://github.com/apple/swift-syntax.git", from: "509.0.0"),
+    .package(url: "https://github.com/apple/swift-syntax.git", from: "510.0.0"),
     .package(url: "https://github.com/onevcat/Kingfisher.git", from: "7.10.1"),
     .package(url: "https://github.com/pointfreeco/swift-composable-architecture.git", from: "1.7.1"),
     .package(url: "https://github.com/pointfreeco/swift-macro-testing.git", from: "0.2.0"),

diff --git a/app/Tests/AppFeatureTests/AppTelemetryReducerTests.swift b/app/Tests/AppFeatureTests/AppTelemetryReducerTests.swift
@@ -35,8 +35,10 @@ final class AppTelemetryReducerTests: XCTestCase {
     }
     let signals = LockIsolated<[AppTelemetrySignal]>([])
     let store = TestStore(initialState: ExampleReducer.State()) {
-      ExampleReducer()
-      AppTelemetryReducer()
+      CombineReducers {
+        ExampleReducer()
+        AppTelemetryReducer()
+      }
     } withDependencies: {
       $0.appTelemetry.send = { @Sendable signal in
         signals.withValue { $0.append(signal) }
@@ -107,8 +109,10 @@ final class AppTelemetryReducerTests: XCTestCase {
     }
     let signals = LockIsolated<[AppTelemetrySignal]>([])
     let store = TestStore(initialState: ExampleReducer.State()) {
-      ExampleReducer()
-      AppTelemetryReducer()
+      CombineReducers {
+        ExampleReducer()
+        AppTelemetryReducer()
+      }
     } withDependencies: {
       $0.appTelemetry.send = { @Sendable signal in
         signals.withValue { $0.append(signal) }
@@ -189,8 +193,10 @@ final class AppTelemetryReducerTests: XCTestCase {
     }
     let signals = LockIsolated<[AppTelemetrySignal]>([])
     let store = TestStore(initialState: ExampleReducer.State()) {
-      ExampleReducer()
-      AppTelemetryReducer()
+      CombineReducers {
+        ExampleReducer()
+        AppTelemetryReducer()
+      }
     } withDependencies: {
       $0.appTelemetry.send = { @Sendable signal in
         signals.withValue { $0.append(signal) }
@@ -233,8 +239,10 @@ final class AppTelemetryReducerTests: XCTestCase {
     }
     let signals = LockIsolated<[AppTelemetrySignal]>([])
     let store = TestStore(initialState: ExampleReducer.State()) {
-      ExampleReducer()
-      AppTelemetryReducer()
+      CombineReducers {
+        ExampleReducer()
+        AppTelemetryReducer()
+      }
     } withDependencies: {
       $0.appTelemetry.send = { @Sendable signal in
         signals.withValue { $0.append(signal) }
@@ -280,8 +288,10 @@ final class AppTelemetryReducerTests: XCTestCase {
     }
     let signals = LockIsolated<[AppTelemetrySignal]>([])
     let store = TestStore(initialState: ExampleReducer.State()) {
-      ExampleReducer()
-      AppTelemetryReducer()
+      CombineReducers {
+        ExampleReducer()
+        AppTelemetryReducer()
+      }
     } withDependencies: {
       $0.appTelemetry.send = { @Sendable signal in
         signals.withValue { $0.append(signal) }
@@ -319,8 +329,10 @@ final class AppTelemetryReducerTests: XCTestCase {
     }
     let signals = LockIsolated<[AppTelemetrySignal]>([])
     let store = TestStore(initialState: ExampleReducer.State()) {
-      ExampleReducer()
-      AppTelemetryReducer()
+      CombineReducers {
+        ExampleReducer()
+        AppTelemetryReducer()
+      }
     } withDependencies: {
       $0.appTelemetry.send = { @Sendable signal in
         signals.withValue { $0.append(signal) }
@@ -371,9 +383,11 @@ final class AppTelemetryReducerTests: XCTestCase {
     let store = TestStore(initialState: ExampleReducer.State(
       isTelemetryEnabled: false
     )) {
-      ExampleReducer()
-      AppTelemetryReducer { state, _ in
-        state.isTelemetryEnabled
+      CombineReducers {
+        ExampleReducer()
+        AppTelemetryReducer { state, _ in
+          state.isTelemetryEnabled
+        }
       }
     } withDependencies: {
       $0.appTelemetry.send = { @Sendable signal in
@@ -425,11 +439,13 @@ final class AppTelemetryReducerTests: XCTestCase {
     }
     let signals = LockIsolated<[AppTelemetrySignal]>([])
     let store = TestStore(initialState: ExampleReducer.State()) {
-      ExampleReducer()
-      AppTelemetryReducer { _, action in
-        switch action {
-        case .includedAction: true
-        case .excludedAction: false
+      CombineReducers {
+        ExampleReducer()
+        AppTelemetryReducer { _, action in
+          switch action {
+          case .includedAction: true
+          case .excludedAction: false
+          }
         }
       }
     } withDependencies: {