Merge branch 'main' into fix_test_action

This commit is contained in:
Max Goedjen 2025-08-23 20:44:27 -07:00 committed by GitHub
commit 333f8e3e57
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 15 additions and 25 deletions

View File

@ -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"],
),
]
)

View File

@ -3,7 +3,7 @@ import Foundation
/// Type eraser for Secret.
public struct AnySecret: Secret, @unchecked Sendable {
let base: Any
public let base: Any
private let hashable: AnyHashable
private let _id: () -> AnyHashable
private let _name: () -> String

View File

@ -1,8 +1,7 @@
import Foundation
import Combine
/// Type eraser for SecretStore.
public class AnySecretStore: SecretStore, @unchecked Sendable {
open class AnySecretStore: SecretStore, @unchecked Sendable {
let base: any Sendable
private let _isAvailable: @MainActor @Sendable () -> Bool

View File

@ -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 {

View File

@ -1,5 +1,4 @@
import Foundation
import Combine
import SecretKit
extension SecureEnclave {

View File

@ -248,9 +248,9 @@ extension SecureEnclave.Store {
extension SecureEnclave {
enum Constants {
static let keyTag = Data("com.maxgoedjen.secretive.secureenclave.key".utf8)
static let keyType = kSecAttrKeyTypeECSECPrimeRandom as String
public enum Constants {
public static let keyTag = Data("com.maxgoedjen.secretive.secureenclave.key".utf8)
public static let keyType = kSecAttrKeyTypeECSECPrimeRandom as String
static let unauthenticatedThreshold: TimeInterval = 0.05
}

View File

@ -1,5 +1,4 @@
import Foundation
import Combine
import SecretKit
extension SmartCard {

View File

@ -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) {

View File

@ -1,5 +1,4 @@
import Foundation
import Combine
import AppKit
import SecretKit
import Observation

View File

@ -1,5 +1,4 @@
import Foundation
import Combine
import AppKit
protocol JustUpdatedCheckerProtocol: Observable {

View File

@ -1,5 +1,4 @@
import Foundation
import Combine
class PreviewAgentStatusChecker: AgentStatusCheckerProtocol {

View File

@ -1,5 +1,4 @@
import SwiftUI
import Combine
import SecretKit
struct StoreListView: View {