Merge 9ac8a3f into 2a86ded

evandcoleman · Jan 25, 2022 · b3a8694 · b3a8694
2 parents 2a86ded + 9ac8a3f
commit b3a8694
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/Sources/ScipioKit/Helpers/Xcodebuild.swift b/Sources/ScipioKit/Helpers/Xcodebuild.swift
@@ -124,7 +124,7 @@ public extension Xcodebuild {
         case createXCFramework
     }
 
-    enum SDK: String {
+    enum SDK: String, CaseIterable {
         case iphoneos
         case iphonesimulator
         case macos

diff --git a/Sources/ScipioKit/Models/Architecture.swift b/Sources/ScipioKit/Models/Architecture.swift
@@ -2,18 +2,19 @@ import Foundation
 
 public enum Architecture: String, CaseIterable, CustomStringConvertible {
     case armv7
-    case i386
     case x86_64
     case arm64
 
     public var description: String { rawValue }
 
-    public var sdk: Xcodebuild.SDK {
+    public var possibleSDKs: [Xcodebuild.SDK] {
         switch self {
-        case .armv7, .arm64:
-            return .iphoneos
-        case .x86_64, .i386:
-            return .iphonesimulator
+        case .armv7:
+            return [.iphoneos]
+        case .x86_64:
+            return [.iphonesimulator]
+        case .arm64:
+            return [.iphoneos, .iphonesimulator]
         }
     }
 }
@@ -24,13 +25,14 @@ public extension Xcodebuild.SDK {
         case .iphoneos:
             return [.armv7, .arm64]
         case .iphonesimulator, .macos:
-            return [.x86_64, .i386]
+            return [.x86_64, .arm64]
         }
     }
 }
 
 extension Collection where Iterator.Element == Architecture {
     public var sdkArchitectures: [Xcodebuild.SDK: [Architecture]] {
-        return reduce(into: [:]) { $0[$1.sdk, default: []].append($1) }
+        return Set(flatMap(\.possibleSDKs))
+            .reduce(into: [:]) { $0[$1] = $1.architectures }
     }
 }
diff --git a/Tests/ScipioTests/ArchitectureTests.swift b/Tests/ScipioTests/ArchitectureTests.swift
@@ -2,12 +2,12 @@
 import XCTest
 
 final class ArchitectureTests: XCTestCase {
-    func sdkArchitectures() throws {
+    func testSdkArchitectures() throws {
         let architectures = Architecture.allCases
 
         XCTAssertEqual(architectures.sdkArchitectures, [
-            .iphoneos: [.arm64, .armv7],
-            .iphonesimulator: [.i386, .x86_64],
+            .iphonesimulator: [.x86_64, .arm64],
+            .iphoneos: [.armv7, .arm64],
         ])
     }
 }