From cfc8ca7d67547bd90dba623f10907ac812d2a07c Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 19 Sep 2020 22:18:49 -0400 Subject: [PATCH 1/2] Use HTTPS --- build.sbt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index 421e5a1a7..98b8e2f6b 100755 --- a/build.sbt +++ b/build.sbt @@ -266,19 +266,19 @@ lazy val java9rtexport = (project in file("java9-rt-export")) autoScalaLibrary := false, crossPaths := false, description := "Exports the contents of the Java 9. JEP-220 runtime image to a JAR for compatibility with older tools.", - homepage := Some(url("http://github.com/retronym/" + name.value)), + homepage := Some(url("https://github.com/retronym/" + name.value)), startYear := Some(2017), licenses += ("Scala license", url(homepage.value.get.toString + "/blob/master/LICENSE")), mainClass in Compile := Some("io.github.retronym.java9rtexport.Export") ) 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) = { From 2514a25013e37d216be5efdb1b3d677643cb2407 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 20 Sep 2020 13:13:19 -0400 Subject: [PATCH 2/2] Bump 1.3 version used for testing --- .travis.yml | 2 +- integration-test/src/test/scala/RunnerTest.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 884261bad..f66d9e45c 100755 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/integration-test/src/test/scala/RunnerTest.scala b/integration-test/src/test/scala/RunnerTest.scala index f94c26e76..ff340e751 100755 --- a/integration-test/src/test/scala/RunnerTest.scala +++ b/integration-test/src/test/scala/RunnerTest.scala @@ -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")) () }