Cleanup

Sources/Keychain/Keychain+Dependencies.swift

@@ -11,9 +11,6 @@ extension DependencyValues {
 }
 
 public enum KeychainDependencyKey: DependencyKey {
-	public static let liveValue: any Keychain = ValetKeychain()
-}
-
-extension KeychainDependencyKey: TestDependencyKey {
-	public static let testValue: any Keychain = InMemoryKeychain()
+	public static var liveValue: any Keychain { ValetKeychain() }
+	public static var testValue: any Keychain { InMemoryKeychain() }
 }

Sources/Keychain/Keychain.swift

@@ -2,10 +2,8 @@ import Foundation
 
 public protocol Keychain: Sendable {
 
-	@inlinable
 	func load<T>(key: String) throws -> T where T: Decodable
 
-	@inlinable
 	func save<T>(key: String, value: T) throws where T: Encodable
 
 	func delete(key: String) throws

Sources/Keychain/KeychainConfiguration+Dependencies.swift

@@ -1,6 +1,5 @@
 import Dependencies
 import Foundation
-import XCTestDynamicOverlay
 
 extension DependencyValues {
 

Sources/Keychain/Keychains/InMemoryKeychain.swift

@@ -1,19 +1,15 @@
-import Dependencies
 import Foundation
 import os
 import Valet
 
 public final class InMemoryKeychain {
 
-	@usableFromInline
-	static let data = OSAllocatedUnfairLock(initialState: [String: Data]())
+	let data = OSAllocatedUnfairLock(initialState: [String: Data]())
 
 	init() {}
 
-	@usableFromInline
 	let encoder = JSONEncoder()
 
-	@usableFromInline
 	let decoder = JSONDecoder()
 
 }
@@ -22,26 +18,24 @@ public final class InMemoryKeychain {
 
 extension InMemoryKeychain: Keychain {
 
-	@inlinable
 	public func load<T>(key: String) throws -> T where T: Decodable {
-		guard let data = InMemoryKeychain.data.withLock({ $0[key] }) else {
+		guard let data = data.withLock({ $0[key] }) else {
 			throw KeychainError.itemNotFound
 		}
 		return try decoder.decode(T.self, from: data)
 	}
 
-	@inlinable
 	public func save<T>(key: String, value: T) throws where T: Encodable {
-		let data = try encoder.encode(value)
-		InMemoryKeychain.data.withLock { $0[key] = data }
+		let encoded = try encoder.encode(value)
+		data.withLock { $0[key] = encoded }
 	}
 
 	public func delete(key: String) throws {
-		_ = InMemoryKeychain.data.withLock { $0.removeValue(forKey: key) }
+		_ = data.withLock { $0.removeValue(forKey: key) }
 	}
 
 	public func allKeys() throws -> Set<String> {
-		InMemoryKeychain.data.withLock { Set($0.keys) }
+		data.withLock { Set($0.keys) }
 	}
 
 }

Sources/Keychain/Keychains/ValetKeychain.swift

@@ -65,13 +65,11 @@ struct ValetKeychain {
 
 extension ValetKeychain: Keychain {
 
-	@inlinable
 	func load<T>(key: String) throws -> T where T: Decodable {
 		let data = try valet().object(forKey: key)
 		return try decoder.decode(T.self, from: data)
 	}
 
-	@inlinable
 	func save<T>(key: String, value: T) throws where T: Encodable {
 		let data = try encoder.encode(value)
 		try valet().setObject(data, forKey: key)