Skip to content

Commit 38daa64

Browse files
committed
Updated AppDependencies
1 parent 77f22f3 commit 38daa64

2 files changed

Lines changed: 15 additions & 45 deletions

File tree

LocalPackage/Sources/Model/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import AppKit
2222
import DataSource
2323

2424
public final class AppDelegate: NSObject, NSApplicationDelegate {
25-
public let appDependencies = AppDependencies.shared
25+
let appDependencies = AppDependencies.shared
2626

2727
public func applicationDidFinishLaunching(_ notification: Notification) {
2828
let logService = LogService(appDependencies)

LocalPackage/Sources/Model/AppDependencies.swift

Lines changed: 14 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -21,50 +21,20 @@
2121
import DataSource
2222
import SwiftUI
2323

24-
public final class AppDependencies: Sendable {
25-
public let appStateClient: AppStateClient
26-
public let cgDirectDisplayClient: CGDirectDisplayClient
27-
public let executeClient: ExecuteClient
28-
public let hiServicesClient: HIServicesClient
29-
public let loggingSystemClient: LoggingSystemClient
30-
public let nsAppClient: NSAppClient
31-
public let nsScreenClient: NSScreenClient
32-
public let nsWorkspaceClient: NSWorkspaceClient
33-
public let smAppServiceClient: SMAppServiceClient
34-
public let spiceKeyClient: SpiceKeyClient
35-
public let spuUpdaterClient: SPUUpdaterClient
36-
public let userDefaultsClient: UserDefaultsClient
37-
public let windowSceneMessengerClient: WindowSceneMessengerClient
38-
39-
nonisolated init(
40-
appStateClient: AppStateClient = .liveValue,
41-
cgDirectDisplayClient: CGDirectDisplayClient = .liveValue,
42-
executeClient: ExecuteClient = .liveValue,
43-
hiServicesClient: HIServicesClient = .liveValue,
44-
loggingSystemClient: LoggingSystemClient = .liveValue,
45-
nsAppClient: NSAppClient = .liveValue,
46-
nsScreenClient: NSScreenClient = .liveValue,
47-
nsWorkspaceClient: NSWorkspaceClient = .liveValue,
48-
smAppServiceClient: SMAppServiceClient = .liveValue,
49-
spiceKeyClient: SpiceKeyClient = .liveValue,
50-
spuUpdaterClient: SPUUpdaterClient = .liveValue,
51-
userDefaultsClient: UserDefaultsClient = .liveValue,
52-
windowSceneMessengerClient: WindowSceneMessengerClient = .liveValue
53-
) {
54-
self.appStateClient = appStateClient
55-
self.cgDirectDisplayClient = cgDirectDisplayClient
56-
self.executeClient = executeClient
57-
self.hiServicesClient = hiServicesClient
58-
self.loggingSystemClient = loggingSystemClient
59-
self.nsAppClient = nsAppClient
60-
self.nsScreenClient = nsScreenClient
61-
self.nsWorkspaceClient = nsWorkspaceClient
62-
self.smAppServiceClient = smAppServiceClient
63-
self.spiceKeyClient = spiceKeyClient
64-
self.spuUpdaterClient = spuUpdaterClient
65-
self.userDefaultsClient = userDefaultsClient
66-
self.windowSceneMessengerClient = windowSceneMessengerClient
67-
}
24+
public struct AppDependencies: Sendable {
25+
public var appStateClient = AppStateClient.liveValue
26+
public var cgDirectDisplayClient = CGDirectDisplayClient.liveValue
27+
public var executeClient = ExecuteClient.liveValue
28+
public var hiServicesClient = HIServicesClient.liveValue
29+
public var loggingSystemClient = LoggingSystemClient.liveValue
30+
public var nsAppClient = NSAppClient.liveValue
31+
public var nsScreenClient = NSScreenClient.liveValue
32+
public var nsWorkspaceClient = NSWorkspaceClient.liveValue
33+
public var smAppServiceClient = SMAppServiceClient.liveValue
34+
public var spiceKeyClient = SpiceKeyClient.liveValue
35+
public var spuUpdaterClient = SPUUpdaterClient.liveValue
36+
public var userDefaultsClient = UserDefaultsClient.liveValue
37+
public var windowSceneMessengerClient = WindowSceneMessengerClient.liveValue
6838

6939
static let shared = AppDependencies()
7040
}

0 commit comments

Comments
 (0)