From 9be4b583cfff950bf63d92c602cb50f1f3c6eda5 Mon Sep 17 00:00:00 2001 From: evandcoleman Date: Tue, 30 Nov 2021 15:13:46 -0500 Subject: [PATCH 1/2] fixes for xcode 13 --- .../Dependency Processors/PackageProcessor.swift | 2 +- Sources/ScipioKit/Helpers/Xcodebuild.swift | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Sources/ScipioKit/Dependency Processors/PackageProcessor.swift b/Sources/ScipioKit/Dependency Processors/PackageProcessor.swift index 6219528..e71cd1e 100644 --- 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 index 6900b6c..58604e9 100644 --- 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" + } + } } } From 1449df53d0658fda9ddf70b1b05cd99f5fbbc907 Mon Sep 17 00:00:00 2001 From: evandcoleman Date: Tue, 30 Nov 2021 15:14:01 -0500 Subject: [PATCH 2/2] version bump --- Sources/Scipio/main.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/Scipio/main.swift b/Sources/Scipio/main.swift index d77cd90..927a8a1 100644 --- 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,