fix(deps): remove CombineX

sbertix · sbertix · commit c8eb807abe1e · 2021-05-09T17:57:50.000+02:00
Fixes #191
diff --git a/Package.swift b/Package.swift
@@ -8,17 +8,17 @@ import PackageDescription
 let package = Package(
     name: "Swiftagram",
     // Supported versions.
-    platforms: [.iOS(.v9),
-                .macOS(.v10_12),
-                .tvOS(.v11),
-                .watchOS(.v3)],
+    platforms: [.iOS("13.0"),
+                .macOS("10.15"),
+                .tvOS("13.0"),
+                .watchOS("6.0")],
     // Exposed libraries.
     products: [.library(name: "Swiftagram",
                         targets: ["Swiftagram"]),
                .library(name: "SwiftagramCrypto",
                         targets: ["SwiftagramCrypto"])],
     // Package dependencies.
-    dependencies: [.package(url: "https://github.com/sbertix/ComposableRequest", .upToNextMinor(from: "5.0.7")),
+    dependencies: [.package(url: "https://github.com/sbertix/ComposableRequest", .upToNextMinor(from: "5.0.9")),
                    .package(url: "https://github.com/sbertix/SwCrypt.git", .upToNextMinor(from: "5.1.0"))],
     // All targets.
     targets: [.target(name: "Swiftagram",
@@ -32,48 +32,7 @@ let package = Package(
                           dependencies: ["Swiftagram", "SwiftagramCrypto"])]
 )
 
-enum CombineImplementation {
-    /// Apple **Combine**.
-    case combine
-    /// **cx-org/CombineX**.
-    case combineX
-    
-    /// Default implementation.
-    /// If available, Apple **Combine** is always preferred.
-    static var `default`: CombineImplementation {
-        #if canImport(Combine)
-        return .combine
-        #else
-        return .combineX
-        #endif
-    }
-    
-    /// Optional init.
-    ///
-    /// - parameter description: A valid `String`.
-    init?(_ description: String) {
-        let desc = description.lowercased().filter { $0.isLetter }
-        switch desc {
-        case "combine": self = .combine
-        case "combinex": self = .combineX
-        default: return nil
-        }
-    }
-}
-
-extension ProcessInfo {
-    /// The selected combine implementation. Defaults to `.default`.
-    var combineImplementation: CombineImplementation {
-        return environment["CX_COMBINE_IMPLEMENTATION"].flatMap(CombineImplementation.init) ?? .default
-    }
-}
-
-// MARK: Adjustments
-
 if ProcessInfo.processInfo.environment["TARGETING_WATCHOS"] == "true" {
     // #workaround(xcodebuild -version 11.6, Test targets don’t work on watchOS.) @exempt(from: unicode)
     package.targets.removeAll(where: { $0.isTest })
 }
-if ProcessInfo.processInfo.combineImplementation == .combine {
-    package.platforms = [.macOS("10.15"), .iOS("13.0"), .tvOS("13.0"), .watchOS("6.0")]
-}
diff --git a/Sources/Swiftagram/Authentication/Authenticator+Keys.swift b/Sources/Swiftagram/Authentication/Authenticator+Keys.swift
@@ -57,7 +57,13 @@ public extension Authenticator.Keys {
     /// - throws: Some `Error`.
     /// - returns: An array of `Secret`s.
     func get() throws -> [Secret] {
-        try AnyStorage.items(in: authenticator.storage)
+        switch labels {
+        case let labels?:
+            return try AnyStorage.items(in: authenticator.storage)
+                .filter { labels.contains($0.label) }
+        default:
+            return try AnyStorage.items(in: authenticator.storage)
+        }
     }
 
     /// Delete selected `Secret`s.
@@ -70,9 +76,7 @@ public extension Authenticator.Keys {
         case let labels?:
             return try labels.compactMap { try authenticator.secret($0).delete() }
         default:
-            let secrets = try? authenticator.secrets.get()
-            try AnyStorage.empty(authenticator.storage)
-            return secrets ?? []
+            return try authenticator.secrets.get().compactMap { try authenticator.secret($0).delete() }
         }
     }
 }
diff --git a/Sources/Swiftagram/Authentication/Visual/Authenticator+Visual.swift b/Sources/Swiftagram/Authentication/Visual/Authenticator+Visual.swift
@@ -50,6 +50,7 @@ public extension Authenticator.Group {
                         }
                     }
                 }
+                .setFailureType(to: Swift.Error.self)
                 .flatMap {
                     Future<AuthenticatorWebView, Swift.Error> { resolve in
                         // Prepare the actual `WebView`.

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,13 @@ public extension Authenticator.Keys {`
`57`	`57`	/// - throws: Some `Error`.
`58`	`58`	/// - returns: An array of `Secret`s.
`59`	`59`	`func get() throws -> [Secret] {`
`60`		`- try AnyStorage.items(in: authenticator.storage)`
	`60`	`+ switch labels {`
	`61`	`+ case let labels?:`
	`62`	`+ return try AnyStorage.items(in: authenticator.storage)`
	`63`	`+ .filter { labels.contains($0.label) }`
	`64`	`+ default:`
	`65`	`+ return try AnyStorage.items(in: authenticator.storage)`
	`66`	`+ }`
`61`	`67`	`}`
`62`	`68`
`63`	`69`	/// Delete selected `Secret`s.
`@@ -70,9 +76,7 @@ public extension Authenticator.Keys {`
`70`	`76`	`case let labels?:`
`71`	`77`	`return try labels.compactMap { try authenticator.secret($0).delete() }`
`72`	`78`	`default:`
`73`		`- let secrets = try? authenticator.secrets.get()`
`74`		`- try AnyStorage.empty(authenticator.storage)`
`75`		`- return secrets ?? []`
	`79`	`+ return try authenticator.secrets.get().compactMap { try authenticator.secret($0).delete() }`
`76`	`80`	`}`
`77`	`81`	`}`
`78`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ public extension Authenticator.Group {`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`	`}`
	`53`	`+ .setFailureType(to: Swift.Error.self)`
`53`	`54`	`.flatMap {`
`54`	`55`	`Future<AuthenticatorWebView, Swift.Error> { resolve in`
`55`	`56`	// Prepare the actual `WebView`.