Skip to content

Commit 0039010

Browse files
committed
remove dotty support
the old sbt-dotty plugin breaks compilation with recent 2.13
1 parent 5fa162c commit 0039010

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

build.sbt

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,13 @@ name := "compiler-benchmark"
33
version := "1.0-SNAPSHOT"
44

55
def scala213 = "2.13.16"
6-
def dottyLatest = "0.25.0"
76
ThisBuild / scalaVersion := scala213
87
val JmhConfig = config("jmh")
98

109
commands += Command.command("testAll") { s =>
1110
"Test/compile" ::
1211
"compilation/test" ::
1312
"hot -psource=scalap -wi 1 -i 1 -f1" ::
14-
s"++$dottyLatest" ::
15-
"compilation/test" ::
16-
"hot -psource=re2s -wi 1 -i 1 -f1" ::
17-
s"++$scala213" ::
1813
"micro/Jmh/run -w1 -f1" ::
1914
s
2015
}
@@ -53,13 +48,10 @@ lazy val compilation = addJmh(project).settings(
5348
// We should be able to switch this project to a broad range of Scala versions for comparative
5449
// benchmarking. As such, this project should only depend on the high level `MainClass` compiler API.
5550
description := "Black box benchmark of the compiler",
56-
libraryDependencies += {
57-
if (isDotty.value) "ch.epfl.lamp" %% "dotty-compiler" % scalaVersion.value
58-
else scalaOrganization.value % "scala-compiler" % scalaVersion.value
59-
},
60-
crossScalaVersions := List(scala213, dottyLatest),
51+
libraryDependencies += scalaOrganization.value % "scala-compiler" % scalaVersion.value,
52+
crossScalaVersions := List(scala213),
6153
Compile / unmanagedSourceDirectories +=
62-
(Compile / sourceDirectory).value / (if (isDotty.value) "dotc" else "scalac"),
54+
(Compile / sourceDirectory).value / "scalac",
6355
Jmh / run / mainClass := Some("scala.bench.ScalacBenchmarkRunner"),
6456
libraryDependencies += "com.github.sbt" % "junit-interface" % "0.13.2" % Test,
6557
Test / testOptions += Tests.Argument(TestFrameworks.JUnit),

project/plugins.sbt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,3 @@ logLevel := Level.Warn
33

44
// sbt-jmh plugin - pulls in JMH dependencies too
55
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
6-
7-
// sbt-dotty plugin - to support `scalaVersion := "0.x"`
8-
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.2")

0 commit comments

Comments
 (0)