Add support for Scala 3.5

adpi2 · adpi2 · commit ee67304233ab · 2024-05-16T15:54:33.000+02:00
diff --git a/build.sbt b/build.sbt
@@ -69,7 +69,7 @@ lazy val core213 = core.jvm(Dependencies.scala213)
 lazy val core = projectMatrix
   .in(file("modules/core"))
   .jvmPlatform(
-    Seq(Dependencies.scala212, Dependencies.scala213, Dependencies.scala33),
+    Seq(Dependencies.scala212, Dependencies.scala213, Dependencies.scala31Plus),
     Seq.empty,
     p => p.dependsOn(javaDebug)
   )
@@ -92,23 +92,23 @@ lazy val core = projectMatrix
     buildInfoKeys := Seq[BuildInfoKey](
       BuildInfoKey.action("organization")(organization.value),
       BuildInfoKey.action("version")(version.value),
-      BuildInfoKey.action("expressionCompilerName")((LocalProject("expressionCompiler2_12") / name).value),
+      BuildInfoKey.action("expressionCompilerName")((LocalProject("expressionCompiler212") / name).value),
       BuildInfoKey.action("decoderName")((LocalProject("decoder3") / name).value),
       BuildInfoKey.action("scala212")(Dependencies.scala212),
       BuildInfoKey.action("scala213")(Dependencies.scala213),
       BuildInfoKey.action("scala30")(Dependencies.scala30),
-      BuildInfoKey.action("scala33")(Dependencies.scala33),
-      BuildInfoKey.action("scala34")(Dependencies.scala34)
+      BuildInfoKey.action("scala31Plus")(Dependencies.scala31Plus),
+      BuildInfoKey.action("scala34Plus")(Dependencies.scala34Plus)
     ),
     buildInfoPackage := "ch.epfl.scala.debugadapter"
   )
 
 lazy val tests212 = tests.jvm(Dependencies.scala212)
 lazy val tests213 = tests.jvm(Dependencies.scala213)
-lazy val tests3 = tests.jvm(Dependencies.scala33)
+lazy val tests3 = tests.jvm(Dependencies.scala31Plus)
 lazy val tests = projectMatrix
   .in(file("modules/tests"))
-  .jvmPlatform(scalaVersions = Seq(Dependencies.scala212, Dependencies.scala213, Dependencies.scala33))
+  .jvmPlatform(scalaVersions = Seq(Dependencies.scala212, Dependencies.scala213, Dependencies.scala31Plus))
   .settings(
     name := "scala-debug-adapter-test",
     libraryDependencies ++= Seq(
@@ -151,15 +151,15 @@ lazy val sbtPlugin = project
 lazy val expressionCompiler212 = expressionCompiler.finder(scala212Axis)(true)
 lazy val expressionCompiler213 = expressionCompiler.finder(scala213Axis)(true)
 lazy val expressionCompiler30 = expressionCompiler.finder(scala30Axis)(true)
-lazy val expressionCompiler33 = expressionCompiler.finder(scala33Axis)(true)
-lazy val expressionCompiler34 = expressionCompiler.finder(scala34Axis)(true)
+lazy val expressionCompiler33 = expressionCompiler.finder(scala31PlusAxis)(true)
+lazy val expressionCompiler34 = expressionCompiler.finder(scala34PlusAxis)(true)
 lazy val expressionCompiler = projectMatrix
   .in(file("modules/expression-compiler"))
   .customRow(true, Seq(scala212Axis, VirtualAxis.jvm), p => p.dependsOn(tests212 % Test))
   .customRow(true, Seq(scala213Axis, VirtualAxis.jvm), p => p.dependsOn(tests213 % Test))
   .customRow(true, Seq(scala30Axis, VirtualAxis.jvm), p => p)
-  .customRow(true, Seq(scala33Axis, VirtualAxis.jvm), p => p.dependsOn(tests3 % Test))
-  .customRow(true, Seq(scala34Axis, VirtualAxis.jvm), p => p.dependsOn(tests3 % Test))
+  .customRow(true, Seq(scala31PlusAxis, VirtualAxis.jvm), p => p.dependsOn(tests3 % Test))
+  .customRow(true, Seq(scala34PlusAxis, VirtualAxis.jvm), p => p.dependsOn(tests3 % Test))
   .settings(
     name := "scala-expression-compiler",
     crossScalaVersions ++= CrossVersion
@@ -170,7 +170,7 @@ lazy val expressionCompiler = projectMatrix
         case (2, 13) => Seq("2.13.14", "2.13.13", "2.13.12", "2.13.11", "2.13.10", "2.13.9", "2.13.8", "2.13.7", "2.13.6", "2.13.5", "2.13.4")
         case (3, 0) => Seq("3.0.2", "3.0.1", "3.0.0")
         case (3, 1 | 2 | 3) => Seq("3.3.3", "3.3.2", "3.3.1", "3.3.0", "3.2.2", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0")
-        case (3, _) => Seq("3.4.1", "3.4.0")
+        case (3, _) => Seq("3.5.0-RC1", "3.4.2", "3.4.1", "3.4.0")
         // format: on
       }
       .toSeq
@@ -184,8 +184,8 @@ lazy val expressionCompiler = projectMatrix
       val sourceDir = (Compile / sourceDirectory).value
       CrossVersion.partialVersion(scalaVersion.value).collect {
         case (3, 0) => sourceDir / s"scala-3.0"
-        case (3, 1 | 2 | 3) => sourceDir / s"scala-3.3"
-        case (3, 4) => sourceDir / s"scala-3.4"
+        case (3, 1 | 2 | 3) => sourceDir / s"scala-3.1+"
+        case (3, _) => sourceDir / s"scala-3.4+"
       }
     },
     Test / unmanagedSourceDirectories ++= {
@@ -205,7 +205,7 @@ lazy val decoder3: Project = project
   .dependsOn(tests3 % Test)
   .settings(
     name := "scala-debug-decoder",
-    scalaVersion := Dependencies.scala34,
+    scalaVersion := Dependencies.scala34Plus,
     Compile / doc / sources := Seq.empty,
     libraryDependencies ++= Seq(
       "ch.epfl.scala" %% "tasty-query" % "1.3.0",
@@ -223,10 +223,10 @@ lazy val testOptionsSettings = Def.settings(
   Test / testOptions := (Test / testOptions)
     .dependsOn(
       // break cyclic reference
-      LocalProject("expressionCompiler2_12") / publishLocal,
-      LocalProject("expressionCompiler2_13") / publishLocal,
-      LocalProject("expressionCompiler3_3") / publishLocal,
-      LocalProject("expressionCompiler3_4") / publishLocal,
+      LocalProject("expressionCompiler212") / publishLocal,
+      LocalProject("expressionCompiler213") / publishLocal,
+      LocalProject("expressionCompiler31Plus") / publishLocal,
+      LocalProject("expressionCompiler34Plus") / publishLocal,
       LocalProject("decoder3") / publishLocal
     )
     .value
@@ -241,11 +241,11 @@ lazy val scalacOptionsSettings = Def.settings(
 )
 
 // Custom Scala version axis with minor version as suffix
-lazy val scala212Axis = VirtualAxis.ScalaVersionAxis(Dependencies.scala212, "2_12")
-lazy val scala213Axis = VirtualAxis.ScalaVersionAxis(Dependencies.scala213, "2_13")
-lazy val scala30Axis = VirtualAxis.ScalaVersionAxis(Dependencies.scala30, "3_0")
-lazy val scala33Axis = VirtualAxis.ScalaVersionAxis(Dependencies.scala33, "3_3")
-lazy val scala34Axis = VirtualAxis.ScalaVersionAxis(Dependencies.scala34, "3_4")
+lazy val scala212Axis = VirtualAxis.ScalaVersionAxis(Dependencies.scala212, "212")
+lazy val scala213Axis = VirtualAxis.ScalaVersionAxis(Dependencies.scala213, "213")
+lazy val scala30Axis = VirtualAxis.ScalaVersionAxis(Dependencies.scala30, "30")
+lazy val scala31PlusAxis = VirtualAxis.ScalaVersionAxis(Dependencies.scala31Plus, "31Plus")
+lazy val scala34PlusAxis = VirtualAxis.ScalaVersionAxis(Dependencies.scala34Plus, "34Plus")
 
 def onScalaVersion[T](scala212: T, scala213: T, scala3: T) = Def.setting {
   CrossVersion.partialVersion(scalaVersion.value) match {
diff --git a/modules/core/src/main/scala/ch/epfl/scala/debugadapter/ScalaVersion.scala b/modules/core/src/main/scala/ch/epfl/scala/debugadapter/ScalaVersion.scala
@@ -20,6 +20,6 @@ object ScalaVersion {
   val `2.12` = ScalaVersion(BuildInfo.scala212)
   val `2.13` = ScalaVersion(BuildInfo.scala213)
   val `3.0` = ScalaVersion(BuildInfo.scala30)
-  val `3.3` = ScalaVersion(BuildInfo.scala33)
-  val `3.4` = ScalaVersion(BuildInfo.scala34)
+  val `3.1+` = ScalaVersion(BuildInfo.scala31Plus)
+  val `3.4+` = ScalaVersion(BuildInfo.scala34Plus)
 }
diff --git a/modules/core/src/main/scala/ch/epfl/scala/debugadapter/internal/DebugTools.scala b/modules/core/src/main/scala/ch/epfl/scala/debugadapter/internal/DebugTools.scala
@@ -87,7 +87,7 @@ object DebugTools {
         debuggee.libraries
           .find(_.artifactId.startsWith("scala3-library"))
           .map(lib => ScalaVersion(lib.version))
-          .getOrElse(ScalaVersion.`3.3`)
+          .getOrElse(ScalaVersion.`3.1+`)
 
     def resolveCompilerClassLoader(scalaVersion: ScalaVersion): Option[ClassLoader] =
       resolver
diff --git a/modules/decoder/src/test/scala/ch/epfl/scala/debugadapter/internal/stacktrace/BinaryDecoderTests.scala b/modules/decoder/src/test/scala/ch/epfl/scala/debugadapter/internal/stacktrace/BinaryDecoderTests.scala
@@ -5,8 +5,8 @@ import ch.epfl.scala.debugadapter.testfmk.TestingDebuggee
 import scala.util.Properties
 import tastyquery.Exceptions.*
 
-class Scala33BinaryDecoderTests extends BinaryDecoderTests(ScalaVersion.`3.3`)
-class Scala34BinaryDecoderTests extends BinaryDecoderTests(ScalaVersion.`3.4`)
+class Scala31PlusBinaryDecoderTests extends BinaryDecoderTests(ScalaVersion.`3.1+`)
+class Scala34PlusBinaryDecoderTests extends BinaryDecoderTests(ScalaVersion.`3.4+`)
 
 abstract class BinaryDecoderTests(scalaVersion: ScalaVersion) extends BinaryDecoderSuite:
   def isScala33 = scalaVersion.isScala33
diff --git a/modules/expression-compiler/src/main/scala-3.1+/dotty/tools/dotc/ExpressionCompiler.scala b/modules/expression-compiler/src/main/scala-3.1+/dotty/tools/dotc/ExpressionCompiler.scala
diff --git a/modules/expression-compiler/src/main/scala-3.1+/dotty/tools/dotc/ExpressionReporter.scala b/modules/expression-compiler/src/main/scala-3.1+/dotty/tools/dotc/ExpressionReporter.scala
diff --git a/modules/expression-compiler/src/main/scala-3.1+/dotty/tools/dotc/evaluation/SymUtils.scala b/modules/expression-compiler/src/main/scala-3.1+/dotty/tools/dotc/evaluation/SymUtils.scala
diff --git a/modules/expression-compiler/src/main/scala-3.4+/dotty/tools/dotc/ExpressionCompiler.scala b/modules/expression-compiler/src/main/scala-3.4+/dotty/tools/dotc/ExpressionCompiler.scala
diff --git a/modules/expression-compiler/src/main/scala-3.4+/dotty/tools/dotc/ExpressionReporter.scala b/modules/expression-compiler/src/main/scala-3.4+/dotty/tools/dotc/ExpressionReporter.scala
diff --git a/modules/expression-compiler/src/main/scala-3.4+/dotty/tools/dotc/evaluation/SymUtils.scala b/modules/expression-compiler/src/main/scala-3.4+/dotty/tools/dotc/evaluation/SymUtils.scala
diff --git a/modules/expression-compiler/src/test/scala-3.3/ch/epfl/scala/debugadapter/ExpressionCompilerDebug.scala b/modules/expression-compiler/src/test/scala-3.3/ch/epfl/scala/debugadapter/ExpressionCompilerDebug.scala
@@ -13,7 +13,7 @@ import scala.jdk.CollectionConverters.*
  *  It is not meant to be run in the CI
  */
 class ExpressionCompilerDebug extends munit.FunSuite:
-  val scalaVersion = ScalaVersion.`3.3`
+  val scalaVersion = ScalaVersion.`3.1+`
   val compiler = new ExpressionCompilerBridge
 
   override def munitTimeout: Duration = 1.hour
diff --git a/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/HotCodeReplaceTests.scala b/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/HotCodeReplaceTests.scala
@@ -49,7 +49,7 @@ class HotCodeReplaceTests extends DebugTestSuite {
     implicit val debuggee: TestingDebuggee = TestingDebuggee.mainClass(
       Seq("Main.scala" -> `Main.scala`, "A.scala" -> `A.scala`),
       "example.Main",
-      ScalaVersion.`3.3`
+      ScalaVersion.`3.1+`
     )
     check(
       Breakpoint(5),
@@ -99,7 +99,7 @@ class HotCodeReplaceTests extends DebugTestSuite {
     implicit val debuggee: TestingDebuggee = TestingDebuggee.mainClass(
       Seq("Main.scala" -> `Main.scala`, "A.scala" -> `A.scala`),
       "example.Main",
-      ScalaVersion.`3.3`
+      ScalaVersion.`3.1+`
     )
     check(
       Breakpoint(debuggee.getSourceFile("A.scala"), 8, "A.m2: Unit"),
diff --git a/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/LocalVariableTests.scala b/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/LocalVariableTests.scala
@@ -4,7 +4,7 @@ import ch.epfl.scala.debugadapter.ScalaVersion
 import ch.epfl.scala.debugadapter.testfmk.*
 
 class LocalVariableTests extends DebugTestSuite {
-  val scalaVersion = ScalaVersion.`3.3`
+  val scalaVersion = ScalaVersion.`3.1+`
 
   test("Should set the right expression for array elements") {
     val source =
diff --git a/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/ScalaDebugTests.scala b/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/ScalaDebugTests.scala
@@ -5,7 +5,7 @@ import scala.concurrent.Await
 
 class Scala212DebugTest extends ScalaDebugTests(ScalaVersion.`2.12`)
 class Scala213DebugTest extends ScalaDebugTests(ScalaVersion.`2.13`)
-class Scala33DebugTest extends ScalaDebugTests(ScalaVersion.`3.3`)
+class Scala31PlusDebugTest extends ScalaDebugTests(ScalaVersion.`3.1+`)
 
 abstract class ScalaDebugTests(val scalaVersion: ScalaVersion) extends DebugTestSuite {
   test("should not crash when sources aren't present") {
diff --git a/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/ScalaEvaluationTests.scala b/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/ScalaEvaluationTests.scala
@@ -4,8 +4,8 @@ import ch.epfl.scala.debugadapter.testfmk.*
 
 class Scala212EvaluationTests extends ScalaEvaluationTests(ScalaVersion.`2.12`)
 class Scala213EvaluationTests extends ScalaEvaluationTests(ScalaVersion.`2.13`)
-class Scala33EvaluationTests extends ScalaEvaluationTests(ScalaVersion.`3.3`)
-class Scala34EvaluationTests extends ScalaEvaluationTests(ScalaVersion.`3.4`)
+class Scala31PlusEvaluationTests extends ScalaEvaluationTests(ScalaVersion.`3.1+`)
+class Scala34PlusEvaluationTests extends ScalaEvaluationTests(ScalaVersion.`3.4+`)
 
 abstract class ScalaEvaluationTests(scalaVersion: ScalaVersion) extends DebugTestSuite {
   protected override def defaultConfig: DebugConfig =
@@ -2168,7 +2168,7 @@ abstract class ScalaEvaluationTests(scalaVersion: ScalaVersion) extends DebugTes
   }
 
   test("should use tasty-reader") {
-    assume(ScalaVersion.`3.3`.isRelease)
+    assume(ScalaVersion.`3.1+`.isRelease)
     assume(scalaVersion.isScala213)
     val scala2Source =
       """|package example
@@ -2197,7 +2197,7 @@ abstract class ScalaEvaluationTests(scalaVersion: ScalaVersion) extends DebugTes
     implicit val debuggee: TestingDebuggee = TestingDebuggee.mainClass(
       scala3Source,
       "example.Main",
-      ScalaVersion.`3.3`,
+      ScalaVersion.`3.1+`,
       Seq.empty,
       Seq(scala2Debuggee.mainModule)
     )
diff --git a/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/ScalaStackTraceTests.scala b/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/ScalaStackTraceTests.scala
@@ -3,7 +3,7 @@ package ch.epfl.scala.debugadapter
 import ch.epfl.scala.debugadapter.testfmk.*
 
 class ScalaStackTraceTests extends DebugTestSuite {
-  val scalaVersion = ScalaVersion.`3.3`
+  val scalaVersion = ScalaVersion.`3.1+`
 
   test("anonfun") {
     val source =
diff --git a/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/SourceBreakpointTests.scala b/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/SourceBreakpointTests.scala
@@ -25,7 +25,7 @@ class Scala213SourceBreakpointTests extends SourceBreakpointTests(ScalaVersion.`
     )
   }
 }
-class Scala3SourceBreakpointTests extends SourceBreakpointTests(ScalaVersion.`3.3`) {
+class Scala31PlusSourceBreakpointTests extends SourceBreakpointTests(ScalaVersion.`3.1+`) {
   test("evaluate breakpoint in lambda --- force runtime evaluation") {
     val source =
       """|package example
diff --git a/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/StepFilterTests.scala b/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/StepFilterTests.scala
@@ -2,7 +2,7 @@ package ch.epfl.scala.debugadapter
 
 import ch.epfl.scala.debugadapter.testfmk.*
 
-class Scala3StepFilterTests extends StepFilterTests(ScalaVersion.`3.3`)
+class Scala3StepFilterTests extends StepFilterTests(ScalaVersion.`3.1+`)
 class Scala212StepFilterTests extends StepFilterTests(ScalaVersion.`2.12`)
 class Scala213StepFilterTests extends StepFilterTests(ScalaVersion.`2.13`)
 
diff --git a/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/internal/JavaRuntimeEvaluatorTests.scala b/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/internal/JavaRuntimeEvaluatorTests.scala
@@ -5,7 +5,7 @@ import ch.epfl.scala.debugadapter.ScalaVersion
 import ch.epfl.scala.debugadapter.testfmk.*
 
 class JavaRuntimeEvaluatorTests extends DebugTestSuite {
-  val scalaVersion = ScalaVersion.`3.3`
+  val scalaVersion = ScalaVersion.`3.1+`
   val nestedSource =
     """|package example;
        |
diff --git a/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/internal/MetalsClassBreakpointSuite.scala b/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/internal/MetalsClassBreakpointSuite.scala
@@ -122,7 +122,7 @@ class MetalsClassBreakpointSuite extends FunSuite {
          |}
          |""".stripMargin,
       "a.b.Main$package$",
-      scalaVersion = ScalaVersion.`3.3`
+      scalaVersion = ScalaVersion.`3.1+`
     )
   }
 
@@ -138,7 +138,7 @@ class MetalsClassBreakpointSuite extends FunSuite {
          |}
          |""".stripMargin,
       "a.Main$package$Even$2$",
-      scalaVersion = ScalaVersion.`3.3`
+      scalaVersion = ScalaVersion.`3.1+`
     )
   }
 
@@ -158,7 +158,7 @@ class MetalsClassBreakpointSuite extends FunSuite {
          |
          |""".stripMargin,
       "a.Main$package$",
-      scalaVersion = ScalaVersion.`3.3`
+      scalaVersion = ScalaVersion.`3.1+`
     )
   }
 
diff --git a/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/internal/MixedEvaluationTests.scala b/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/internal/MixedEvaluationTests.scala
@@ -28,7 +28,7 @@ object MixedEvaluationTestsSource {
 
 class Scala212MixedEvaluationTests extends MixedEvaluationTests(ScalaVersion.`2.12`)
 class Scala213MixedEvaluationTests extends MixedEvaluationTests(ScalaVersion.`2.13`)
-class Scala3MixedEvaluationTests extends MixedEvaluationTests(ScalaVersion.`3.3`)
+class Scala3MixedEvaluationTests extends MixedEvaluationTests(ScalaVersion.`3.1+`)
 
 abstract class MixedEvaluationTests(val scalaVersion: ScalaVersion) extends DebugTestSuite {
   lazy val localVar =
diff --git a/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/internal/RuntimeEvaluatorTests.scala b/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/internal/RuntimeEvaluatorTests.scala
@@ -6,8 +6,8 @@ import ch.epfl.scala.debugadapter.DebugConfig
 
 class Scala212RuntimeEvaluatorTests extends ScalaRuntimeEvaluatorTests(ScalaVersion.`2.12`)
 class Scala213RuntimeEvaluatorTests extends ScalaRuntimeEvaluatorTests(ScalaVersion.`2.13`)
-class Scala33RuntimeEvaluatorTests extends ScalaRuntimeEvaluatorTests(ScalaVersion.`3.3`)
-class Scala34RuntimeEvaluatorTests extends ScalaRuntimeEvaluatorTests(ScalaVersion.`3.4`)
+class Scala31PlusRuntimeEvaluatorTests extends ScalaRuntimeEvaluatorTests(ScalaVersion.`3.1+`)
+class Scala34PlusRuntimeEvaluatorTests extends ScalaRuntimeEvaluatorTests(ScalaVersion.`3.4+`)
 
 object RuntimeEvaluatorEnvironments {
   val byNameFunction0 =
@@ -975,7 +975,7 @@ abstract class ScalaRuntimeEvaluatorTests(val scalaVersion: ScalaVersion) extend
          |}
          """.stripMargin
     implicit val debuggee: TestingDebuggee = TestingDebuggee.mainClass(source, "example.Main", scalaVersion)
-    if (scalaVersion == ScalaVersion.`3.3` || scalaVersion == ScalaVersion.`3.4`)
+    if (scalaVersion == ScalaVersion.`3.1+` || scalaVersion == ScalaVersion.`3.4+`)
       check(Breakpoint(7), Evaluation.success("~~.x", 43))
 
     check(
diff --git a/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/internal/RuntimePreEvaluationTests.scala b/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/internal/RuntimePreEvaluationTests.scala
@@ -6,7 +6,7 @@ import ch.epfl.scala.debugadapter.DebugConfig
 
 class Scala212RuntimePreEvaluationTests extends RuntimePreEvaluationTests(ScalaVersion.`2.12`)
 class Scala213RuntimePreEvaluationTests extends RuntimePreEvaluationTests(ScalaVersion.`2.13`)
-class Scala3RuntimePreEvaluationTests extends RuntimePreEvaluationTests(ScalaVersion.`3.3`)
+class Scala31PlusRuntimePreEvaluationTests extends RuntimePreEvaluationTests(ScalaVersion.`3.1+`)
 
 abstract class RuntimePreEvaluationTests(val scalaVersion: ScalaVersion) extends DebugTestSuite {
 
diff --git a/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/internal/RuntimePrimitiveOperationTests.scala b/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/internal/RuntimePrimitiveOperationTests.scala
@@ -9,7 +9,7 @@ import ch.epfl.scala.debugadapter.testfmk.DebugStepAssert
 import ch.epfl.scala.debugadapter.testfmk.Evaluation
 
 class RuntimePrimitiveOperationTests extends DebugTestSuite {
-  val scalaVersion = ScalaVersion.`3.3`
+  val scalaVersion = ScalaVersion.`3.1+`
   val source =
     """|package example
        |
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -5,8 +5,8 @@ object Dependencies {
   val scala212 = scalaEnvVersion.filter(isScala212).getOrElse("2.12.19")
   val scala213 = scalaEnvVersion.filter(isScala213).getOrElse("2.13.14")
   val scala30 = scalaEnvVersion.filter(isScala30).getOrElse("3.0.2")
-  val scala33 = scalaEnvVersion.filter(isScala33).getOrElse("3.3.3")
-  val scala34 = scalaEnvVersion.filter(isScala34).getOrElse("3.4.1")
+  val scala31Plus = scalaEnvVersion.filter(isScala33).getOrElse("3.3.3")
+  val scala34Plus = scalaEnvVersion.filter(isScala34).getOrElse("3.5.0-RC1")
   val asmVersion = "9.7"
   val coursierVersion = "2.1.10"
 

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,6 @@ object ScalaVersion {`
`20`	`20`	val `2.12` = ScalaVersion(BuildInfo.scala212)
`21`	`21`	val `2.13` = ScalaVersion(BuildInfo.scala213)
`22`	`22`	val `3.0` = ScalaVersion(BuildInfo.scala30)
`23`		- val `3.3` = ScalaVersion(BuildInfo.scala33)
`24`		- val `3.4` = ScalaVersion(BuildInfo.scala34)
	`23`	+ val `3.1+` = ScalaVersion(BuildInfo.scala31Plus)
	`24`	+ val `3.4+` = ScalaVersion(BuildInfo.scala34Plus)
`25`	`25`	`}`