Fixing Xcode errors

Calcium/CalculatorClient.swift

@@ -11,30 +11,9 @@ import ComposableArchitecture
 import Resolver
 
 @DependencyClient
-struct CalculatorClient: Sendable {
+struct CalculatorClient: Sendable, DependencyKey, TestDependencyKey {
     var calculateValue: @Sendable (String, String, CalciumCommon.Operation) -> String = { _, _, _ in "" }
-}
-
-extension DependencyValues {
-    var calculator: CalculatorClient {
-        get { self[CalculatorClient.self] }
-        set { self[CalculatorClient.self] = newValue }
-    }
-}
-
-/* extension CalculatorClient: DependencyKey {
-     static let liveValue = CalculatorClient(
-         calculateValue: {
-             /*@Injected var calculator: Calculator
-
-             return calculator.calculateValue(lhs: $0, rhs: $1, operation: $2)*/
 
-             // return ""
-         }
-     )
- } */
-
-extension CalculatorClient: TestDependencyKey {
     static let previewValue = {
         @Injected var calculator: Calculator
 
@@ -43,5 +22,20 @@ extension CalculatorClient: TestDependencyKey {
         })
     }()
 
+    static let liveValue = CalculatorClient(
+        calculateValue: {
+            @Injected var calculator: Calculator
+
+            return calculator.calculateValue(lhs: $0, rhs: $1, operation: $2)
+        }
+    )
+
     static let testValue = previewValue
 }
+
+extension DependencyValues {
+    var calculator: CalculatorClient {
+        get { self[CalculatorClient.self] }
+        set { self[CalculatorClient.self] = newValue }
+    }
+}