Remove Waiter for simple solution

0xLeif · Feb 23, 2024 · 30ebe7e · 30ebe7e
1 parent ebbbbd5
commit 30ebe7e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 30 deletions.
diff --git a/Package.swift b/Package.swift
@@ -18,8 +18,7 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/0xLeif/Cache", from: "2.0.0"),
-        .package(url: "https://github.com/0xLeif/Waiter", from: "1.0.0")
+        .package(url: "https://github.com/0xLeif/Cache", from: "2.0.0")
     ],
     targets: [
         .target(
@@ -30,10 +29,7 @@ let package = Package(
         ),
         .testTarget(
             name: "AppStateTests",
-            dependencies: [
-                "AppState",
-                "Waiter"
-            ]
+            dependencies: ["AppState"]
         )
     ]
 )
diff --git a/Sources/AppState/Application/Application+public.swift b/Sources/AppState/Application/Application+public.swift
@@ -163,20 +163,10 @@ public extension Application {
                 column: column
             )
 
-            let setValue = {
-                shared.cache.set(
-                    value: dependency,
-                    forKey: dependency.scope.key
-                )
-            }
-
-            #if (!os(Linux) && !os(Windows))
-            Task {
-                setValue()
-            }
-            #else
-            setValue()
-            #endif
+            shared.cache.set(
+                value: dependency,
+                forKey: dependency.scope.key
+            )
         }
     }
 
@@ -209,7 +199,7 @@ public extension Application {
         )
 
         var promotions = Application.state(\.dependencyPromotions)
-        promotions.value[String(describing: keyPath)] = promotionOverride
+        promotions.value.append(promotionOverride)
 
         return Application.self
     }

diff --git a/Sources/AppState/Application/Types/Dependency/Application+Dependency.swift b/Sources/AppState/Application/Types/Dependency/Application+Dependency.swift
@@ -1,6 +1,6 @@
 extension Application {
-    var dependencyPromotions: State<[String: DependencyOverride]> {
-        state(initial: [:])
+    var dependencyPromotions: State<[DependencyOverride]> {
+        state(initial: [])
     }
 
     /// `Dependency` struct encapsulates dependencies used throughout the app.

diff --git a/Tests/AppStateTests/AppDependencyTests.swift b/Tests/AppStateTests/AppDependencyTests.swift
@@ -1,4 +1,3 @@
-import Waiter
 import XCTest
 @testable import AppState
 
@@ -76,12 +75,6 @@ final class AppDependencyTests: XCTestCase {
 
         networkingOverride.cancel()
 
-        try await Waiter.wait(
-            on: Application.shared,
-            for: \.networking,
-            expecting: { $0.value is NetworkService }
-        )
-
         let networkingService = Application.dependency(\.networking)
 
         XCTAssertNotNil(networkingService as? NetworkService)