Skip to content

Commit df599a8

Browse files
committed
Enable Scala 2.13.0 in the linker and all the other artifacts.
Partest is not yet enabled in this commit, because a dependency of `partest` 2.13.0, namely `testkit`, was not published. See scala/bugscala-js/scala-js#11529 upstream.
1 parent 94c5ec3 commit df599a8

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

js-envs-test-kit/src/main/scala/org/scalajs/jsenv/test/JSEnvSuite.scala

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ package org.scalajs.jsenv.test
1414

1515
import org.scalajs.jsenv.JSEnv
1616

17-
import scala.collection.JavaConverters._
1817
import scala.reflect.ClassTag
1918

2019
import org.junit.runner.Runner
@@ -40,7 +39,7 @@ abstract class JSEnvSuite(private[test] val config: JSEnvSuiteConfig)
4039

4140
/** Runner for a [[JSEnvSuite]]. May only be used on subclasses of [[JSEnvSuite]]. */
4241
final class JSEnvSuiteRunner(root: Class[_], config: JSEnvSuiteConfig)
43-
extends Suite(root, JSEnvSuiteRunner.getRunners(config).asJava) {
42+
extends Suite(root, JSEnvSuiteRunner.getRunners(config)) {
4443

4544
/** Constructor for reflective instantiation via `@RunWith`. */
4645
def this(suite: Class[_ <: JSEnvSuite]) =
@@ -56,16 +55,19 @@ private object JSEnvSuiteRunner {
5655
.map { case (name, value) => s"$name = $value" }
5756
.mkString("[", ", ", "]")
5857

59-
val paramValues = config +: params.map(_._2)
58+
val paramValues = new java.util.LinkedList[AnyRef]
59+
paramValues.add(config)
60+
for (param <- params)
61+
paramValues.add(param._2)
6062

6163
new BlockJUnit4ClassRunnerWithParameters(
62-
new TestWithParameters(name, new TestClass(t.runtimeClass), paramValues.asJava))
64+
new TestWithParameters(name, new TestClass(t.runtimeClass), paramValues))
6365
}
6466

65-
private def getRunners(config: JSEnvSuiteConfig): List[Runner] = {
67+
private def getRunners(config: JSEnvSuiteConfig): java.util.List[Runner] = {
6668
import java.lang.Boolean.{TRUE, FALSE}
6769

68-
List(
70+
java.util.Arrays.asList(
6971
r[RunTests](config, "withCom" -> FALSE),
7072
r[RunTests](config, "withCom" -> TRUE),
7173
r[TimeoutRunTests](config, "withCom" -> FALSE),

0 commit comments

Comments
 (0)