Commit a846230a authored by Drew's avatar Drew

Update for swift-DEVELOPMENT-SNAPSHOT-2016-05-03-a

Note that this relies on https://github.com/AnarchyTools/atfoundation/pull/7,
which is not yet merged
parent b4202273
Pipeline #1810 passed with stage
......@@ -7,7 +7,7 @@ linux:
- apt-get update
- apt-get install --no-install-recommends xz-utils curl ca-certificates git -y
- git submodule init && git submodule update
- curl -L https://github.com/AnarchyTools/atbuild/releases/download/0.9.0/atbuild-0.9.0-linux.tar.xz | tar xJ -C /usr/local
- curl -L https://github.com/AnarchyTools/atbuild/releases/download/0.10.0/atbuild-0.10.0-linux.tar.xz | tar xJ && cp atbuild-*/atbuild /usr/local/bin/atbuild
- atbuild check
tags:
- autoscale-linux
......
Subproject commit 427eb70384e11a7e26b5396a51d7346197a1145c
Subproject commit a8bd369a2a16331ed8c060fbaea9b6b51dbee154
......@@ -28,7 +28,7 @@ final public class ExternalDependency {
public var name: String {
if let lastComponent = gitURL.path.components.last {
if lastComponent.hasSuffix(".git") {
return lastComponent.subString(toIndex: lastComponent.endIndex.advanced(by: -4))
return lastComponent.subString(toIndex: lastComponent.index(lastComponent.endIndex, offsetBy: -4))
}
return lastComponent
} else {
......
......@@ -9,7 +9,7 @@ private func evaluateSubstitution(substitution: String, package: Package) -> Str
//"prefix-like" substitions here
//collect sources substition
if substitution.hasPrefix("collect_sources:") {
let taskName = String(substitution.characters[substitution.characters.startIndex.advanced(by: 16)..<substitution.characters.endIndex])
let taskName = String(substitution.characters[substitution.characters.index(substitution.characters.startIndex, offsetBy: 16)..<substitution.characters.endIndex])
guard let task = package.tasks[taskName] else {
fatalError("Cannot find task named \(taskName) for substition.")
}
......
......@@ -58,7 +58,7 @@ final public class Scanner {
}
else {
current = ScannerInfo(character: content[index], line: line, column: column)
index = index.successor()
index = content.index(after: index)
if current?.character == "\n" {
line += 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment