Merge pull request #36 from shibapm/remove_deprecated_string_index_init

Remove deprecated string index init
This commit is contained in:
Franco Meloni 2019-12-20 19:44:36 +00:00 committed by GitHub
commit d708a72925
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 25 deletions

View File

@ -1 +1 @@
4.2
5.0

View File

@ -2,18 +2,20 @@ language: generic
matrix:
include:
- os: osx
osx_image: xcode10
osx_image: xcode10.2
script:
- swift test
- ./.build/x86_64-apple-macosx10.10/debug/rocket 1.0.0 --rocket-file .test.yml
- swift build --disable-sandbox -c release
- ./.build/release/rocket 1.0.0 --rocket-file .test.yml
- os: linux
language: generic
sudo: required
dist: trusty
install:
- eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
- swiftenv global 4.2
- swiftenv global 5.0
script:
- swift test
- ./.build/x86_64-unknown-linux/debug/rocket 1.0.0 --rocket-file .test.yml
- swift build --disable-sandbox -c release
- ./.build/release/rocket 1.0.0 --rocket-file .test.yml

View File

@ -1,6 +1,24 @@
{
"object": {
"pins": [
{
"package": "CwlCatchException",
"repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git",
"state": {
"branch": null,
"revision": "7cd2f8cacc4d22f21bc0b2309c3b18acf7957b66",
"version": "1.2.0"
}
},
{
"package": "CwlPreconditionTesting",
"repositoryURL": "https://github.com/mattgallagher/CwlPreconditionTesting.git",
"state": {
"branch": null,
"revision": "c228db5d2ad1b01ebc84435e823e6cca4e3db98b",
"version": "1.2.0"
}
},
{
"package": "Komondor",
"repositoryURL": "https://github.com/shibapm/Komondor.git",
@ -24,8 +42,8 @@
"repositoryURL": "https://github.com/Quick/Nimble",
"state": {
"branch": null,
"revision": "e9d769113660769a4d9dd3afb855562c0b7ae7b0",
"version": "7.3.4"
"revision": "6abeb3f5c03beba2b9e4dbe20886e773b5b629b6",
"version": "8.0.4"
}
},
{
@ -33,8 +51,8 @@
"repositoryURL": "https://github.com/shibapm/PackageConfig.git",
"state": {
"branch": null,
"revision": "912c12f0eb33577124e7bf16e51830ae0af49962",
"version": "0.10.0"
"revision": "fd0829aac9851434b3d2db0890e27bc489fc973a",
"version": "0.12.2"
}
},
{
@ -42,8 +60,8 @@
"repositoryURL": "https://github.com/Quick/Quick",
"state": {
"branch": null,
"revision": "f2b5a06440ea87eba1a167cab37bf6496646c52e",
"version": "1.3.4"
"revision": "33682c2f6230c60614861dfc61df267e11a1602f",
"version": "2.2.0"
}
},
{
@ -51,8 +69,8 @@
"repositoryURL": "https://github.com/JohnSundell/ShellOut.git",
"state": {
"branch": null,
"revision": "d3d54ce662dfee7fef619330b71d251b8d4869f9",
"version": "2.2.0"
"revision": "4ebf25863deb9c3c02696704fc3d39736183f258",
"version": "2.2.1"
}
},
{
@ -60,8 +78,8 @@
"repositoryURL": "https://github.com/nicklockwood/SwiftFormat.git",
"state": {
"branch": null,
"revision": "ef65f79ccdc80216624bd2f609cb037a098ca1bb",
"version": "0.40.9"
"revision": "b564570c139d1c36292e8a5bb08d4ba6818b0a91",
"version": "0.43.0"
}
},
{
@ -69,8 +87,8 @@
"repositoryURL": "https://github.com/kareman/SwiftShell",
"state": {
"branch": null,
"revision": "beebe43c986d89ea5359ac3adcb42dac94e5e08a",
"version": "4.1.2"
"revision": "fb7fc2c9ad8811caf324431a508fb79e3fb74f99",
"version": "5.0.1"
}
},
{
@ -78,8 +96,8 @@
"repositoryURL": "https://github.com/f-meloni/TestSpy",
"state": {
"branch": null,
"revision": "e0f1e9d4d10080762bb3b5256a94f347e74416f0",
"version": "0.3.1"
"revision": "e2970747d5d2d280367b446cbd8d1f8c154333b4",
"version": "0.4.1"
}
},
{

View File

@ -1,4 +1,4 @@
// swift-tools-version:4.2
// swift-tools-version:5.0
// The swift-tools-version declares the minimum version of Swift required to build this package.
import PackageDescription
@ -16,10 +16,10 @@ 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: "4.1.0"),
.package(url: "https://github.com/kareman/SwiftShell", from: "5.0.0"),
.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: "7.3.1"), // dev
.package(url: "https://github.com/Quick/Nimble", from: "8.0.0"), // dev
.package(url: "https://github.com/f-meloni/TestSpy", from: "0.3.1"), // dev
.package(url: "https://github.com/shibapm/Komondor.git", from: "1.0.0"), // dev
.package(url: "https://github.com/nicklockwood/SwiftFormat.git", from: "0.35.8"), // dev

View File

@ -46,8 +46,7 @@ struct DevDependenciesModifier: DevDependenciesModifing {
}
private func unhideDependencyOnLine(_ line: String) -> String {
let devDependencyStartIndex = String.Index(encodedOffset: 2)
return String(line[devDependencyStartIndex ..< line.endIndex])
return String(line[String.Index(utf16Offset: 2, in: line) ..< line.endIndex])
}
private func isDevDependencyLine(line: String) -> Bool {