wip

pointfreeco · stephencelis · Apr 9, 2024 · Dec 7, 2023 · Dec 7, 2023 · Dec 7, 2023
commit ba30ab2b43802aa644acde914e5519ec1c598e22
diff --git a/App/isowords.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/App/isowords.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -104,8 +104,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-collections",
       "state" : {
-        "revision" : "d029d9d39c87bed85b1c50adee7c41795261a192",
-        "version" : "1.0.6"
+        "revision" : "94cf62b3ba8d4bed62680a282d4c25f9c63c2efb",
+        "version" : "1.1.0"
       }
     },
     {
@@ -129,7 +129,7 @@
     {
       "identity" : "swift-crypto",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-crypto",
+      "location" : "https://github.com/apple/swift-crypto.git",
       "state" : {
         "revision" : "ddb07e896a2a8af79512543b1c7eb9797f8898a5",
         "version" : "1.1.7"
@@ -140,17 +140,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-custom-dump",
       "state" : {
-        "revision" : "aedcf6f4cd486ccef5b312ccac85d4b3f6e58605",
-        "version" : "1.1.2"
+        "revision" : "f01efb26f3a192a0e88dcdb7c3c391ec2fc25d9c",
+        "version" : "1.3.0"
       }
     },
     {
       "identity" : "swift-dependencies",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-dependencies",
       "state" : {
-        "revision" : "adb04a8e35f07edc001877af9f9f97fcc21d409e",
-        "version" : "1.2.0"
+        "revision" : "d3a5af3038a09add4d7682f66555d6212058a3c0",
+        "version" : "1.2.2"
       }
     },
     {
@@ -212,17 +212,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-nio.git",
       "state" : {
-        "revision" : "635b2589494c97e48c62514bc8b37ced762e0a62",
-        "version" : "2.63.0"
+        "revision" : "fc63f0cf4e55a4597407a9fc95b16a2bc44b4982",
+        "version" : "2.64.0"
       }
     },
     {
       "identity" : "swift-nio-extras",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-nio-extras.git",
       "state" : {
-        "revision" : "363da63c1966405764f380c627409b2f9d9e710b",
-        "version" : "1.21.0"
+        "revision" : "a3b640d7dc567225db7c94386a6e71aded1bfa63",
+        "version" : "1.22.0"
       }
     },
     {
@@ -284,8 +284,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-perception",
       "state" : {
-        "revision" : "42240120b2a8797595433288ab4118f8042214c3",
-        "version" : "1.1.1"
+        "revision" : "520c458a832d1287e6b698c5f657ae848fd696ff",
+        "version" : "1.1.4"
       }
     },
     {
@@ -302,17 +302,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-snapshot-testing",
       "state" : {
-        "revision" : "8e68404f641300bfd0e37d478683bb275926760c",
-        "version" : "1.15.2"
+        "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"
       }
     },
     {
@@ -365,17 +365,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swiftui-navigation",
       "state" : {
-        "revision" : "78f9d72cf667adb47e2040aa373185c88c63f0dc",
-        "version" : "1.2.0"
+        "revision" : "2ec6c3a15293efff6083966b38439a4004f25565",
+        "version" : "1.3.0"
       }
     },
     {
       "identity" : "xctest-dynamic-overlay",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
       "state" : {
-        "revision" : "b58e6627149808b40634c4552fcf2f44d0b3ca87",
-        "version" : "1.1.0"
+        "revision" : "6f30bdba373bbd7fbfe241dddd732651f2fbd1e2",
+        "version" : "1.1.2"
       }
     }
   ],

diff --git a/Package.swift b/Package.swift
@@ -28,10 +28,7 @@ var package = Package(
   dependencies: [
     .package(url: "https://github.com/apple/swift-crypto", from: "1.1.6"),
     .package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.1.0"),
-    .package(
-      url: "https://github.com/pointfreeco/swift-composable-architecture",
-      from: "1.9.2"
-    ),
+    .package(url: "https://github.com/pointfreeco/swift-composable-architecture", from: "1.9.2"),
     .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.0.0"),
     .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.1.0"),
     .package(url: "https://github.com/pointfreeco/swift-gen", from: "0.3.0"),

diff --git a/Tests/AppFeatureTests/PersistenceTests.swift b/Tests/AppFeatureTests/PersistenceTests.swift
@@ -20,8 +20,8 @@ import XCTest
 @testable import SoloFeature
 @testable import UserDefaultsClient
 
-@MainActor
 class PersistenceTests: XCTestCase {
+  @MainActor
   func testUnlimitedSaveAndQuit() async throws {
     let saves = ActorIsolated<[Data]>([])
 
@@ -143,6 +143,7 @@ class PersistenceTests: XCTestCase {
     }
   }
 
+  @MainActor
   func testUnlimitedAbandon() async throws {
     let didArchiveGame = ActorIsolated(false)
     let saves = ActorIsolated<[Data]>([])
@@ -206,6 +207,7 @@ class PersistenceTests: XCTestCase {
     }
   }
 
+  @MainActor
   func testTimedAbandon() async {
     let didArchiveGame = ActorIsolated(false)
 
@@ -254,6 +256,7 @@ class PersistenceTests: XCTestCase {
     await didArchiveGame.withValue { XCTAssert($0) }
   }
 
+  @MainActor
   func testUnlimitedResume() async {
     let savedGames = SavedGamesState(dailyChallengeUnlimited: nil, unlimited: .mock)
     let store = TestStore(
@@ -282,6 +285,7 @@ class PersistenceTests: XCTestCase {
     await task.cancel()
   }
 
+  @MainActor
   func testTurnBasedAbandon() async {
     let store = TestStore(
       initialState: AppReducer.State(

diff --git a/Tests/AppFeatureTests/RemoteNotificationsTests.swift b/Tests/AppFeatureTests/RemoteNotificationsTests.swift
@@ -9,8 +9,8 @@ import XCTest
 
 @testable import AppFeature
 
-@MainActor
 class RemoteNotificationsTests: XCTestCase {
+  @MainActor
   func testRegisterForRemoteNotifications_OnActivate_Authorized() async {
     let didRegisterForRemoteNotifications = ActorIsolated(false)
     let requestedAuthorizationOptions = ActorIsolated<UNAuthorizationOptions?>(nil)
@@ -68,6 +68,7 @@ class RemoteNotificationsTests: XCTestCase {
     await task.cancel()
   }
 
+  @MainActor
   func testRegisterForRemoteNotifications_NotAuthorized() async {
     let didRegisterForRemoteNotifications = ActorIsolated(false)
     let requestedAuthorizationOptions = ActorIsolated<UNAuthorizationOptions?>(nil)
@@ -94,6 +95,7 @@ class RemoteNotificationsTests: XCTestCase {
     await task.cancel()
   }
 
+  @MainActor
   func testReceiveNotification_dailyChallengeEndsSoon() async {
     let inProgressGame = InProgressGame.mock
 

diff --git a/Tests/AppFeatureTests/TurnBasedTests.swift b/Tests/AppFeatureTests/TurnBasedTests.swift
@@ -21,11 +21,11 @@ import XCTest
 @testable import ComposableGameCenter
 @testable import HomeFeature
 
-@MainActor
 class TurnBasedTests: XCTestCase {
   let mainQueue = DispatchQueue.test
   let mainRunLoop = RunLoop.test
 
+  @MainActor
   func testNewGame() async throws {
     try await withMainSerialExecutor {
       let didEndTurnWithRequest = ActorIsolated<TurnBasedMatchClient.EndTurnRequest?>(nil)
@@ -113,13 +113,13 @@ class TurnBasedTests: XCTestCase {
       await store.receive(\.home.serverConfigResponse) {
         $0.home.hasChangelog = true
       }
-      await store.receive(\.home.activeMatchesResponse.success)
       await store.receive(\.home.dailyChallengeResponse.success) {
         $0.home.dailyChallenges = dailyChallenges
       }
       await store.receive(\.home.weekInReviewResponse.success) {
         $0.home.weekInReview = weekInReview
       }
+      await store.receive(\.home.activeMatchesResponse.success)
 
       await store.send(.home(.destination(.presented(.multiplayer(.startButtonTapped)))))
 
@@ -274,6 +274,7 @@ class TurnBasedTests: XCTestCase {
     }
   }
 
+  @MainActor
   func testResumeGame() async {
     await withMainSerialExecutor {
       let listener = AsyncStreamProducer<LocalPlayerClient.ListenerEvent>()
@@ -338,13 +339,13 @@ class TurnBasedTests: XCTestCase {
       await store.receive(\.home.serverConfigResponse) {
         $0.home.hasChangelog = true
       }
-      await store.receive(\.home.activeMatchesResponse.success)
       await store.receive(\.home.dailyChallengeResponse.success) {
         $0.home.dailyChallenges = dailyChallenges
       }
       await store.receive(\.home.weekInReviewResponse.success) {
         $0.home.weekInReview = weekInReview
       }
+      await store.receive(\.home.activeMatchesResponse.success)
 
       listener.continuation
         .yield(.turnBased(.receivedTurnEventForMatch(.inProgress, didBecomeActive: true)))
@@ -378,6 +379,7 @@ class TurnBasedTests: XCTestCase {
     }
   }
 
+  @MainActor
   func testResumeForfeitedGame() async {
     await withMainSerialExecutor {
       let listener = AsyncStreamProducer<LocalPlayerClient.ListenerEvent>()
@@ -439,14 +441,14 @@ class TurnBasedTests: XCTestCase {
       await store.receive(\.home.serverConfigResponse) {
         $0.home.hasChangelog = true
       }
-      await store.receive(\.home.activeMatchesResponse.success)
       await store.receive(\.home.dailyChallengeResponse.success) {
         $0.home.dailyChallenges = dailyChallenges
       }
       await store.receive(\.home.weekInReviewResponse.success) {
         $0.home.weekInReview = weekInReview
       }
-
+      await store.receive(\.home.activeMatchesResponse.success)
+
       listener.continuation
         .yield(.turnBased(.receivedTurnEventForMatch(.forfeited, didBecomeActive: true)))
 
@@ -488,6 +490,7 @@ class TurnBasedTests: XCTestCase {
     }
   }
 
+  @MainActor
   func testRemovingCubes() async throws {
     let didEndTurnWithRequest = ActorIsolated<TurnBasedMatchClient.EndTurnRequest?>(nil)
     let match = update(TurnBasedMatch.inProgress) {
@@ -653,6 +656,7 @@ class TurnBasedTests: XCTestCase {
     }
   }
 
+  @MainActor
   func testRematch() async {
     let localParticipant = TurnBasedParticipant.local
     let match = update(TurnBasedMatch.inProgress) {
@@ -737,6 +741,7 @@ class TurnBasedTests: XCTestCase {
     }
   }
 
+  @MainActor
   func testGameCenterNotification_ShowsRecentTurn() async {
     let localParticipant = TurnBasedParticipant.local
     let remoteParticipant = update(TurnBasedParticipant.remote) {
@@ -805,6 +810,7 @@ class TurnBasedTests: XCTestCase {
     }
   }
 
+  @MainActor
   func testGameCenterNotification_DoesNotShow() async {
     let localParticipant = TurnBasedParticipant.local
     let remoteParticipant = update(TurnBasedParticipant.remote) {

diff --git a/Tests/AppFeatureTests/UserNotificationsTests.swift b/Tests/AppFeatureTests/UserNotificationsTests.swift
@@ -7,8 +7,8 @@ import XCTest
 
 @testable import AppFeature
 
-@MainActor
 class UserNotificationsTests: XCTestCase {
+  @MainActor
   func testReceiveBackgroundNotification() async {
     let delegate = AsyncStream<UserNotificationClient.DelegateEvent>.makeStream()
     let response = UserNotificationClient.Notification.Response(
@@ -43,6 +43,7 @@ class UserNotificationsTests: XCTestCase {
     await task.cancel()
   }
 
+  @MainActor
   func testReceiveForegroundNotification() async {
     let delegate = AsyncStream<UserNotificationClient.DelegateEvent>.makeStream()
     let notification = UserNotificationClient.Notification(

diff --git a/Tests/DailyChallengeFeatureIntegrationTests/DailyChallengeFeatureIntegrationTests.swift b/Tests/DailyChallengeFeatureIntegrationTests/DailyChallengeFeatureIntegrationTests.swift
@@ -13,8 +13,8 @@ import XCTest
 
 @testable import LeaderboardFeature
 
-@MainActor
 class DailyChallengeFeatureTests: XCTestCase {
+  @MainActor
   func testBasics() async {
     await withMainSerialExecutor {
       let uuid = UUID.incrementing

diff --git a/Tests/DailyChallengeFeatureTests/DailyChallengeFeatureTests.swift b/Tests/DailyChallengeFeatureTests/DailyChallengeFeatureTests.swift
@@ -7,11 +7,11 @@ import XCTest
 @testable import DailyChallengeFeature
 @testable import SharedModels
 
-@MainActor
 class DailyChallengeFeatureTests: XCTestCase {
   let mainQueue = DispatchQueue.test
   let mainRunLoop = RunLoop.test
 
+  @MainActor
   func testOnAppear() async {
     let store = TestStore(initialState: DailyChallengeReducer.State()) {
       DailyChallengeReducer()
@@ -36,6 +36,7 @@ class DailyChallengeFeatureTests: XCTestCase {
     }
   }
 
+  @MainActor
   func testTapGameThatWasPlayed() async {
     var dailyChallengeResponse = FetchTodaysDailyChallengeResponse.played
     dailyChallengeResponse.dailyChallenge.endsAt = Date().addingTimeInterval(60 * 60 * 2 + 1)
@@ -53,6 +54,7 @@ class DailyChallengeFeatureTests: XCTestCase {
     }
   }
 
+  @MainActor
   func testTapGameThatWasNotStarted() async {
     var inProgressGame = InProgressGame.mock
     inProgressGame.gameStartTime = self.mainRunLoop.now.date
@@ -100,6 +102,7 @@ class DailyChallengeFeatureTests: XCTestCase {
     await store.receive(\.delegate.startGame)
   }
 
+  @MainActor
   func testTapGameThatWasStarted_NotPlayed_HasLocalGame() async {
     var inProgressGame = InProgressGame.mock
     inProgressGame.gameStartTime = .mock
@@ -132,6 +135,7 @@ class DailyChallengeFeatureTests: XCTestCase {
     await store.receive(\.delegate.startGame)
   }
 
+  @MainActor
   func testNotifications_OpenThenClose() async {
     let store = TestStore(
       initialState: DailyChallengeReducer.State()
@@ -147,6 +151,7 @@ class DailyChallengeFeatureTests: XCTestCase {
     }
   }
 
+  @MainActor
   func testNotifications_GrantAccess() async {
     let didRegisterForRemoteNotifications = ActorIsolated(false)
 
@@ -181,6 +186,7 @@ class DailyChallengeFeatureTests: XCTestCase {
     await didRegisterForRemoteNotifications.withValue { XCTAssertNoDifference($0, true) }
   }
 
+  @MainActor
   func testNotifications_DenyAccess() async {
     let store = TestStore(initialState: DailyChallengeReducer.State()) {
       DailyChallengeReducer()