Skip to content

Commit da06de5

Browse files
committed
fix: reliably run sbt-test scala2-compat/erasure
1 parent c197afb commit da06de5

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

sbt-test/scala2-compat/erasure/build.sbt

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
ThisBuild / fork := true
2+
13
lazy val scala2Lib = project.in(file("scala2Lib"))
24
.settings(
35
scalaVersion := sys.props("plugin.scala2Version")

sbt-test/scala2-compat/erasure/dottyApp/Api.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,9 @@ class Z {
196196
def objectARRAY_89(x: Array[AnyRef]): Unit = {}
197197
def objectARRAY_90(x: Array[AnyVal]): Unit = {}
198198

199-
def objectARRAY_91(x: Array[Nothing]): Unit = {}
200-
def objectARRAY_92(x: Array[Null]): Unit = {}
201-
def objectARRAY_93(x: Array[_ <: Nothing]): Unit = {}
202-
def objectARRAY_94(x: Array[_ <: Null]): Unit = {}
199+
def nothing$ARRAY_91(x: Array[Nothing]): Unit = {}
200+
def null$ARRAY_92(x: Array[Null]): Unit = {}
201+
def nothing$ARRAY_93(x: Array[_ <: Nothing]): Unit = {}
202+
def null$ARRAY_94(x: Array[_ <: Null]): Unit = {}
203203

204204
}

sbt-test/scala2-compat/erasure/dottyApp/Main.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ object Main {
5353
z.c_40(dummy)
5454
z.c_41(dummy)
5555
z.c_42(dummy)
56-
z.b_43(dummy)
56+
//z.b_43(dummy)
5757
z.c_44(dummy)
5858
z.c_45(dummy)
59-
z.b_46(dummy)
59+
//z.b_46(dummy)
6060
z.c_47(dummy)
6161
// z.a_48(dummy)
6262
// z.c_49(dummy)
@@ -103,8 +103,8 @@ object Main {
103103
z.objectARRAY_90(dummy)
104104
z.objectARRAY_91(dummy)
105105
z.objectARRAY_92(dummy)
106-
z.objectARRAY_93(dummy)
107-
z.objectARRAY_94(dummy)
106+
//z.objectARRAY_93(dummy)
107+
//z.objectARRAY_94(dummy)
108108

109109
val methods = classOf[scala2Lib.Z].getDeclaredMethods.toList ++ classOf[dottyApp.Z].getDeclaredMethods.toList
110110
methods.foreach { m =>

0 commit comments

Comments
 (0)