Run and test on custom version from env

adpi2 · adpi2 · commit 46178f2d274b · 2023-01-26T11:41:48.000+01:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -69,7 +69,7 @@ package ch.epfl.scala.debugadapter
 import ch.epfl.scala.debugadapter.testfmk.*
 
 class MyDebugTests extends DebugTestSuite {
-  private val scalaVersion: ScalaVersion = ScalaVersion.`3.2`
+  private val scalaVersion: ScalaVersion = ScalaVersion.`3.1+`
 
   test("my simple test") {
     val source =
@@ -111,7 +111,7 @@ Running all the test can take more than 30 minutes.
 We recommend that locally you run only some tests using the sbt `testOnly` task or using your IDE:
 
 ```
-sbt:root> testOnly ch.epfl.scala.debugadapter.Scala32EvaluationTests
+sbt:root> testOnly ch.epfl.scala.debugadapter.Scala31PlusEvaluationTests
 ```
 
 ## Running the debugger locally
diff --git a/build.sbt b/build.sbt
@@ -34,7 +34,7 @@ lazy val root = project
     expressionCompiler212,
     expressionCompiler213,
     expressionCompiler30,
-    expressionCompiler32,
+    expressionCompiler3,
     scala3StepFilter
   )
   .settings(
@@ -67,7 +67,7 @@ lazy val core213 = core.jvm(Dependencies.scala213)
 lazy val core = projectMatrix
   .in(file("modules/core"))
   .jvmPlatform(
-    Seq(Dependencies.scala212, Dependencies.scala213, Dependencies.scala32),
+    Seq(Dependencies.scala212, Dependencies.scala213, Dependencies.scala31Plus),
     Seq.empty,
     p => p.dependsOn(javaDebug)
   )
@@ -94,16 +94,16 @@ lazy val core = projectMatrix
       BuildInfoKey.action("scala212")(Dependencies.scala212),
       BuildInfoKey.action("scala213")(Dependencies.scala213),
       BuildInfoKey.action("scala30")(Dependencies.scala30),
-      BuildInfoKey.action("scala32")(Dependencies.scala32)
+      BuildInfoKey.action("scala31Plus")(Dependencies.scala31Plus)
     ),
     buildInfoPackage := "ch.epfl.scala.debugadapter"
   )
 
 lazy val tests212 = tests.jvm(Dependencies.scala212)
-lazy val tests3 = tests.jvm(Dependencies.scala32)
+lazy val tests3 = tests.jvm(Dependencies.scala31Plus)
 lazy val tests = projectMatrix
   .in(file("modules/tests"))
-  .jvmPlatform(scalaVersions = Seq(Dependencies.scala212, Dependencies.scala213, Dependencies.scala32))
+  .jvmPlatform(scalaVersions = Seq(Dependencies.scala212, Dependencies.scala213, Dependencies.scala31Plus))
   .settings(
     name := "scala-debug-adapter-test",
     libraryDependencies ++= Seq(
@@ -124,7 +124,7 @@ lazy val tests = projectMatrix
         expressionCompiler212 / publishLocal,
         expressionCompiler213 / publishLocal,
         expressionCompiler30 / publishLocal,
-        expressionCompiler32 / publishLocal,
+        expressionCompiler3 / publishLocal,
         // break cyclic reference
         LocalProject("scala3StepFilter") / publishLocal
       )
@@ -153,13 +153,13 @@ 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 expressionCompiler32 = expressionCompiler.finder(scala32Axis)(true)
+lazy val expressionCompiler3 = expressionCompiler.finder(scala3Axis)(true)
 lazy val expressionCompiler = projectMatrix
   .in(file("modules/expression-compiler"))
   .customRow(true, Seq(scala212Axis, VirtualAxis.jvm), identity[Project] _)
   .customRow(true, Seq(scala213Axis, VirtualAxis.jvm), identity[Project] _)
   .customRow(true, Seq(scala30Axis, VirtualAxis.jvm), identity[Project] _)
-  .customRow(true, Seq(scala32Axis, VirtualAxis.jvm), identity[Project] _)
+  .customRow(true, Seq(scala3Axis, VirtualAxis.jvm), identity[Project] _)
   .settings(
     name := "scala-expression-compiler",
     crossScalaVersions ++= CrossVersion
@@ -198,7 +198,7 @@ lazy val scala3StepFilter: Project = project
   .dependsOn(tests3 % Test)
   .settings(
     name := "scala-debug-step-filter",
-    scalaVersion := Dependencies.scala32,
+    scalaVersion := Dependencies.scala31Plus,
     Compile / doc / sources := Seq.empty,
     libraryDependencies ++= Seq(
       "ch.epfl.scala" %% "tasty-query" % "0.5.7",
@@ -220,7 +220,7 @@ lazy val scalacOptionsSetting = Def.settings(
 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 scala32Axis = VirtualAxis.ScalaVersionAxis(Dependencies.scala32, "3_2")
+lazy val scala3Axis = VirtualAxis.ScalaVersionAxis(Dependencies.scala31Plus, "3")
 
 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/DebugTools.scala b/modules/core/src/main/scala/ch/epfl/scala/debugadapter/DebugTools.scala
@@ -44,7 +44,7 @@ object DebugTools {
         debuggee.libraries
           .find(_.artifactId.startsWith("scala3-library"))
           .map(lib => ScalaVersion(lib.version))
-          .getOrElse(ScalaVersion.`3.2`)
+          .getOrElse(ScalaVersion.`3.1+`)
 
     def resolveCompilerClassLoader(scalaVersion: ScalaVersion): Option[ClassLoader] =
       resolver
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
@@ -6,7 +6,7 @@ case class ScalaVersion(value: String) {
   def isScala212: Boolean = value.startsWith("2.12")
   def isScala213: Boolean = value.startsWith("2.13")
   def isScala30: Boolean = value.startsWith("3.0")
-  def isScala32: Boolean = value.startsWith("3.2")
+  def isScala31Plus: Boolean = value.startsWith("3") && !isScala30
 
   def binaryVersion: String = if (isScala3) "3" else if (isScala213) "2.13" else "2.12"
 
@@ -17,6 +17,5 @@ object ScalaVersion {
   val `2.12` = ScalaVersion(BuildInfo.scala212)
   val `2.13` = ScalaVersion(BuildInfo.scala213)
   val `3.0` = ScalaVersion(BuildInfo.scala30)
-  // val `3.1` = ScalaVersion("3.1.2")
-  val `3.2` = ScalaVersion(BuildInfo.scala32)
+  val `3.1+` = ScalaVersion(BuildInfo.scala31Plus)
 }
diff --git a/modules/scala-3-step-filter/src/test/scala/ch/epfl/scala/debugadapter/internal/stepfilter/ScalaStepFilterBridgeTests.scala b/modules/scala-3-step-filter/src/test/scala/ch/epfl/scala/debugadapter/internal/stepfilter/ScalaStepFilterBridgeTests.scala
@@ -28,7 +28,7 @@ class ScalaStepFilterBridgeTests extends FunSuite:
          |
          |class B extends A
          |""".stripMargin
-    val debuggee = TestingDebuggee.mainClass(source, "example.Main", ScalaVersion.`3.2`)
+    val debuggee = TestingDebuggee.mainClass(source, "example.Main", ScalaVersion.`3.1+`)
     val stepFilter = getStepFilter(debuggee)
 
     val termsOfA = stepFilter.extractScalaTerms("example.A", false)
@@ -50,7 +50,7 @@ class ScalaStepFilterBridgeTests extends FunSuite:
          |}
          |""".stripMargin
 
-    val debuggee = TestingDebuggee.mainClass(source, "example.Main", ScalaVersion.`3.2`)
+    val debuggee = TestingDebuggee.mainClass(source, "example.Main", ScalaVersion.`3.1+`)
     val stepFilter = getStepFilter(debuggee)
 
     val terms = stepFilter.extractScalaTerms("example.Main$", false)
@@ -74,7 +74,7 @@ class ScalaStepFilterBridgeTests extends FunSuite:
          |}
          |""".stripMargin
 
-    val debuggee = TestingDebuggee.mainClass(source, "example.A", ScalaVersion.`3.2`)
+    val debuggee = TestingDebuggee.mainClass(source, "example.A", ScalaVersion.`3.1+`)
     val stepFilter = getStepFilter(debuggee)
 
     val objTerms = stepFilter.extractScalaTerms("example.A$", false)
@@ -86,7 +86,7 @@ class ScalaStepFilterBridgeTests extends FunSuite:
   }
 
   test("should not step into synthetic methods of case classes") {
-    val debuggee = TestingDebuggee.mainClass("", "example.Main", ScalaVersion.`3.2`)
+    val debuggee = TestingDebuggee.mainClass("", "example.Main", ScalaVersion.`3.1+`)
     val stepFilter = getStepFilter(debuggee)
 
     val objTerms =
diff --git a/modules/tests/src/main/scala/ch/epfl/scala/debugadapter/testfmk/DebugTestSuite.scala b/modules/tests/src/main/scala/ch/epfl/scala/debugadapter/testfmk/DebugTestSuite.scala
@@ -32,7 +32,7 @@ trait DebugTest {
   def isScala213(implicit ctx: TestingContext) = ctx.scalaVersion.isScala213
   def isScala212(implicit ctx: TestingContext) = ctx.scalaVersion.isScala212
   def isScala30(implicit ctx: TestingContext) = ctx.scalaVersion.isScala30
-  def isScala32(implicit ctx: TestingContext) = ctx.scalaVersion.isScala32
+  def isScala31Plus(implicit ctx: TestingContext) = ctx.scalaVersion.isScala31Plus
 
   def getDebugServer(
       debuggee: Debuggee,
diff --git a/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/BypassExpressionCompilerTests.scala b/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/BypassExpressionCompilerTests.scala
@@ -3,7 +3,7 @@ package ch.epfl.scala.debugadapter
 import ch.epfl.scala.debugadapter.testfmk.*
 
 class BypassExpressionCompilerTests extends DebugTestSuite {
-  private val scalaVersion = ScalaVersion.`3.2`
+  private val scalaVersion = ScalaVersion.`3.1+`
   protected override def defaultConfig: DebugConfig =
     super.defaultConfig.copy(evaluationMode = DebugConfig.AlwaysBypassCompiler)
 
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
@@ -4,7 +4,7 @@ import ch.epfl.scala.debugadapter.testfmk.*
 
 class Scala212DebugTest extends ScalaDebugTests(ScalaVersion.`2.12`)
 class Scala213DebugTest extends ScalaDebugTests(ScalaVersion.`2.13`)
-class Scala3DebugTest extends ScalaDebugTests(ScalaVersion.`3.2`) {
+class Scala3DebugTest extends ScalaDebugTests(ScalaVersion.`3.1+`) {
   test("should support breakpoints in scala 3 with brace-less syntax") {
     val source =
       """|package example
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
@@ -5,7 +5,7 @@ import ch.epfl.scala.debugadapter.testfmk.*
 class Scala212EvaluationTests extends Scala2EvaluationTests(ScalaVersion.`2.12`)
 class Scala213EvaluationTests extends Scala2EvaluationTests(ScalaVersion.`2.13`)
 class Scala30EvaluationTests extends Scala3EvaluationTests(ScalaVersion.`3.0`)
-class Scala32EvaluationTests extends Scala3EvaluationTests(ScalaVersion.`3.2`)
+class Scala31PlusEvaluationTests extends Scala3EvaluationTests(ScalaVersion.`3.1+`)
 
 abstract class ScalaEvaluationTests(scalaVersion: ScalaVersion) extends DebugTestSuite {
   protected override def defaultConfig: DebugConfig =
@@ -1402,7 +1402,7 @@ abstract class ScalaEvaluationTests(scalaVersion: ScalaVersion) extends DebugTes
     check(
       Breakpoint(6),
       // the program stops twice before Scala 3.2
-      if (!isScala32) Breakpoint(6) else NoStep(),
+      if (!isScala31Plus) Breakpoint(6) else NoStep(),
       Evaluation.success("1 + 1", 2)
     )
   }
@@ -1848,8 +1848,8 @@ abstract class ScalaEvaluationTests(scalaVersion: ScalaVersion) extends DebugTes
         Breakpoint(8), // still in the same lifted lambda (the line position does not make any sense)
         Breakpoint(9), // again in the lifted lambda
         Breakpoint(8), // going out of the lifted lambda
-        if (isScala32) Breakpoint(8) else NoStep(), // regression in Scala 3.2.2
-        if (isScala32) Breakpoint(9) else NoStep(), // regression in Scala 3.2.2
+        if (isScala31Plus) Breakpoint(8) else NoStep(), // regression in Scala 3.2.2
+        if (isScala31Plus) Breakpoint(9) else NoStep(), // regression in Scala 3.2.2
         Breakpoint(13), // calling withFilter
         Breakpoint(13),
         Evaluation.success("x", 1),
@@ -1960,7 +1960,7 @@ abstract class Scala2EvaluationTests(scalaVersion: ScalaVersion) extends ScalaEv
     implicit val debuggee: TestingDebuggee = TestingDebuggee.mainClass(
       scala3Source,
       "example.Main",
-      ScalaVersion.`3.2`,
+      ScalaVersion.`3.1+`,
       Seq.empty,
       Seq(scala2Debugee.mainModule)
     )
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
@@ -3,7 +3,7 @@ package ch.epfl.scala.debugadapter
 import ch.epfl.scala.debugadapter.testfmk.*
 
 class Scala213SourceBreakpointTests extends SourceBreakpointTests(ScalaVersion.`2.13`)
-class Scala32SourceBreakpointTests extends SourceBreakpointTests(ScalaVersion.`3.2`)
+class Scala3SourceBreakpointTests extends SourceBreakpointTests(ScalaVersion.`3.1+`)
 
 abstract class SourceBreakpointTests(scalaVersion: ScalaVersion) extends DebugTestSuite {
   test("evaluate simple breakpoint") {
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.2`)
+class Scala3StepFilterTests extends StepFilterTests(ScalaVersion.`3.1+`)
 class Scala212StepFilterTests extends StepFilterTests(ScalaVersion.`2.12`)
 class Scala213StepFilterTests extends StepFilterTests(ScalaVersion.`2.13`) {
   test("should match all kinds of Scala 2 types (not valid in Scala 3)") {
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -1,13 +1,19 @@
 import sbt._
 
 object Dependencies {
-  val scala212 = "2.12.17"
-  val scala213 = "2.13.10"
-  val scala30 = "3.0.2"
-  val scala32 = "3.2.2"
+  val scalaEnvVersion = Option(System.getenv("SCALA_VERSION"))
+  val scala212 = scalaEnvVersion.filter(isScala212).getOrElse("2.12.17")
+  val scala213 = scalaEnvVersion.filter(isScala213).getOrElse("2.13.10")
+  val scala30 = scalaEnvVersion.filter(isScala30).getOrElse("3.0.2")
+  val scala31Plus = scalaEnvVersion.filter(isScala31Plus).getOrElse("3.2.2")
   val asmVersion = "9.4"
   val coursierVersion = "2.1.0-RC5"
 
+  def isScala212(version: String): Boolean = version.startsWith("2.12")
+  def isScala213(version: String): Boolean = version.startsWith("2.13")
+  def isScala30(version: String): Boolean = version.startsWith("3.0")
+  def isScala31Plus(version: String): Boolean = version.startsWith("3") && !isScala30(version)
+
   val asm = "org.ow2.asm" % "asm" % asmVersion
   val asmUtil = "org.ow2.asm" % "asm-util" % asmVersion
 
