Skip to content

Commit 9dd0d7c

Browse files
authored
Merge pull request #101 from travisbrown/topic/fix-dotty-classpath
Fix Dotty classpath
2 parents 83addd8 + fdb191b commit 9dd0d7c

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name := "compiler-benchmark"
33
version := "1.0-SNAPSHOT"
44

55
def scala212 = "2.12.8"
6-
def dottyLatest = "0.21.0-RC1"
6+
def dottyLatest = "0.22.0-RC1"
77
scalaVersion in ThisBuild := scala212
88
val JmhConfig = config("jmh")
99

compilation/src/main/dotc/scala/tools/benchmark/BenchmarkDriver.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ trait BenchmarkDriver extends BaseBenchmarkDriver {
99
implicit val ctx = new ContextBase().initialCtx.fresh
1010
ctx.setSetting(ctx.settings.usejavacp, true)
1111
if (depsClasspath != null) {
12-
ctx.setSetting(ctx.settings.classpath,
13-
depsClasspath.mkString(File.pathSeparator))
12+
ctx.setSetting(ctx.settings.classpath, depsClasspath)
1413
}
1514
ctx.setSetting(ctx.settings.migration, false)
1615
ctx.setSetting(ctx.settings.outputDir, dotty.tools.io.AbstractFile.getDirectory(tempDir.getAbsolutePath))

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ logLevel := Level.Warn
55
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.7")
66

77
// sbt-dotty plugin - to support `scalaVersion := "0.x"`
8-
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.3.4")
8+
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.0")

0 commit comments

Comments
 (0)