Merge pull request #661 from adpi2/scala-3.3.2

Update to Scala 3.3.2
scalacenter · Feb 15, 2024 · 38111cb · 38111cb
2 parents fa93d2a + 7bd6fa9
commit 38111cb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/build.sbt b/build.sbt
@@ -162,7 +162,8 @@ lazy val expressionCompiler = projectMatrix
         case (2, 12) => Seq("2.12.18", "2.12.17", "2.12.16", "2.12.15", "2.12.14", "2.12.13", "2.12.12", "2.12.11")
         case (2, 13) => Seq("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.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, 1 | 2 | 3) =>
+          Seq("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.0")
       }
       .toSeq

diff --git a/...er/src/test/scala/ch/epfl/scala/debugadapter/internal/stacktrace/BinaryDecoderTests.scala b/...er/src/test/scala/ch/epfl/scala/debugadapter/internal/stacktrace/BinaryDecoderTests.scala
@@ -933,15 +933,13 @@ abstract class BinaryDecoderTests(scalaVersion: ScalaVersion) extends BinaryDeco
     val decoder = TestingDecoder(source, scalaVersion)
     decoder.assertDecode(
       "example.A",
-      if isScala33 then "java.lang.String y$1(java.lang.String x$2, scala.runtime.LazyRef y$lzy1$2)"
-      else "java.lang.String y$1(scala.runtime.LazyRef y$lzy1$2, java.lang.String x$2)",
+      "java.lang.String y$1(scala.runtime.LazyRef y$lzy1$2, java.lang.String x$2)",
       "A.m.y: String",
       skip = true
     )
     decoder.assertDecode(
       "example.A",
-      if isScala33 then "java.lang.String y$lzyINIT1$1(java.lang.String x$1, scala.runtime.LazyRef y$lzy1$1)"
-      else "java.lang.String y$lzyINIT1$1(scala.runtime.LazyRef y$lzy1$1, java.lang.String x$1)",
+      "java.lang.String y$lzyINIT1$1(scala.runtime.LazyRef y$lzy1$1, java.lang.String x$1)",
       "A.m.y.<lazy init>: String"
     )
   }
@@ -1140,23 +1138,19 @@ abstract class BinaryDecoderTests(scalaVersion: ScalaVersion) extends BinaryDeco
     val decoder = TestingDecoder(source, scalaVersion)
     decoder.assertDecode(
       "example.A",
-      if isScala33 then "java.lang.String m(int x, java.lang.String evidence$1)"
-      else "java.lang.String m(int x, java.lang.String contextual$1)",
+      "java.lang.String m(int x, java.lang.String contextual$1)",
       "A.m(x: Int): String ?=> String"
     )
     decoder.assertDecode(
       "example.A",
-      if isScala33 then "int m(int evidence$2, java.lang.String evidence$3)"
-      else "int m(int contextual$2, java.lang.String contextual$3)",
+      "int m(int contextual$2, java.lang.String contextual$3)",
       "A.m(): (Int, String) ?=> Int"
     )
     decoder.assertDecode(
       "example.A",
-      if isScala33 then "java.lang.String m(java.lang.String x, int evidence$4, java.lang.String evidence$5)"
-      else "java.lang.String m(java.lang.String x, int contextual$4, java.lang.String contextual$5)",
+      "java.lang.String m(java.lang.String x, int contextual$4, java.lang.String contextual$5)",
       "A.m(x: String): Int ?=> String ?=> String"
     )
-    // TODO try in 3.3.2 or 3.3.3
     if isScala34 then
       val source =
         """|package example
@@ -1685,9 +1679,7 @@ abstract class BinaryDecoderTests(scalaVersion: ScalaVersion) extends BinaryDeco
     )
     decoder.assertDecode(
       "example.Test",
-      if isScala33 then
-        "java.lang.String $anonfun$2(scala.Function1 f$proxy1$1, example.Logger Logger_this$1, java.lang.String x)"
-      else "java.lang.String $anonfun$2(example.Logger Logger_this$1, scala.Function1 f$proxy1$1, java.lang.String x)",
+      "java.lang.String $anonfun$2(example.Logger Logger_this$1, scala.Function1 f$proxy1$1, java.lang.String x)",
       "Logger.m2.<anon fun>(x: String): String"
     )
     decoder.assertDecode(

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -5,7 +5,7 @@ object Dependencies {
   val scala212 = scalaEnvVersion.filter(isScala212).getOrElse("2.12.18")
   val scala213 = scalaEnvVersion.filter(isScala213).getOrElse("2.13.12")
   val scala30 = scalaEnvVersion.filter(isScala30).getOrElse("3.0.2")
-  val scala33 = scalaEnvVersion.filter(isScala33).getOrElse("3.3.1")
+  val scala33 = scalaEnvVersion.filter(isScala33).getOrElse("3.3.2")
   val scala34 = scalaEnvVersion.filter(isScala34).getOrElse("3.4.0")
   val asmVersion = "9.6"
   val coursierVersion = "2.1.9"