Skip to content

Commit 32f4b67

Browse files
authored
Merge pull request #684 from adpi2/scala-3.3.3
Update to Scala 3.3.3
2 parents 1f73016 + 52183e2 commit 32f4b67

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ lazy val expressionCompiler = projectMatrix
171171
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")
172172
case (3, 0) => Seq("3.0.2", "3.0.1", "3.0.0")
173173
case (3, 1 | 2 | 3) =>
174-
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")
174+
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")
175175
case (3, _) => Seq("3.4.0")
176176
}
177177
.toSeq

modules/decoder/src/test/scala/ch/epfl/scala/debugadapter/internal/stacktrace/BinaryDecoderTests.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,17 +1143,20 @@ abstract class BinaryDecoderTests(scalaVersion: ScalaVersion) extends BinaryDeco
11431143
val decoder = TestingDecoder(source, scalaVersion)
11441144
decoder.assertDecode(
11451145
"example.A",
1146-
"java.lang.String m(int x, java.lang.String contextual$1)",
1146+
if isScala33 then "java.lang.String m(int x, java.lang.String evidence$1)"
1147+
else "java.lang.String m(int x, java.lang.String contextual$1)",
11471148
"A.m(x: Int): String ?=> String"
11481149
)
11491150
decoder.assertDecode(
11501151
"example.A",
1151-
"int m(int contextual$2, java.lang.String contextual$3)",
1152+
if isScala33 then "int m(int evidence$2, java.lang.String evidence$3)"
1153+
else "int m(int contextual$2, java.lang.String contextual$3)",
11521154
"A.m(): (Int, String) ?=> Int"
11531155
)
11541156
decoder.assertDecode(
11551157
"example.A",
1156-
"java.lang.String m(java.lang.String x, int contextual$4, java.lang.String contextual$5)",
1158+
if isScala33 then "java.lang.String m(java.lang.String x, int evidence$4, java.lang.String evidence$5)"
1159+
else "java.lang.String m(java.lang.String x, int contextual$4, java.lang.String contextual$5)",
11571160
"A.m(x: String): Int ?=> String ?=> String"
11581161
)
11591162
if isScala34 then

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ object Dependencies {
55
val scala212 = scalaEnvVersion.filter(isScala212).getOrElse("2.12.19")
66
val scala213 = scalaEnvVersion.filter(isScala213).getOrElse("2.13.13")
77
val scala30 = scalaEnvVersion.filter(isScala30).getOrElse("3.0.2")
8-
val scala33 = scalaEnvVersion.filter(isScala33).getOrElse("3.3.2")
8+
val scala33 = scalaEnvVersion.filter(isScala33).getOrElse("3.3.3")
99
val scala34 = scalaEnvVersion.filter(isScala34).getOrElse("3.4.0")
1010
val asmVersion = "9.6"
1111
val coursierVersion = "2.1.9"

0 commit comments

Comments
 (0)