From 7ce5bca9e7732d44268d217942deebdd3b51891c Mon Sep 17 00:00:00 2001 From: Daiki Matsudate <20222809+d-date@users.noreply.github.com> Date: Mon, 10 Nov 2025 13:41:19 +0900 Subject: [PATCH] refactor --- .../Sources/ScheduleFeature/Schedule.swift | 7 +- .../Sources/trySwiftFeature/Organizers.swift | 4 +- .../Sources/trySwiftFeature/trySwift.swift | 4 +- .../contents.xcworkspacedata | 3 + .../xcshareddata/swiftpm/Package.resolved | 76 ++++++++++++------- 5 files changed, 61 insertions(+), 33 deletions(-) diff --git a/MyLibrary/Sources/ScheduleFeature/Schedule.swift b/MyLibrary/Sources/ScheduleFeature/Schedule.swift index 1f0f7a0..1ca5ded 100644 --- a/MyLibrary/Sources/ScheduleFeature/Schedule.swift +++ b/MyLibrary/Sources/ScheduleFeature/Schedule.swift @@ -49,12 +49,12 @@ public struct Schedule { } } - @Reducer(state: .equatable) + @Reducer public enum Path { case detail(ScheduleDetail) } - @Reducer(state: .equatable) + @Reducer public enum Destination {} @Dependency(DataClient.self) var dataClient @@ -109,6 +109,9 @@ public struct Schedule { } } +extension Schedule.Path.State: Equatable {} +extension Schedule.Destination.State: Equatable {} + @ViewAction(for: Schedule.self) public struct ScheduleView: View { diff --git a/MyLibrary/Sources/trySwiftFeature/Organizers.swift b/MyLibrary/Sources/trySwiftFeature/Organizers.swift index d52da10..3be2951 100644 --- a/MyLibrary/Sources/trySwiftFeature/Organizers.swift +++ b/MyLibrary/Sources/trySwiftFeature/Organizers.swift @@ -35,7 +35,7 @@ public struct Organizers { } } - @Reducer(state: .equatable) + @Reducer public enum Destination { case profile(Profile) } @@ -60,6 +60,8 @@ public struct Organizers { } } +extension Organizers.Destination.State: Equatable {} + @ViewAction(for: Organizers.self) public struct OrganizersView: View { diff --git a/MyLibrary/Sources/trySwiftFeature/trySwift.swift b/MyLibrary/Sources/trySwiftFeature/trySwift.swift index e3be3dc..bdb6fe5 100644 --- a/MyLibrary/Sources/trySwiftFeature/trySwift.swift +++ b/MyLibrary/Sources/trySwiftFeature/trySwift.swift @@ -33,7 +33,7 @@ public struct TrySwift { } } - @Reducer(state: .equatable) + @Reducer public enum Path { case organizers(Organizers) case profile(Profile) @@ -79,6 +79,8 @@ public struct TrySwift { } } +extension TrySwift.Path.State: Equatable {} + @ViewAction(for: TrySwift.self) public struct TrySwiftView: View { diff --git a/trySwiftTokyo.xcworkspace/contents.xcworkspacedata b/trySwiftTokyo.xcworkspace/contents.xcworkspacedata index dacc2fc..3f8fa30 100644 --- a/trySwiftTokyo.xcworkspace/contents.xcworkspacedata +++ b/trySwiftTokyo.xcworkspace/contents.xcworkspacedata @@ -1,6 +1,9 @@ + + diff --git a/trySwiftTokyo.xcworkspace/xcshareddata/swiftpm/Package.resolved b/trySwiftTokyo.xcworkspace/xcshareddata/swiftpm/Package.resolved index 2f49249..a3df9f2 100644 --- a/trySwiftTokyo.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/trySwiftTokyo.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -27,6 +27,15 @@ "version" : "0.2.0" } }, + { + "identity" : "lrucache", + "kind" : "remoteSourceControl", + "location" : "https://github.com/nicklockwood/LRUCache.git", + "state" : { + "revision" : "0d91406ecd4d6c1c56275866f00508d9aeacc92a", + "version" : "1.2.0" + } + }, { "identity" : "rtt_sdk", "kind" : "remoteSourceControl", @@ -41,8 +50,17 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-argument-parser.git", "state" : { - "revision" : "41982a3656a71c768319979febd796c6fd111d5c", - "version" : "1.5.0" + "revision" : "cdd0ef3755280949551dc26dee5de9ddeda89f54", + "version" : "1.6.2" + } + }, + { + "identity" : "swift-atomics", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-atomics.git", + "state" : { + "revision" : "b601256eab081c0f92f059e12818ac1d4f178ff7", + "version" : "1.3.0" } }, { @@ -50,8 +68,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-case-paths", "state" : { - "revision" : "41b89b8b68d8c56c622dbb7132258f1a3e638b25", - "version" : "1.7.0" + "revision" : "6989976265be3f8d2b5802c722f9ba168e227c71", + "version" : "1.7.2" } }, { @@ -68,17 +86,17 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/swiftlang/swift-cmark.git", "state" : { - "revision" : "b022b08312decdc46585e0b3440d97f6f22ef703", - "version" : "0.6.0" + "revision" : "5d9bdaa4228b381639fff09403e39a04926e2dbe", + "version" : "0.7.1" } }, { "identity" : "swift-collections", "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-collections", + "location" : "https://github.com/apple/swift-collections.git", "state" : { - "revision" : "671108c96644956dddcd89dd59c203dcdb36cec7", - "version" : "1.1.4" + "revision" : "7b847a3b7008b2dc2f47ca3110d8c782fb2e5c7e", + "version" : "1.3.0" } }, { @@ -86,8 +104,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-composable-architecture", "state" : { - "revision" : "b1d27a82b498b8e697acabd8cc01b585d26aab19", - "version" : "1.19.1" + "revision" : "5b0890fabfd68a2d375d68502bc3f54a8548c494", + "version" : "1.23.1" } }, { @@ -95,8 +113,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-concurrency-extras", "state" : { - "revision" : "82a4ae7170d98d8538ec77238b7eb8e7199ef2e8", - "version" : "1.3.1" + "revision" : "5a3825302b1a0d744183200915a47b508c828e6f", + "version" : "1.3.2" } }, { @@ -113,8 +131,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-dependencies", "state" : { - "revision" : "4c90d6b2b9bf0911af87b103bb40f41771891596", - "version" : "1.9.2" + "revision" : "a10f9feeb214bc72b5337b6ef6d5a029360db4cc", + "version" : "1.10.0" } }, { @@ -131,8 +149,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/swiftlang/swift-markdown.git", "state" : { - "revision" : "ea79e83c8744d2b50b0dc2d5bbd1e857e1253bf9", - "version" : "0.6.0" + "revision" : "7d9a5ce307528578dfa777d505496bd5f544ad94", + "version" : "0.7.3" } }, { @@ -140,8 +158,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-navigation", "state" : { - "revision" : "db6bc9dbfed001f21e6728fd36413d9342c235b4", - "version" : "2.3.0" + "revision" : "bf498690e1f6b4af790260f542e8428a4ba10d78", + "version" : "2.6.0" } }, { @@ -149,8 +167,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-perception", "state" : { - "revision" : "d924c62a70fca5f43872f286dbd7cef0957f1c01", - "version" : "1.6.0" + "revision" : "4f47ebafed5f0b0172cf5c661454fa8e28fb2ac4", + "version" : "2.0.9" } }, { @@ -158,8 +176,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-sharing", "state" : { - "revision" : "732871fabfc6b38fcdff5ad2f7336327dbf78e81", - "version" : "2.4.0" + "revision" : "3bfc408cc2d0bee2287c174da6b1c76768377818", + "version" : "2.7.4" } }, { @@ -167,8 +185,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/swiftlang/swift-syntax", "state" : { - "revision" : "f99ae8aa18f0cf0d53481901f88a0991dc3bd4a2", - "version" : "601.0.1" + "revision" : "4799286537280063c85a32f09884cfbca301b1a1", + "version" : "602.0.0" } }, { @@ -176,8 +194,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/scinfu/SwiftSoup.git", "state" : { - "revision" : "bba848db50462894e7fc0891d018dfecad4ef11e", - "version" : "2.8.7" + "revision" : "4206bc7b8bd9a4ff8e9511211e1b4bff979ef9c4", + "version" : "2.11.1" } }, { @@ -185,8 +203,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay", "state" : { - "revision" : "39de59b2d47f7ef3ca88a039dff3084688fe27f4", - "version" : "1.5.2" + "revision" : "4c27acf5394b645b70d8ba19dc249c0472d5f618", + "version" : "1.7.0" } } ],