Merge pull request #684 from adpi2/scala-3.3.3

Update to Scala 3.3.3
scalacenter · Mar 5, 2024 · 32f4b67 · 32f4b67
2 parents 1f73016 + 52183e2
commit 32f4b67
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/build.sbt b/build.sbt
@@ -171,7 +171,7 @@ lazy val expressionCompiler = projectMatrix
           Seq("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.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")
+          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.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
@@ -1143,17 +1143,20 @@ abstract class BinaryDecoderTests(scalaVersion: ScalaVersion) extends BinaryDeco
     val decoder = TestingDecoder(source, scalaVersion)
     decoder.assertDecode(
       "example.A",
-      "java.lang.String m(int x, java.lang.String contextual$1)",
+      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)",
       "A.m(x: Int): String ?=> String"
     )
     decoder.assertDecode(
       "example.A",
-      "int m(int contextual$2, java.lang.String contextual$3)",
+      if isScala33 then "int m(int evidence$2, java.lang.String evidence$3)"
+      else "int m(int contextual$2, java.lang.String contextual$3)",
       "A.m(): (Int, String) ?=> Int"
     )
     decoder.assertDecode(
       "example.A",
-      "java.lang.String m(java.lang.String x, int contextual$4, java.lang.String contextual$5)",
+      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)",
       "A.m(x: String): Int ?=> String ?=> String"
     )
     if isScala34 then

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