Update SwiftShell to support xcode 12

This commit is contained in:
Franco Meloni 2020-09-17 00:01:47 +01:00
parent a3aab25f93
commit 35b8c37450
6 changed files with 17 additions and 42 deletions

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:">
</FileRef>
</Workspace>

View File

@ -1,32 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>Rocket.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>RocketLib</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>RocketTests</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>rocket</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>

View File

@ -8,6 +8,20 @@ matrix:
- swift build --disable-sandbox -c release
- ./.build/release/rocket 1.0.0 --rocket-file .test.yml
- os: osx
osx_image: xcode12
script:
- swift test
- swift build --disable-sandbox -c release
- ./.build/release/rocket 1.0.0 --rocket-file .test.yml
- os: osx
osx_image: xcode12u
script:
- swift test
- swift build --disable-sandbox -c release
- ./.build/release/rocket 1.0.0 --rocket-file .test.yml
- os: linux
language: generic
sudo: required

View File

@ -87,8 +87,8 @@
"repositoryURL": "https://github.com/kareman/SwiftShell",
"state": {
"branch": null,
"revision": "fb7fc2c9ad8811caf324431a508fb79e3fb74f99",
"version": "5.0.1"
"revision": "a6014fe94c3dbff0ad500e8da4f251a5d336530b",
"version": "5.1.0-beta.1"
}
},
{

View File

@ -16,7 +16,7 @@ let package = Package(
// Dependencies declare other packages that this package depends on.
.package(url: "https://github.com/jpsim/Yams", from: "2.0.0"),
.package(url: "https://github.com/shibapm/Logger", from: "0.2.2"),
.package(url: "https://github.com/kareman/SwiftShell", from: "5.0.0"),
.package(url: "https://github.com/kareman/SwiftShell", .exact("5.1.0-beta.1")),
.package(url: "https://github.com/shibapm/PackageConfig.git", from: "0.10.0"),
// Dev Dependencies for testing.setup
.package(url: "https://github.com/Quick/Nimble", from: "8.0.0"), // dev