Migrate scala-stm benchmarks to Scala 3

Also updates the order of annotations to avoid changing the benchmark primary group when compiled with Scala 3.
renaissance-benchmarks · Jun 7, 2024 · a36842a · a36842a
1 parent 6030937
commit a36842a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/benchmarks/scala-stm/src/main/scala/org/renaissance/scala/stm/Philosophers.scala b/benchmarks/scala-stm/src/main/scala/org/renaissance/scala/stm/Philosophers.scala
@@ -8,8 +8,8 @@ import org.renaissance.BenchmarkResult.Validators
 import org.renaissance.License
 
 @Name("philosophers")
-@Group("scala")
 @Group("scala-stm")
+@Group("scala") // With Scala 3, the primary group goes last.
 @Summary("Solves a variant of the dining philosophers problem using ScalaSTM.")
 @Licenses(Array(License.BSD3))
 @Repetitions(30)

diff --git a/benchmarks/scala-stm/src/main/scala/org/renaissance/scala/stm/ScalaStmBench7.scala b/benchmarks/scala-stm/src/main/scala/org/renaissance/scala/stm/ScalaStmBench7.scala
@@ -8,8 +8,8 @@ import org.renaissance.BenchmarkResult.Validators
 import org.renaissance.License
 
 @Name("scala-stm-bench7")
-@Group("scala")
 @Group("scala-stm")
+@Group("scala") // With Scala 3, the primary group goes last.
 @Summary("Runs the stmbench7 benchmark using ScalaSTM.")
 @Licenses(Array(License.BSD3, License.GPL2))
 @Repetitions(60)

diff --git a/build.sbt b/build.sbt
@@ -450,9 +450,13 @@ lazy val scalaStdlibBenchmarks = (project in file("benchmarks/scala-stdlib"))
 lazy val scalaStmBenchmarks = (project in file("benchmarks/scala-stm"))
   .settings(
     name := "scala-stm",
-    commonSettingsScala212,
+    commonSettingsScala3,
     libraryDependencies := Seq(
       "org.scala-stm" %% "scala-stm" % "0.11.1"
+    ),
+    dependencyOverrides ++= Seq(
+      // Force common version of Scala 3 library.
+      "org.scala-lang" %% "scala3-library" % scalaVersion3
     )
   )
   .dependsOn(