From 9d13deae2ef38892f4e474d7c55805777edc6306 Mon Sep 17 00:00:00 2001 From: Guang1234567 Date: Wed, 18 Aug 2021 16:45:55 +0800 Subject: [PATCH] update `SPM` version to `0.6.0` --- Package.swift | 5 +++-- Sources/LiteSupport/TestRunner.swift | 33 ++-------------------------- 2 files changed, 5 insertions(+), 33 deletions(-) diff --git a/Package.swift b/Package.swift index b9fce57..640a1ad 100644 --- a/Package.swift +++ b/Package.swift @@ -11,12 +11,13 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/onevcat/Rainbow.git", from: "3.1.5"), - .package(url: "https://github.com/apple/swift-package-manager.git", from: "0.4.0"), + .package(url: "https://github.com/apple/swift-package-manager.git", from: "0.6.0"), + .package(url: "https://github.com/apple/swift-tools-support-core.git", .exact("0.1.0")) ], targets: [ .target( name: "LiteSupport", - dependencies: ["Rainbow", "SPMUtility"]), + dependencies: ["Rainbow", .product(name: "SwiftToolsSupport", package: "swift-tools-support-core")]), // This needs to be named `lite-test` instead of `lite` because consumers // of `lite` should use the target name `lite`. diff --git a/Sources/LiteSupport/TestRunner.swift b/Sources/LiteSupport/TestRunner.swift index c740be4..e785e71 100644 --- a/Sources/LiteSupport/TestRunner.swift +++ b/Sources/LiteSupport/TestRunner.swift @@ -7,8 +7,7 @@ import Foundation import Rainbow -import Basic -import POSIX +import TSCBasic import Dispatch /// Specifies how to parallelize test runs. @@ -265,7 +264,7 @@ class TestRunner { stderr = error.description stdout = "" exitCode = Int(error.exitCode) - } catch let error as Basic.Process.Error { + } catch let error as TSCBasic.Process.Error { stderr = error.description stdout = "" exitCode = Int(EXIT_FAILURE) @@ -291,52 +290,24 @@ extension SystemError { return errno case .close(let errno): return errno - case .dirfd(let errno, _): - return errno case .exec(let errno, _, _): return errno - case .fgetc(let errno): - return errno - case .fread(let errno): - return errno - case .getcwd(let errno): - return errno - case .mkdir(let errno, _): - return errno - case .mkdtemp(let errno): - return errno case .pipe(let errno): return errno case .posix_spawn(let errno, _): return errno - case .popen(let errno, _): - return errno case .read(let errno): return errno - case .readdir(let errno, _): - return errno - case .realpath(let errno, _): - return errno - case .rename(let errno, _, _): - return errno - case .rmdir(let errno, _): - return errno case .setenv(let errno, _): return errno case .stat(let errno, _): return errno case .symlink(let errno, _, _): return errno - case .symlinkat(let errno, _): - return errno - case .unlink(let errno, _): - return errno case .unsetenv(let errno, _): return errno case .waitpid(let errno): return errno - case .usleep(let errno): - return errno } } }