Skip to content

Commit 8ff935d

Browse files
committed
Update SwiftPM Dependency
1 parent f86bbb5 commit 8ff935d

File tree

6 files changed

+62
-6
lines changed

6 files changed

+62
-6
lines changed

.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>SchemeUserState</key>
6+
<dict>
7+
<key>LiteSupport-Package.xcscheme_^#shared#^_</key>
8+
<dict>
9+
<key>orderHint</key>
10+
<integer>0</integer>
11+
</dict>
12+
<key>LiteSupport.xcscheme_^#shared#^_</key>
13+
<dict>
14+
<key>orderHint</key>
15+
<integer>1</integer>
16+
</dict>
17+
<key>lite-test.xcscheme_^#shared#^_</key>
18+
<dict>
19+
<key>orderHint</key>
20+
<integer>2</integer>
21+
</dict>
22+
</dict>
23+
<key>SuppressBuildableAutocreation</key>
24+
<dict>
25+
<key>LiteSupport</key>
26+
<dict>
27+
<key>primary</key>
28+
<true/>
29+
</dict>
30+
<key>LiteTests</key>
31+
<dict>
32+
<key>primary</key>
33+
<true/>
34+
</dict>
35+
<key>lite-test</key>
36+
<dict>
37+
<key>primary</key>
38+
<true/>
39+
</dict>
40+
</dict>
41+
</dict>
42+
</plist>

Package.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:4.0
1+
// swift-tools-version:5.0
22

33
import PackageDescription
44

@@ -10,13 +10,13 @@ let package = Package(
1010
targets: ["LiteSupport"]),
1111
],
1212
dependencies: [
13-
.package(url: "https://github.com/onevcat/Rainbow.git", from: "3.0.0"),
14-
.package(url: "https://github.com/apple/swift-package-manager.git", from: "0.1.0"),
13+
.package(url: "https://github.com/onevcat/Rainbow.git", from: "3.1.5"),
14+
.package(url: "https://github.com/apple/swift-package-manager.git", from: "0.4.0"),
1515
],
1616
targets: [
1717
.target(
1818
name: "LiteSupport",
19-
dependencies: ["Rainbow", "Utility"]),
19+
dependencies: ["Rainbow", "SPMUtility"]),
2020

2121
// This needs to be named `lite-test` instead of `lite` because consumers
2222
// of `lite` should use the target name `lite`.

Sources/LiteSupport/TestRunner.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import Foundation
99
import Rainbow
1010
import Basic
11-
import Utility
1211
import POSIX
1312
import Dispatch
1413

@@ -254,7 +253,7 @@ class TestRunner {
254253
do {
255254
let args = ["/bin/bash", "-c", bash]
256255
let result = try Process.popen(arguments: args)
257-
stdout = try result.utf8Output().chomp()
256+
stdout = try result.utf8Output().trimmingCharacters(in: .whitespacesAndNewlines)
258257
stderr = ""
259258
switch result.exitStatus {
260259
case let .terminated(code: code):

0 commit comments

Comments
 (0)