luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into java9rtexport

This commit is contained in:
eugene yokota 2020-09-20 13:34:58 -04:00 committed by GitHub
parent 19da0b75e9 78c04dae19
commit 3ac3f8479c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -7,7 +7,7 @@ scala: 2.10.7
env:
global:
- SBT_VER=1.3.10
- SBT_VER=1.3.13
- TRAVIS_JDK=adopt@1.8.0-222
- JABBA_HOME=$HOME/.jabba
- TRAVIS_JDK11=openjdk@1.11.0

12
build.sbt
View File

@ -263,12 +263,12 @@ lazy val integrationTest = (project in file("integration-test"))
)
def downloadUrlForVersion(v: String) = (v split "[^\\d]" flatMap (i => catching(classOf[Exception]) opt (i.toInt))) match {
case Array(0, 11, 3, _*) => "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.11.3-2/sbt-launch.jar"
case Array(0, 11, x, _*) if x >= 3 => "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/"+v+"/sbt-launch.jar"
case Array(0, y, _*) if y >= 12 => "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/"+v+"/sbt-launch.jar"
case Array(1, _, _*) if v contains ("-20") => "http://repo.scala-sbt.org/scalasbt/maven-snapshots/org/scala-sbt/sbt-launch/"+v+"/sbt-launch.jar"
case Array(1, _, _*) => "http://repo.scala-sbt.org/scalasbt/maven-releases/org/scala-sbt/sbt-launch/"+v+"/sbt-launch.jar"
case _ => "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-tools.sbt/sbt-launch/"+v+"/sbt-launch.jar"
case Array(0, 11, 3, _*) => "https://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.11.3-2/sbt-launch.jar"
case Array(0, 11, x, _*) if x >= 3 => "https://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/"+v+"/sbt-launch.jar"
case Array(0, y, _*) if y >= 12 => "https://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/"+v+"/sbt-launch.jar"
case Array(1, _, _*) if v contains ("-20") => "https://repo.scala-sbt.org/scalasbt/maven-snapshots/org/scala-sbt/sbt-launch/"+v+"/sbt-launch.jar"
case Array(1, _, _*) => "https://repo.scala-sbt.org/scalasbt/maven-releases/org/scala-sbt/sbt-launch/"+v+"/sbt-launch.jar"
case _ => "https://repo.typesafe.com/typesafe/ivy-releases/org.scala-tools.sbt/sbt-launch/"+v+"/sbt-launch.jar"
}
def makePublishToForConfig(config: Configuration) = {

4
integration-test/src/test/scala/RunnerTest.scala
View File

@ -69,8 +69,8 @@ object SbtRunnerTest extends SimpleTestSuite with PowerAssertions {
}
test("sbt --sbt-version") {
val out = sbtProcess("--sbt-version", "1.3.0", "compile", "-v").!!.linesIterator.toList
assert(out.contains[String]("-Dsbt.version=1.3.0"))
val out = sbtProcess("--sbt-version", "1.3.13", "compile", "-v").!!.linesIterator.toList
assert(out.contains[String]("-Dsbt.version=1.3.13"))
()
}