From b815c1e5ad71559e7b771d253460671fd33b6e0a Mon Sep 17 00:00:00 2001 From: Max Goedjen Date: Sat, 23 Aug 2025 20:42:08 -0700 Subject: [PATCH] Cleanup packages/dead imports (#625) * Slim package * Cleanup * . * Expose tokenID. * Expose some constants. * Open. * Combine cleanup * Make eraser base public. * Reload * Fix concurrency issue on key insertion. * Add capabilities. * . * Revert "." This reverts commit 7c5c2924fa4930f324831d924bf7a5352ba88d81. * Revert "Add capabilities." This reverts commit bfa7a3cd51f15ba449b77f5a1320a43aa491d05a. --- Sources/Packages/Package.swift | 20 +++++++++---------- .../Sources/SecretKit/Types/SecretStore.swift | 1 - .../SecureEnclaveSecret.swift | 1 - .../SmartCardSecretKit/SmartCardSecret.swift | 1 - Sources/SecretAgent/AppDelegate.swift | 2 -- .../Controllers/AgentStatusChecker.swift | 1 - .../Controllers/JustUpdatedChecker.swift | 1 - .../PreviewAgentStatusChecker.swift | 1 - Sources/Secretive/Views/StoreListView.swift | 1 - 9 files changed, 10 insertions(+), 19 deletions(-) diff --git a/Sources/Packages/Package.swift b/Sources/Packages/Package.swift index 820da97..82322b2 100644 --- a/Sources/Packages/Package.swift +++ b/Sources/Packages/Package.swift @@ -36,47 +36,47 @@ let package = Package( name: "SecretKit", dependencies: [], resources: [localization], - swiftSettings: swiftSettings + swiftSettings: swiftSettings, ), .testTarget( name: "SecretKitTests", dependencies: ["SecretKit", "SecureEnclaveSecretKit", "SmartCardSecretKit"], - swiftSettings: swiftSettings + swiftSettings: swiftSettings, ), .target( name: "SecureEnclaveSecretKit", dependencies: ["SecretKit"], resources: [localization], - swiftSettings: swiftSettings + swiftSettings: swiftSettings, ), .target( name: "SmartCardSecretKit", dependencies: ["SecretKit"], resources: [localization], - swiftSettings: swiftSettings + swiftSettings: swiftSettings, ), .target( name: "SecretAgentKit", dependencies: ["SecretKit", "SecretAgentKitHeaders"], resources: [localization], - swiftSettings: swiftSettings + swiftSettings: swiftSettings, ), .systemLibrary( - name: "SecretAgentKitHeaders" + name: "SecretAgentKitHeaders", ), .testTarget( name: "SecretAgentKitTests", - dependencies: ["SecretAgentKit"]) - , + dependencies: ["SecretAgentKit"], + ), .target( name: "Brief", dependencies: [], resources: [localization], - swiftSettings: swiftSettings + swiftSettings: swiftSettings, ), .testTarget( name: "BriefTests", - dependencies: ["Brief"] + dependencies: ["Brief"], ), ] ) diff --git a/Sources/Packages/Sources/SecretKit/Types/SecretStore.swift b/Sources/Packages/Sources/SecretKit/Types/SecretStore.swift index 9bf80ce..3e6b07b 100644 --- a/Sources/Packages/Sources/SecretKit/Types/SecretStore.swift +++ b/Sources/Packages/Sources/SecretKit/Types/SecretStore.swift @@ -1,5 +1,4 @@ import Foundation -import Combine /// Manages access to Secrets, and performs signature operations on data using those Secrets. public protocol SecretStore: Identifiable, Sendable { diff --git a/Sources/Packages/Sources/SecureEnclaveSecretKit/SecureEnclaveSecret.swift b/Sources/Packages/Sources/SecureEnclaveSecretKit/SecureEnclaveSecret.swift index 530d01e..ace6442 100644 --- a/Sources/Packages/Sources/SecureEnclaveSecretKit/SecureEnclaveSecret.swift +++ b/Sources/Packages/Sources/SecureEnclaveSecretKit/SecureEnclaveSecret.swift @@ -1,5 +1,4 @@ import Foundation -import Combine import SecretKit extension SecureEnclave { diff --git a/Sources/Packages/Sources/SmartCardSecretKit/SmartCardSecret.swift b/Sources/Packages/Sources/SmartCardSecretKit/SmartCardSecret.swift index 655214f..348926f 100644 --- a/Sources/Packages/Sources/SmartCardSecretKit/SmartCardSecret.swift +++ b/Sources/Packages/Sources/SmartCardSecretKit/SmartCardSecret.swift @@ -1,5 +1,4 @@ import Foundation -import Combine import SecretKit extension SmartCard { diff --git a/Sources/SecretAgent/AppDelegate.swift b/Sources/SecretAgent/AppDelegate.swift index 6bf0ec2..c714dbf 100644 --- a/Sources/SecretAgent/AppDelegate.swift +++ b/Sources/SecretAgent/AppDelegate.swift @@ -1,6 +1,5 @@ import Cocoa import OSLog -import Combine import SecretKit import SecureEnclaveSecretKit import SmartCardSecretKit @@ -27,7 +26,6 @@ class AppDelegate: NSObject, NSApplicationDelegate { let path = (NSHomeDirectory() as NSString).appendingPathComponent("socket.ssh") as String return SocketController(path: path) }() - private var updateSink: AnyCancellable? private let logger = Logger(subsystem: "com.maxgoedjen.secretive.secretagent", category: "AppDelegate") func applicationDidFinishLaunching(_ aNotification: Notification) { diff --git a/Sources/Secretive/Controllers/AgentStatusChecker.swift b/Sources/Secretive/Controllers/AgentStatusChecker.swift index 8ff234a..3c85f3f 100644 --- a/Sources/Secretive/Controllers/AgentStatusChecker.swift +++ b/Sources/Secretive/Controllers/AgentStatusChecker.swift @@ -1,5 +1,4 @@ import Foundation -import Combine import AppKit import SecretKit import Observation diff --git a/Sources/Secretive/Controllers/JustUpdatedChecker.swift b/Sources/Secretive/Controllers/JustUpdatedChecker.swift index 4e8ea72..7b25eef 100644 --- a/Sources/Secretive/Controllers/JustUpdatedChecker.swift +++ b/Sources/Secretive/Controllers/JustUpdatedChecker.swift @@ -1,5 +1,4 @@ import Foundation -import Combine import AppKit protocol JustUpdatedCheckerProtocol: Observable { diff --git a/Sources/Secretive/Preview Content/PreviewAgentStatusChecker.swift b/Sources/Secretive/Preview Content/PreviewAgentStatusChecker.swift index 5fce50d..51a5c09 100644 --- a/Sources/Secretive/Preview Content/PreviewAgentStatusChecker.swift +++ b/Sources/Secretive/Preview Content/PreviewAgentStatusChecker.swift @@ -1,5 +1,4 @@ import Foundation -import Combine class PreviewAgentStatusChecker: AgentStatusCheckerProtocol { diff --git a/Sources/Secretive/Views/StoreListView.swift b/Sources/Secretive/Views/StoreListView.swift index c0e6d3e..2c0dc2c 100644 --- a/Sources/Secretive/Views/StoreListView.swift +++ b/Sources/Secretive/Views/StoreListView.swift @@ -1,5 +1,4 @@ import SwiftUI -import Combine import SecretKit struct StoreListView: View {