Skip to content

Commit 6a5318d

Browse files
committed
Scala 3.3.1-RC1 (enable TastyTest on JDK 21)
this should work on JDK 21 now that scala/scala3#17536 has been merged
1 parent a901a60 commit 6a5318d

File tree

4 files changed

+4
-12
lines changed

4 files changed

+4
-12
lines changed

project/DottySupport.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import sbt.librarymanagement.{
1212
* Settings to support validation of TastyUnpickler against the release of dotty with the matching TASTy version
1313
*/
1414
object TastySupport {
15-
val supportedTASTyRelease = "3.3.0" // TASTy version 28.4-1
15+
val supportedTASTyRelease = "3.3.1-RC1" // TASTy version 28.4-1
1616
val scala3Compiler = "org.scala-lang" % "scala3-compiler_3" % supportedTASTyRelease
1717
val scala3Library = "org.scala-lang" % "scala3-library_3" % supportedTASTyRelease
1818

@@ -26,7 +26,7 @@ object TastySupport {
2626
* Dotty in .travis.yml.
2727
*/
2828
object DottySupport {
29-
val dottyVersion = "3.3.0"
29+
val dottyVersion = "3.3.1-RC1"
3030
val compileWithDotty: Boolean =
3131
Option(System.getProperty("scala.build.compileWithDotty")).exists(_.toBoolean)
3232
lazy val commonSettings = Seq(
Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
TestErasedTypes_fail.scala:6: error: Unsupported Scala 3 erased modifier in refinement of type F; found in class tastytest.ErasedTypes.Bar.
2-
def test1 = new Bar[Foo]
3-
^
4-
TestErasedTypes_fail.scala:7: error: Unsupported Scala 3 erased modifier in refinement of type F; found in class tastytest.ErasedTypes.Baz.
5-
def test2 = new Baz[Foo]
6-
^
71
TestErasedTypes_fail.scala:9: error: Unsupported Scala 3 erased value x; found in method foo1 in trait tastytest.ErasedTypes.Foo.
82
def test3(f: Foo) = f.foo1("foo")
93
^
@@ -13,4 +7,4 @@ TestErasedTypes_fail.scala:10: error: Unsupported Scala 3 erased value x; found
137
TestErasedTypes_fail.scala:12: error: Unsupported Scala 3 erased method theString; found in object tastytest.ErasedTypes.ErasedCompileTimeOps.
148
def test5 = ErasedCompileTimeOps.theString
159
^
16-
5 errors
10+
3 errors
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
TestSaferExceptions_fail.scala:5: error: Unsupported Scala 3 erased context function type in bounds of type mayThrow: erased tastytest.SaferExceptions.CanThrowCapability[E] ?=> A; found in object tastytest.SaferExceptions.
1+
TestSaferExceptions_fail.scala:5: error: Unsupported Scala 3 erased value x$1; found in method apply in tastytest.SaferExceptions.<refinement>.
22
def test = SaferExceptions.safeDiv(1, 0) // error
33
^
44
1 error

test/tasty/test/scala/tools/tastytest/TastyTestJUnit.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ object TastyTestJUnit {
9292

9393
@setup
9494
def init(): Unit = {
95-
// TODO remove once Scala 3 has a fix for scala/bug#12783
96-
assumeFalse(scala.util.Properties.isJavaAtLeast("21"))
9795
_dottyClassLoader = Dotc.initClassloader().get
9896
}
9997

0 commit comments

Comments
 (0)