Merge 1449df5 into 0fc739b

evandcoleman · Nov 30, 2021 · f94f758 · f94f758
2 parents 0fc739b + 1449df5
commit f94f758
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/Sources/Scipio/main.swift b/Sources/Scipio/main.swift
@@ -10,7 +10,7 @@ extension Command {
       .init(
         commandName: "Scipio",
         abstract: "A program to pre-build and cache Swift packages",
-        version: "0.2.3",
+        version: "0.2.4",
         subcommands: [
             Command.Run.self,
             Command.Build.self,

diff --git a/Sources/ScipioKit/Dependency Processors/PackageProcessor.swift b/Sources/ScipioKit/Dependency Processors/PackageProcessor.swift
@@ -557,7 +557,7 @@ extension WorkspaceState {
             let identity: String
             let kind: Kind
             let name: String
-            let path: String
+            let path: String?
         }
 
         enum Kind: String, Codable {

diff --git a/Sources/ScipioKit/Helpers/Xcodebuild.swift b/Sources/ScipioKit/Helpers/Xcodebuild.swift
@@ -100,8 +100,8 @@ public struct Xcodebuild {
         if let clonedSourcePackageDirectory = clonedSourcePackageDirectory {
             args.append(contentsOf: ["-clonedSourcePackagesDirPath", clonedSourcePackageDirectory])
         }
-        if let sdk = sdk {
-            args.append(contentsOf: ["-sdk", sdk.rawValue])
+        if let destination = sdk?.destination {
+            args.append(contentsOf: ["-destination", destination])
         }
         if useSystemSourceControlManagement, command != .createXCFramework {
             args.append(contentsOf: ["-scmProvider", "system"])
@@ -128,5 +128,16 @@ public extension Xcodebuild {
         case iphoneos
         case iphonesimulator
         case macos
+
+        var destination: String {
+            switch self {
+            case .iphoneos:
+                return "generic/platform=iOS"
+            case .iphonesimulator:
+                return "generic/platform=iOS Simulator"
+            case .macos:
+                return "generic/platform=macOS"
+            }
+        }
     }
 }