Cleanup

.github/workflows/ci.yml

@@ -7,18 +7,15 @@ on:
 
 jobs:
   build:
-    name: Swift ${{ matrix.swift }} on ${{ matrix.os }}
+    name: CI on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         include:
           - os: macos-12
-            swift: "5.7"
+
     steps:
-      - uses: fwal/setup-swift@v1
-        with:
-          swift-version: ${{ matrix.swift }}
       - run: swift --version
       - uses: actions/checkout@v3
 

Sources/ShXcrun/Altool/Credential/ApiKeyCredential.swift

@@ -0,0 +1,21 @@
+public struct ApiKeyCredential: AltoolCredential {
+
+  let keyID: String
+  let issuerID: String
+
+  public init(keyID: String, issuerID: String) {
+    self.keyID = keyID
+    self.issuerID = issuerID
+  }
+
+  public var serialized: String {
+    "--apiKey $SH_XCRUN_ALTOOL_API_KEY_ID --apiIssuer $SH_XCRUN_ALTOOL_API_ISSUER_ID"
+  }
+
+  public var environment: [String: String] {
+    [
+      "SH_XCRUN_ALTOOL_API_KEY_ID": keyID,
+      "SH_XCRUN_ALTOOL_API_ISSUER_ID": issuerID,
+    ]
+  }
+}

Sources/ShXcrun/Altool/Credential/EnvironmentVariablePasswordCredential.swift

@@ -0,0 +1,14 @@
+public struct EnvironmentVariablePasswordCredential: AltoolCredential {
+
+  let username: String
+  let environmentVariable: String
+
+  public init(username: String, environmentVariable: String) {
+    self.username = username
+    self.environmentVariable = environmentVariable
+  }
+
+  public var serialized: String {
+    "-u \(username) -p @env:\(environmentVariable)"
+  }
+}

Sources/ShXcrun/Altool/Credential/AltoolCredential.password(username,keychain).swift → Sources/ShXcrun/Altool/Credential/KeychainPasswordCredential.swift

@@ -1,14 +1,13 @@
-extension AltoolCredential where Self == KeychainPasswordCredential {
-  public static func password(username: String? = nil, keychain: String) -> Self {
-    Self(username: username, keychain: keychain)
-  }
-}
-
 public struct KeychainPasswordCredential: AltoolCredential {
 
   let username: String?
   let keychain: String
 
+  public init(username: String?, keychain: String) {
+    self.username = username
+    self.keychain = keychain
+  }
+
   public var serialized: String {
     "\(usernameIfPresent) -p @keychain:\(keychain)"
   }

Sources/ShXcrun/Altool/Credential/AltoolCredential.password(username,password).swift → Sources/ShXcrun/Altool/Credential/LiteralPasswordCredential.swift

@@ -1,14 +1,13 @@
-extension AltoolCredential where Self == LiteralPasswordCredential {
-  public static func password(username: String, password: String) -> Self {
-    Self(username: username, password: password)
-  }
-}
-
 public struct LiteralPasswordCredential: AltoolCredential {
 
   let username: String
   let password: String
 
+  public init(username: String, password: String) {
+    self.username = username
+    self.password = password
+  }
+
   public var serialized: String {
     "-u \(username) -p @env:SH_XCRUN_ALTOOL_PASSWORD"
   }