From a36842a0b6bb24f1af9f3d52fd6e5bc0d44bbc80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Bulej?= Date: Sun, 26 May 2024 17:18:54 +0200 Subject: [PATCH] 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. --- .../main/scala/org/renaissance/scala/stm/Philosophers.scala | 2 +- .../scala/org/renaissance/scala/stm/ScalaStmBench7.scala | 2 +- build.sbt | 6 +++++- 3 files changed, 7 insertions(+), 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 index aacb5e45..e49d096f 100644 --- 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 index bb8fdb5e..6bd5274a 100644 --- 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 index ac183ea6..b24893d0 100644 --- 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(