From 32b040541fbab443fa796d56a98fd4dd30781ce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20K=C3=B6tte?= Date: Sun, 17 Apr 2022 18:17:19 -0700 Subject: [PATCH] Fix error with Swift 5.6 arguments --- .../SwiftDependencyUpdaterLibrary/PackageDescription.swift | 2 +- Sources/SwiftDependencyUpdaterLibrary/ResolvedPackage.swift | 2 +- Sources/SwiftDependencyUpdaterLibrary/Update.swift | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Sources/SwiftDependencyUpdaterLibrary/PackageDescription.swift b/Sources/SwiftDependencyUpdaterLibrary/PackageDescription.swift index d3cfb81..4d3235c 100644 --- a/Sources/SwiftDependencyUpdaterLibrary/PackageDescription.swift +++ b/Sources/SwiftDependencyUpdaterLibrary/PackageDescription.swift @@ -175,7 +175,7 @@ enum PackageDescriptionFactory { private static func readPackageDescription(from folder: URL) throws -> String { do { - let output = try shellOut(to: "swift", arguments: ["package", "dump-package", "--package-path", "\"\(folder.path)\"" ]) + let output = try shellOut(to: "swift", arguments: ["package", "--package-path", "\"\(folder.path)\"", "dump-package" ]) return output } catch { let error = error as! ShellOutError // swiftlint:disable:this force_cast diff --git a/Sources/SwiftDependencyUpdaterLibrary/ResolvedPackage.swift b/Sources/SwiftDependencyUpdaterLibrary/ResolvedPackage.swift index b5dca93..9ee9ebd 100644 --- a/Sources/SwiftDependencyUpdaterLibrary/ResolvedPackage.swift +++ b/Sources/SwiftDependencyUpdaterLibrary/ResolvedPackage.swift @@ -65,7 +65,7 @@ struct ResolvedPackage: Decodable { static func resolveAndLoadResolvedPackage(from folder: URL) throws -> ResolvedPackage { do { - try shellOut(to: "swift", arguments: ["package", "resolve", "--package-path", "\"\(folder.path)\"" ]) + try shellOut(to: "swift", arguments: ["package", "--package-path", "\"\(folder.path)\"", "resolve" ]) } catch { let error = error as! ShellOutError // swiftlint:disable:this force_cast throw ResolvedPackageError.resolvingFailed(error.message) diff --git a/Sources/SwiftDependencyUpdaterLibrary/Update.swift b/Sources/SwiftDependencyUpdaterLibrary/Update.swift index e10faea..3586b1f 100644 --- a/Sources/SwiftDependencyUpdaterLibrary/Update.swift +++ b/Sources/SwiftDependencyUpdaterLibrary/Update.swift @@ -48,15 +48,15 @@ enum Update: Equatable { let packageUpdate = try swiftPackage.performUpdate(self, of: dependency) print("Updated Package.swift".green) if packageUpdate { - try shellOut(to: "swift", arguments: ["package", "update", dependency.name, "--package-path", "\"\(folder.path)\"" ]) + try shellOut(to: "swift", arguments: ["package", "--package-path", "\"\(folder.path)\"", "update", dependency.name ]) print("Resolved to new version".green) } else { - try shellOut(to: "swift", arguments: ["package", "update", "resolve", "--package-path", "\"\(folder.path)\"" ]) + try shellOut(to: "swift", arguments: ["package", "--package-path", "\"\(folder.path)\"", "update", "resolve", ]) print("Resolved Version".green) } case let .withoutChangingRequirements(version): print("Updating \(dependency.name): \(dependency.resolvedVersion.versionNumberOrRevision) -> \(version)".bold) - try shellOut(to: "swift", arguments: ["package", "update", dependency.name, "--package-path", "\"\(folder.path)\"" ]) + try shellOut(to: "swift", arguments: ["package", "--package-path", "\"\(folder.path)\"", "update", dependency.name, ]) print("Resolved to new version".green) default: // Do nothing