Merge pull request #51 from akuzminskyi/feature/replaced-experimental-to-upcomming

albertodebortoli · web-flow · commit fb8747379646 · 2025-02-27T09:12:31.000Z
Replaced `enableExperimentalFeature` to `enableUpcomingFeature`
diff --git a/JustTweakMigrator/Package.swift b/JustTweakMigrator/Package.swift
@@ -22,8 +22,8 @@ let package = Package(
             ],
             path: "Sources",
             swiftSettings: [
-                .enableExperimentalFeature("InternalImportsByDefault"),
-                .enableExperimentalFeature("ExistentialAny")
+                .enableUpcomingFeature("InternalImportsByDefault"),
+                .enableUpcomingFeature("ExistentialAny")
             ]
         ),
         .testTarget(
@@ -34,8 +34,8 @@ let package = Package(
                 .process("Resources")
             ],
             swiftSettings: [
-                .enableExperimentalFeature("InternalImportsByDefault"),
-                .enableExperimentalFeature("ExistentialAny")
+                .enableUpcomingFeature("InternalImportsByDefault"),
+                .enableUpcomingFeature("ExistentialAny")
             ]
         )
     ]
diff --git a/JustTweakMigrator/Sources/Extensions/Toggle+Encodable.swift b/JustTweakMigrator/Sources/Extensions/Toggle+Encodable.swift
@@ -18,7 +18,7 @@ extension Toggle: Codable {
         case metadata
     }
     
-    init(from decoder: Decoder) throws {
+    init(from decoder: any Decoder) throws {
         let values = try decoder.container(keyedBy: CodingKeys.self)
         variable = try values.decode(ToggleVariable.self, forKey: .variable)
         if let boolValue = try? values.decode(Bool.self, forKey: .bool) {
@@ -42,7 +42,7 @@ extension Toggle: Codable {
         metadata = (try? values.decode(ToggleMetadata.self, forKey: .metadata)) ?? ToggleMetadata(description: "", group: "", propertyName: nil)
     }
     
-    func encode(to encoder: Encoder) throws {
+    func encode(to encoder: any Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(variable, forKey: .variable)
         
diff --git a/JustTweakMigrator/Sources/Extensions/Tweak+Decodable.swift b/JustTweakMigrator/Sources/Extensions/Tweak+Decodable.swift
@@ -16,7 +16,7 @@ extension Tweak: Decodable {
         case generatedPropertyName = "GeneratedPropertyName"
     }
     
-    init(from decoder: Decoder) throws {
+    init(from decoder: any Decoder) throws {
         let values = try decoder.container(keyedBy: CodingKeys.self)
         self.title = try values.decode(String.self, forKey: .title)
         self.group = try values.decode(String.self, forKey: .group)
diff --git a/JustTweakMigrator/Sources/Extensions/TweakDatasource+Decodable.swift b/JustTweakMigrator/Sources/Extensions/TweakDatasource+Decodable.swift
@@ -8,7 +8,7 @@ extension TweaksDatasource: Decodable {
         case missingValue
     }
     
-    init(from decoder: Decoder) throws {
+    init(from decoder: any Decoder) throws {
         let values = try decoder.singleValueContainer()
         tweaks = try values.decode([TweakFeature: [TweakVariable: Tweak]].self)
     }
diff --git a/Package.swift b/Package.swift
@@ -26,8 +26,8 @@ let package = Package(
             path: "Sources",
             resources: [.process("Resources")],
             swiftSettings: [
-                .enableExperimentalFeature("InternalImportsByDefault"),
-                .enableExperimentalFeature("ExistentialAny")
+                .enableUpcomingFeature("InternalImportsByDefault"),
+                .enableUpcomingFeature("ExistentialAny")
             ]
         ),
         .testTarget(
@@ -36,8 +36,8 @@ let package = Package(
             path: "Tests",
             resources: [.process("Resources")],
             swiftSettings: [
-                .enableExperimentalFeature("InternalImportsByDefault"),
-                .enableExperimentalFeature("ExistentialAny")
+                .enableUpcomingFeature("InternalImportsByDefault"),
+                .enableUpcomingFeature("ExistentialAny")
             ]
         )
     ]
diff --git a/Sources/Extensions/Object/Object+Codable.swift b/Sources/Extensions/Object/Object+Codable.swift
@@ -3,7 +3,7 @@
 import Foundation
 
 extension Object: Codable {
-    public init(from decoder: Decoder) throws {
+    public init(from decoder: any Decoder) throws {
         let container = try decoder.singleValueContainer()
         
         if let dictionary = try? container.decode([Variable: ObjectSupportedType].self) {
@@ -24,7 +24,7 @@ extension Object: Codable {
         }
     }
     
-    public func encode(to encoder: Encoder) throws {
+    public func encode(to encoder: any Encoder) throws {
         guard !map.isEmpty else {
             throw EncodingError.invalidValue(map, .init(codingPath: [], debugDescription: "Empty object. Can not be encoded."))
         }
diff --git a/Sources/Extensions/Object/ObjectSupportedType+Codable.swift b/Sources/Extensions/Object/ObjectSupportedType+Codable.swift
@@ -3,7 +3,7 @@
 import Foundation
 
 extension ObjectSupportedType: Codable {
-    public init(from decoder: Decoder) throws {
+    public init(from decoder: any Decoder) throws {
         let container = try decoder.singleValueContainer()
 
         if let bool = try? container.decode(Bool.self) {
@@ -19,7 +19,7 @@ extension ObjectSupportedType: Codable {
         }
     }
     
-    public func encode(to encoder: Encoder) throws {
+    public func encode(to encoder: any Encoder) throws {
         var container = encoder.singleValueContainer()
         
         switch self {
diff --git a/Sources/Extensions/Toggle+Codable.swift b/Sources/Extensions/Toggle+Codable.swift
@@ -19,7 +19,7 @@ extension Toggle: Codable {
         case object
     }
     
-    public init(from decoder: Decoder) throws {
+    public init(from decoder: any Decoder) throws {
         let values = try decoder.container(keyedBy: CodingKeys.self)
         variable = try values.decode(Variable.self, forKey: .variable)
         if let boolValue = try? values.decode(Bool.self, forKey: .bool) {
@@ -46,7 +46,7 @@ extension Toggle: Codable {
         metadata = (try? values.decode(Metadata.self, forKey: .metadata)) ?? Metadata(description: "", group: "")
     }
     
-    public func encode(to encoder: Encoder) throws {
+    public func encode(to encoder: any Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(variable, forKey: .variable)
         
diff --git a/Sources/ObservableObjects/ToggleObservable.swift b/Sources/ObservableObjects/ToggleObservable.swift
@@ -1,6 +1,6 @@
 //  ToggleObservable.swift
 
-import Combine
+public import Combine
 import Foundation
 
 /// `ObservableObject` tied to a toggle that publishes updates whenever its value changes.
diff --git a/Sources/Protocols/Logger.swift b/Sources/Protocols/Logger.swift
@@ -7,6 +7,6 @@ public protocol Logger {
 }
 
 public enum ToggleError: Error {
-    case invalidValueType(Variable, Value, ValueProvider)
-    case insecureValue(Variable, ValueProvider)
+    case invalidValueType(Variable, Value, any ValueProvider)
+    case insecureValue(Variable, any ValueProvider)
 }
diff --git a/Sources/Providers/LocalValueProvider.swift b/Sources/Providers/LocalValueProvider.swift
@@ -1,6 +1,6 @@
 //  LocalValueProvider.swift
 
-import Foundation
+public import Foundation
 
 /// Value provider with a local datasource.
 final public class LocalValueProvider {
diff --git a/Sources/Providers/PersistentValueProvider.swift b/Sources/Providers/PersistentValueProvider.swift
@@ -1,6 +1,6 @@
 //  PersistentValueProvider.swift
 
-import Foundation
+public import Foundation
 
 private let userDefaultsKeyPrefix = "com.toggles"
 
diff --git a/Sources/ToggleManager/ToggleManager+Ciphering.swift b/Sources/ToggleManager/ToggleManager+Ciphering.swift
@@ -22,7 +22,7 @@ extension ToggleManager {
         guard let cipherConfiguration = cipherConfiguration else {
             throw FetchError.missingCipherConfiguration
         }
-        let cipher: Ciphering
+        let cipher: any Ciphering
         switch cipherConfiguration.algorithm {
         case Algorithm.chaCha20Poly1305:
             cipher = ChaCha20Poly1305(key: cipherConfiguration.key)
@@ -49,7 +49,7 @@ extension ToggleManager {
             return ""
         }
         
-        let cipher: Ciphering
+        let cipher: any Ciphering
         switch cipherConfiguration.algorithm {
         case Algorithm.chaCha20Poly1305:
             cipher = ChaCha20Poly1305(key: cipherConfiguration.key)
diff --git a/Sources/ToggleManager/ToggleManager+Publishing.swift b/Sources/ToggleManager/ToggleManager+Publishing.swift
@@ -1,6 +1,6 @@
 //  ToggleManager+Publishing.swift
 
-import Combine
+public import Combine
 import Foundation
 
 extension ToggleManager: Publishing {
diff --git a/Sources/ToggleManager/ToggleManager.swift b/Sources/ToggleManager/ToggleManager.swift
@@ -1,7 +1,7 @@
 //  ToggleManager.swift
 
-import Combine
-import Foundation
+public import Combine
+public import Foundation
 
 /// Thread-safe facade to interface with toggles.
 final public class ToggleManager: ObservableObject, @unchecked Sendable {
@@ -18,16 +18,16 @@ final public class ToggleManager: ObservableObject, @unchecked Sendable {
         public static let noCaching = ToggleManagerOptions(rawValue: 1 << 2)
     }
     
-    var mutableValueProvider: MutableValueProvider?
-    var valueProviders: [ValueProvider]
+    var mutableValueProvider: (any MutableValueProvider)?
+    var valueProviders: [any ValueProvider]
     var defaultValueProvider: DefaultValueProvider
     var cipherConfiguration: CipherConfiguration?
     
     let queue = DispatchQueue(label: "com.albertodebortoli.Toggles.ToggleManager", attributes: .concurrent)
     let cache = ValueCache<Variable, Value>()
     var subjectsRefs = [Variable: CurrentValueSubject<Value, Never>]()
     let options: [ToggleManagerOptions]
-    var logger: Logger?
+    var logger: (any Logger)?
     
     @Published var hasOverrides: Bool = false
     
@@ -41,11 +41,11 @@ final public class ToggleManager: ObservableObject, @unchecked Sendable {
     ///   - valueProviders: An array or providers that can retrieve toggle values. The providers must be listed in order of priority.
     ///   - datasourceUrl: The url to a file containing the datasource used the base. If no mutableValueProvider and no valueProviders are provided, the manager will always return the values from the datasource.
     ///   - cipherConfiguration: An optional configuration that needs to be provided in the case any toggle is secure (meaning it needs encryption and decryption).
-    public init(mutableValueProvider: MutableValueProvider? = nil,
-                valueProviders: [ValueProvider] = [],
+    public init(mutableValueProvider: (any MutableValueProvider)? = nil,
+                valueProviders: [any ValueProvider] = [],
                 datasourceUrl: URL,
                 cipherConfiguration: CipherConfiguration? = nil,
-                logger: Logger? = nil,
+                logger: (any Logger)? = nil,
                 options: [ToggleManagerOptions] = []) throws {
         self.mutableValueProvider = mutableValueProvider
         self.valueProviders = valueProviders
@@ -108,7 +108,7 @@ extension ToggleManager {
         return !options.contains(.noCaching)
     }
     
-    private func isValueValid(value: Value, defaultValue: Value?, variableName: Variable, provider: ValueProvider) -> Bool {
+    private func isValueValid(value: Value, defaultValue: Value?, variableName: Variable, provider: any ValueProvider) -> Bool {
         if shouldCheckInvalidValueTypes, let defaultValue, !(value ~= defaultValue) {
             logger?.log(ToggleError.invalidValueType(variableName, value, provider))
             return false
diff --git a/Sources/Views/TogglesView.swift b/Sources/Views/TogglesView.swift
@@ -1,6 +1,6 @@
 //  TogglesView.swift
 
-import SwiftUI
+public import SwiftUI
 
 /// A view showcasing all toggles from a provided datasource.
 public struct TogglesView: View {
diff --git a/ToggleCipher/Package.swift b/ToggleCipher/Package.swift
@@ -22,17 +22,17 @@ let package = Package(
             ],
             path: "Sources",
             swiftSettings: [
-                .enableExperimentalFeature("InternalImportsByDefault"),
-                .enableExperimentalFeature("ExistentialAny")
+                .enableUpcomingFeature("InternalImportsByDefault"),
+                .enableUpcomingFeature("ExistentialAny")
             ]
         ),
         .testTarget(
             name: "ToggleCipherTests",
             dependencies: ["ToggleCipher"],
             path: "Tests",
             swiftSettings: [
-                .enableExperimentalFeature("InternalImportsByDefault"),
-                .enableExperimentalFeature("ExistentialAny")
+                .enableUpcomingFeature("InternalImportsByDefault"),
+                .enableUpcomingFeature("ExistentialAny")
             ]
         )
     ]
diff --git a/ToggleGen/Package.swift b/ToggleGen/Package.swift
@@ -26,8 +26,8 @@ let package = Package(
             ],
             path: "Sources",
             swiftSettings: [
-                .enableExperimentalFeature("InternalImportsByDefault"),
-                .enableExperimentalFeature("ExistentialAny")
+                .enableUpcomingFeature("InternalImportsByDefault"),
+                .enableUpcomingFeature("ExistentialAny")
             ]
         ),
         .testTarget(
@@ -36,8 +36,8 @@ let package = Package(
             path: "Tests",
             resources: [.process("Resources")],
             swiftSettings: [
-                .enableExperimentalFeature("InternalImportsByDefault"),
-                .enableExperimentalFeature("ExistentialAny")
+                .enableUpcomingFeature("InternalImportsByDefault"),
+                .enableUpcomingFeature("ExistentialAny")
             ]
         )
     ]
diff --git a/ToggleGen/Sources/Extensions/Models+Decodable.swift b/ToggleGen/Sources/Extensions/Models+Decodable.swift
@@ -19,7 +19,7 @@ extension Toggle: Decodable {
         case metadata
     }
     
-    public init(from decoder: Decoder) throws {
+    public init(from decoder: any Decoder) throws {
         let values = try decoder.container(keyedBy: CodingKeys.self)
         variable = try values.decode(Variable.self, forKey: .variable)
         if let boolValue = try? values.decode(Bool.self, forKey: .bool) {
diff --git a/ToggleGen/Sources/Models/Object.swift b/ToggleGen/Sources/Models/Object.swift
@@ -5,7 +5,7 @@ import Foundation
 struct Object: Equatable, Decodable {
     let map: [String: ObjectSupportedType]
     
-    init(from decoder: Decoder) throws {
+    init(from decoder: any Decoder) throws {
         let container = try decoder.singleValueContainer()
         
         if let dictionary = try? container.decode([String: ObjectSupportedType].self) {
diff --git a/ToggleGen/Sources/Models/ObjectSupportedType.swift b/ToggleGen/Sources/Models/ObjectSupportedType.swift
@@ -8,7 +8,7 @@ enum ObjectSupportedType: Equatable, Decodable {
     case number(Double)
     case string(String)
     
-    init(from decoder: Decoder) throws {
+    init(from decoder: any Decoder) throws {
         let container = try decoder.singleValueContainer()
         
         if let bool = try? container.decode(Bool.self) {

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ let package = Package(`
`22`	`22`	`],`
`23`	`23`	`path: "Sources",`
`24`	`24`	`swiftSettings: [`
`25`		`- .enableExperimentalFeature("InternalImportsByDefault"),`
`26`		`- .enableExperimentalFeature("ExistentialAny")`
	`25`	`+ .enableUpcomingFeature("InternalImportsByDefault"),`
	`26`	`+ .enableUpcomingFeature("ExistentialAny")`
`27`	`27`	`]`
`28`	`28`	`),`
`29`	`29`	`.testTarget(`
`@@ -34,8 +34,8 @@ let package = Package(`
`34`	`34`	`.process("Resources")`
`35`	`35`	`],`
`36`	`36`	`swiftSettings: [`
`37`		`- .enableExperimentalFeature("InternalImportsByDefault"),`
`38`		`- .enableExperimentalFeature("ExistentialAny")`
	`37`	`+ .enableUpcomingFeature("InternalImportsByDefault"),`
	`38`	`+ .enableUpcomingFeature("ExistentialAny")`
`39`	`39`	`]`
`40`	`40`	`)`
`41`	`41`	`]`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ extension Toggle: Codable {`
`18`	`18`	`case metadata`
`19`	`19`	`}`
`20`	`20`
`21`		`- init(from decoder: Decoder) throws {`
	`21`	`+ init(from decoder: any Decoder) throws {`
`22`	`22`	`let values = try decoder.container(keyedBy: CodingKeys.self)`
`23`	`23`	`variable = try values.decode(ToggleVariable.self, forKey: .variable)`
`24`	`24`	`if let boolValue = try? values.decode(Bool.self, forKey: .bool) {`
`@@ -42,7 +42,7 @@ extension Toggle: Codable {`
`42`	`42`	`metadata = (try? values.decode(ToggleMetadata.self, forKey: .metadata)) ?? ToggleMetadata(description: "", group: "", propertyName: nil)`
`43`	`43`	`}`
`44`	`44`
`45`		`- func encode(to encoder: Encoder) throws {`
	`45`	`+ func encode(to encoder: any Encoder) throws {`
`46`	`46`	`var container = encoder.container(keyedBy: CodingKeys.self)`
`47`	`47`	`try container.encode(variable, forKey: .variable)`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ extension Tweak: Decodable {`
`16`	`16`	`case generatedPropertyName = "GeneratedPropertyName"`
`17`	`17`	`}`
`18`	`18`
`19`		`- init(from decoder: Decoder) throws {`
	`19`	`+ init(from decoder: any Decoder) throws {`
`20`	`20`	`let values = try decoder.container(keyedBy: CodingKeys.self)`
`21`	`21`	`self.title = try values.decode(String.self, forKey: .title)`
`22`	`22`	`self.group = try values.decode(String.self, forKey: .group)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ extension TweaksDatasource: Decodable {`
`8`	`8`	`case missingValue`
`9`	`9`	`}`
`10`	`10`
`11`		`- init(from decoder: Decoder) throws {`
	`11`	`+ init(from decoder: any Decoder) throws {`
`12`	`12`	`let values = try decoder.singleValueContainer()`
`13`	`13`	`tweaks = try values.decode([TweakFeature: [TweakVariable: Tweak]].self)`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ let package = Package(`
`26`	`26`	`path: "Sources",`
`27`	`27`	`resources: [.process("Resources")],`
`28`	`28`	`swiftSettings: [`
`29`		`- .enableExperimentalFeature("InternalImportsByDefault"),`
`30`		`- .enableExperimentalFeature("ExistentialAny")`
	`29`	`+ .enableUpcomingFeature("InternalImportsByDefault"),`
	`30`	`+ .enableUpcomingFeature("ExistentialAny")`
`31`	`31`	`]`
`32`	`32`	`),`
`33`	`33`	`.testTarget(`
`@@ -36,8 +36,8 @@ let package = Package(`
`36`	`36`	`path: "Tests",`
`37`	`37`	`resources: [.process("Resources")],`
`38`	`38`	`swiftSettings: [`
`39`		`- .enableExperimentalFeature("InternalImportsByDefault"),`
`40`		`- .enableExperimentalFeature("ExistentialAny")`
	`39`	`+ .enableUpcomingFeature("InternalImportsByDefault"),`
	`40`	`+ .enableUpcomingFeature("ExistentialAny")`
`41`	`41`	`]`
`42`	`42`	`)`
`43`	`43`	`]`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`import Foundation`
`4`	`4`
`5`	`5`	`extension Object: Codable {`
`6`		`- public init(from decoder: Decoder) throws {`
	`6`	`+ public init(from decoder: any Decoder) throws {`
`7`	`7`	`let container = try decoder.singleValueContainer()`
`8`	`8`
`9`	`9`	`if let dictionary = try? container.decode([Variable: ObjectSupportedType].self) {`
`@@ -24,7 +24,7 @@ extension Object: Codable {`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`		`- public func encode(to encoder: Encoder) throws {`
	`27`	`+ public func encode(to encoder: any Encoder) throws {`
`28`	`28`	`guard !map.isEmpty else {`
`29`	`29`	`throw EncodingError.invalidValue(map, .init(codingPath: [], debugDescription: "Empty object. Can not be encoded."))`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`import Foundation`
`4`	`4`
`5`	`5`	`extension ObjectSupportedType: Codable {`
`6`		`- public init(from decoder: Decoder) throws {`
	`6`	`+ public init(from decoder: any Decoder) throws {`
`7`	`7`	`let container = try decoder.singleValueContainer()`
`8`	`8`
`9`	`9`	`if let bool = try? container.decode(Bool.self) {`
`@@ -19,7 +19,7 @@ extension ObjectSupportedType: Codable {`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`
`22`		`- public func encode(to encoder: Encoder) throws {`
	`22`	`+ public func encode(to encoder: any Encoder) throws {`
`23`	`23`	`var container = encoder.singleValueContainer()`
`24`	`24`
`25`	`25`	`switch self {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ extension Toggle: Codable {`
`19`	`19`	`case object`
`20`	`20`	`}`
`21`	`21`
`22`		`- public init(from decoder: Decoder) throws {`
	`22`	`+ public init(from decoder: any Decoder) throws {`
`23`	`23`	`let values = try decoder.container(keyedBy: CodingKeys.self)`
`24`	`24`	`variable = try values.decode(Variable.self, forKey: .variable)`
`25`	`25`	`if let boolValue = try? values.decode(Bool.self, forKey: .bool) {`
`@@ -46,7 +46,7 @@ extension Toggle: Codable {`
`46`	`46`	`metadata = (try? values.decode(Metadata.self, forKey: .metadata)) ?? Metadata(description: "", group: "")`
`47`	`47`	`}`
`48`	`48`
`49`		`- public func encode(to encoder: Encoder) throws {`
	`49`	`+ public func encode(to encoder: any Encoder) throws {`
`50`	`50`	`var container = encoder.container(keyedBy: CodingKeys.self)`
`51`	`51`	`try container.encode(variable, forKey: .variable)`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@ public protocol Logger {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`public enum ToggleError: Error {`
`10`		`- case invalidValueType(Variable, Value, ValueProvider)`
`11`		`- case insecureValue(Variable, ValueProvider)`
	`10`	`+ case invalidValueType(Variable, Value, any ValueProvider)`
	`11`	`+ case insecureValue(Variable, any ValueProvider)`
`12`	`12`	`}`