Merge pull request scala#100 from retronym/bump/sbt

Bump SBT and sbt-dotty versions
retronym · Jan 21, 2020 · 83addd8 · 83addd8
2 parents c768aa2 + 0ad63a5
commit 83addd8
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,6 @@
+sudo: false
+dist: trusty
+
 language: scala
 
 env:

diff --git a/build.sbt b/build.sbt
@@ -3,7 +3,7 @@ name := "compiler-benchmark"
 version := "1.0-SNAPSHOT"
 
 def scala212 = "2.12.8"
-def dottyLatest = "0.8.0-RC1"
+def dottyLatest = "0.21.0-RC1"
 scalaVersion in ThisBuild := scala212
 val JmhConfig = config("jmh")
 
@@ -13,7 +13,7 @@ commands += Command.command("testAll") { s =>
     "hot -psource=scalap -wi 1 -i 1 -f1" ::
     s"++$dottyLatest" ::
     "compilation/test" ::
-    "hot -psource=vector -wi 1 -i 1 -f1" ::
+    "hot -psource=re2s -wi 1 -i 1 -f1" ::
     s"++$scala212" ::
     "micro/jmh:run -w1 -f1" ::
     s

diff --git a/compilation/src/main/dotc/scala/tools/benchmark/BenchmarkDriver.scala b/compilation/src/main/dotc/scala/tools/benchmark/BenchmarkDriver.scala
@@ -13,8 +13,9 @@ trait BenchmarkDriver extends BaseBenchmarkDriver {
                      depsClasspath.mkString(File.pathSeparator))
     }
     ctx.setSetting(ctx.settings.migration, false)
-    ctx.setSetting(ctx.settings.outputDir, tempDir.getAbsolutePath)
+    ctx.setSetting(ctx.settings.outputDir, dotty.tools.io.AbstractFile.getDirectory(tempDir.getAbsolutePath))
     ctx.setSetting(ctx.settings.language, List("Scala2"))
+    ctx.setSetting(ctx.settings.YdropComments, true)
     val compiler = new dotty.tools.dotc.Compiler
     val reporter = dotty.tools.dotc.Bench.doCompile(compiler, allArgs)
     assert(!reporter.hasErrors)

diff --git a/compilation/src/main/scala/scala/tools/nsc/BenchmarkUtils.scala b/compilation/src/main/scala/scala/tools/nsc/BenchmarkUtils.scala
@@ -9,6 +9,7 @@ import java.util.stream.Collectors
 import com.typesafe.config.ConfigFactory
 
 import scala.collection.JavaConverters._
+import scala.collection.mutable.ListBuffer
 import scala.io.Source
 import scala.io.Codec
 
@@ -86,7 +87,7 @@ object BenchmarkUtils {
   def initDeps(corpusSourcePath: Path): Seq[Path] = {
     val depsDir = Paths.get(ConfigFactory.load.getString("deps.localdir"))
     val depsFile = corpusSourcePath.resolve("deps.txt")
-    val depsClasspath = Seq.newBuilder[Path]
+    val depsClasspath = new ListBuffer[Path]
     if (Files.exists(depsFile)) {
       for (depUrlString <- Files.lines(depsFile).iterator().asScala) {
         val depUrl = new URL(depUrlString)

diff --git a/compilation/src/test/scala/scala/tools/benchmark/BenchmarkTest.scala b/compilation/src/test/scala/scala/tools/benchmark/BenchmarkTest.scala
@@ -6,7 +6,7 @@ import org.junit.Test
 class BenchmarkTest {
   @Test def compilesOK() = {
     val bench = new ScalacBenchmark
-    bench.source = "../corpus/vector"
+    bench.source = "../corpus/re2s"
     bench.corpusVersion = "latest"
     bench.initTemp()
     bench.compileImpl()

diff --git a/corpus/re2s/a311ea0/java/util/regex/Parser.scala b/corpus/re2s/a311ea0/java/util/regex/Parser.scala
@@ -733,7 +733,7 @@ class Parser(wholeRegexp: String, _flags: Int) {
         case '*' | '+' | '?' =>
           repeatPos = t.pos()
           val op: Int =
-            t.pop match {
+            t.pop() match {
               case '*' => ROP.STAR
               case '+' => ROP.PLUS
               case '?' => ROP.QUEST

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1,2 @@
-sbt.version=1.1.5
+sbt.version=1.3.7
+
diff --git a/project/build.sbt b/project/build.sbt
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -5,4 +5,4 @@ logLevel := Level.Warn
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.7")
 
 // sbt-dotty plugin - to support `scalaVersion := "0.x"`
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.2.2")
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.3.4")