diff --git a/Model/Defaulting.swift b/Model/Defaulting.swift index 795ef8df..ccdd4e31 100644 --- a/Model/Defaulting.swift +++ b/Model/Defaulting.swift @@ -21,7 +21,7 @@ public protocol Defaulting: NSObjectProtocol { } final class UDefaults: NSObject, Defaulting { - subscript(key: Defaults.Key) -> Value where Value: DefaultsSerializable { + subscript(key: Defaults.Key) -> Value { get { Defaults[key] } diff --git a/SwiftUI/Model/DefaultKeys.swift b/SwiftUI/Model/DefaultKeys.swift index 2b449b71..64040a14 100644 --- a/SwiftUI/Model/DefaultKeys.swift +++ b/SwiftUI/Model/DefaultKeys.swift @@ -52,38 +52,3 @@ extension Defaults.Keys { static let windowURLs = Key<[URL]>("windowURLs", default: []) #endif } - -extension Defaults.Serializable where Self: Codable { - public static var bridge: Defaults.TopLevelCodableBridge { Defaults.TopLevelCodableBridge() } -} - -extension Defaults.Serializable where Self: Codable & NSSecureCoding { - public static var bridge: Defaults.CodableNSSecureCodingBridge { Defaults.CodableNSSecureCodingBridge() } -} - -extension Defaults.Serializable where Self: Codable & NSSecureCoding & Defaults.PreferNSSecureCoding { - public static var bridge: Defaults.NSSecureCodingBridge { Defaults.NSSecureCodingBridge() } -} - -extension Defaults.Serializable where Self: Codable & RawRepresentable { - public static var bridge: Defaults.RawRepresentableCodableBridge { Defaults.RawRepresentableCodableBridge() } -} - -extension Defaults.Serializable where Self: Codable & RawRepresentable & Defaults.PreferRawRepresentable { - public static var bridge: Defaults.RawRepresentableBridge { Defaults.RawRepresentableBridge() } -} - -extension Defaults.Serializable where Self: RawRepresentable { - public static var bridge: Defaults.RawRepresentableBridge { Defaults.RawRepresentableBridge() } -} -extension Defaults.Serializable where Self: NSSecureCoding { - public static var bridge: Defaults.NSSecureCodingBridge { Defaults.NSSecureCodingBridge() } -} - -extension Defaults.CollectionSerializable where Element: Defaults.Serializable { - public static var bridge: Defaults.CollectionBridge { Defaults.CollectionBridge() } -} - -extension Defaults.SetAlgebraSerializable where Element: Defaults.Serializable & Hashable { - public static var bridge: Defaults.SetAlgebraBridge { Defaults.SetAlgebraBridge() } -} diff --git a/Tests/TestDefaults.swift b/Tests/TestDefaults.swift index c122614d..5cc3d8d6 100644 --- a/Tests/TestDefaults.swift +++ b/Tests/TestDefaults.swift @@ -19,7 +19,7 @@ import Defaults final class TestDefaults: NSObject, Defaulting { - var dict: [Defaults.AnyKey: any DefaultsSerializable] = [:] + var dict: [Defaults._AnyKey: AnyObject] = [:] func setup() { self[.categoriesToLanguages] = [:] @@ -29,13 +29,13 @@ final class TestDefaults: NSObject, Defaulting { self[.libraryLanguageCodes] = Set() } - subscript(key: Defaults.Key) -> Value where Value: DefaultsSerializable { + subscript(key: Defaults.Key) -> Value { get { // swiftlint:disable:next force_cast dict[key] as! Value } set { - dict[key] = newValue + dict[key] = newValue as AnyObject } } }