Skip to content

Commit 5fa162c

Browse files
committed
2.13 by default, update junit-interface
1 parent f52b852 commit 5fa162c

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

build.sbt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name := "compiler-benchmark"
22

33
version := "1.0-SNAPSHOT"
44

5-
def scala212 = "2.12.15"
5+
def scala213 = "2.13.16"
66
def dottyLatest = "0.25.0"
7-
ThisBuild / scalaVersion := scala212
7+
ThisBuild / scalaVersion := scala213
88
val JmhConfig = config("jmh")
99

1010
commands += Command.command("testAll") { s =>
@@ -14,7 +14,7 @@ commands += Command.command("testAll") { s =>
1414
s"++$dottyLatest" ::
1515
"compilation/test" ::
1616
"hot -psource=re2s -wi 1 -i 1 -f1" ::
17-
s"++$scala212" ::
17+
s"++$scala213" ::
1818
"micro/Jmh/run -w1 -f1" ::
1919
s
2020
}
@@ -57,11 +57,11 @@ lazy val compilation = addJmh(project).settings(
5757
if (isDotty.value) "ch.epfl.lamp" %% "dotty-compiler" % scalaVersion.value
5858
else scalaOrganization.value % "scala-compiler" % scalaVersion.value
5959
},
60-
crossScalaVersions := List(scala212, dottyLatest),
60+
crossScalaVersions := List(scala213, dottyLatest),
6161
Compile / unmanagedSourceDirectories +=
6262
(Compile / sourceDirectory).value / (if (isDotty.value) "dotc" else "scalac"),
6363
Jmh / run / mainClass := Some("scala.bench.ScalacBenchmarkRunner"),
64-
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,
64+
libraryDependencies += "com.github.sbt" % "junit-interface" % "0.13.2" % Test,
6565
Test / testOptions += Tests.Argument(TestFrameworks.JUnit),
6666
Test / test / fork := true, // jmh scoped tasks run with fork := true.
6767
).settings(addJavaOptions).dependsOn(infrastructure)
@@ -70,7 +70,7 @@ lazy val javaCompilation = addJmh(project).settings(
7070
description := "Black box benchmark of the java compiler",
7171
crossPaths := false,
7272
Jmh / run / mainClass := Some("scala.bench.ScalacBenchmarkRunner"),
73-
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,
73+
libraryDependencies += "com.github.sbt" % "junit-interface" % "0.13.2" % Test,
7474
Test / testOptions += Tests.Argument(TestFrameworks.JUnit),
7575
Test / test/ fork := true // jmh scoped tasks run with fork := true.
7676
).settings(addJavaOptions).dependsOn(infrastructure)

0 commit comments

Comments
 (0)