Skip to content

Commit 0aa3542

Browse files
gzm0gzm0
authored
Merge pull request scala-js#4683 from sjrd/scala-2.12.16
Upgrade to Scala 2.12.16.
2 parents 212a01f + 24d9174 commit 0aa3542

File tree

74 files changed

+248
-20
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+248
-20
lines changed

‎Jenkinsfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -470,8 +470,8 @@ def otherJavaVersions = ["11", "16"]
470470
def allJavaVersions = otherJavaVersions.clone()
471471
allJavaVersions << mainJavaVersion
472472

473-
def mainScalaVersion = "2.12.15"
474-
def mainScalaVersions = ["2.11.12", "2.12.15", "2.13.8"]
473+
def mainScalaVersion = "2.12.16"
474+
def mainScalaVersions = ["2.11.12", "2.12.16", "2.13.8"]
475475
def otherScalaVersions = [
476476
"2.11.12",
477477
"2.12.1",
@@ -488,6 +488,7 @@ def otherScalaVersions = [
488488
"2.12.12",
489489
"2.12.13",
490490
"2.12.14",
491+
"2.12.15",
491492
"2.13.0",
492493
"2.13.1",
493494
"2.13.2",
@@ -538,7 +539,7 @@ allESVersions.each { esVersion ->
538539
allJavaVersions.each { javaVersion ->
539540
if (!isExcludedForScala211(javaVersion)) {
540541
// the sbt plugin tests want to compile everything for 2.11, 2.12 and 2.13
541-
quickMatrix.add([task: "tools-sbtplugin", scala: "2.12.15", java: javaVersion])
542+
quickMatrix.add([task: "tools-sbtplugin", scala: "2.12.16", java: javaVersion])
542543
quickMatrix.add([task: "tools", scala: "2.11.12", java: javaVersion])
543544
}
544545
quickMatrix.add([task: "tools", scala: "2.13.8", java: javaVersion])

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/BlacklistedTests.txt renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/BlacklistedTests.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -969,8 +969,10 @@ run/StubErrorTypeclass.scala
969969
run/StubErrorTypeDef.scala
970970

971971
# partest.CompilerTest
972+
run/infix-rangepos.scala
972973
run/t8852a.scala
973974
run/t12062.scala
975+
run/t12490.scala
974976

975977
# partest.ASMConverters
976978
run/t9403
@@ -1092,6 +1094,7 @@ run/t1195-old.scala
10921094
run/t3758-old.scala
10931095
run/t4110-old.scala
10941096
run/t6246.scala
1097+
run/t12481.scala
10951098

10961099
# Using ScalaRunTime.stringOf
10971100
run/value-class-extractor-seq.scala

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/neg/choices.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/neg/choices.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/neg/partestInvalidFlag.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/neg/partestInvalidFlag.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/neg/t11952b.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/neg/t11952b.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/neg/t6446-additional.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/neg/t6446-additional.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/neg/t6446-list.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/neg/t6446-list.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/neg/t6446-missing.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/neg/t6446-missing.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/neg/t6446-show-phases.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/neg/t6446-show-phases.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/neg/t7494-no-options.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/neg/t7494-no-options.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/Course-2002-01.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/Course-2002-01.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/Course-2002-02.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/Course-2002-02.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/Course-2002-04.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/Course-2002-04.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/Course-2002-08.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/Course-2002-08.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/Course-2002-09.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/Course-2002-09.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/Course-2002-10.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/Course-2002-10.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/Meter.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/Meter.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/MeterCaseClass.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/MeterCaseClass.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/anyval-box-types.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/anyval-box-types.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/bugs.sem renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/bugs.sem

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/caseClassHash.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/caseClassHash.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/classof.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/classof.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/deeps.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/deeps.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/dynamic-anyval.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/dynamic-anyval.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/impconvtimes.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/impconvtimes.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/imports.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/imports.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/interpolation.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/interpolation.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/interpolationMultiline1.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/interpolationMultiline1.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/macro-bundle-static.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/macro-bundle-static.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/macro-bundle-toplevel.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/macro-bundle-toplevel.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/macro-bundle-whitebox-decl.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/macro-bundle-whitebox-decl.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/misc.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/misc.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/promotion.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/promotion.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/runtime.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/runtime.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/spec-self.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/spec-self.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/structural.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/structural.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/t0421-new.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/t0421-new.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/t0421-old.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/t0421-old.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/t1503.sem renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/t1503.sem

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/t3702.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/t3702.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/t4148.sem renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/t4148.sem

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/t4617.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/t4617.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/t5356.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/t5356.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/t5552.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/t5552.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/t5568.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/t5568.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/t5629b.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/t5629b.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/t5680.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/t5680.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/t5866.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/t5866.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/t6318_primitives.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/t6318_primitives.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/t6662.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/t6662.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/t7657.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/t7657.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/t7763.sem renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/t7763.sem

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/t8570a.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/t8570a.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/t8764.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/t8764.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/t9387b.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/t9387b.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/t9656.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/t9656.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/try-catch-unify.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/try-catch-unify.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/virtpatmat_switch.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/virtpatmat_switch.check

File renamed without changes.

‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.15/run/virtpatmat_typetag.check renamed to ‎partest-suite/src/test/resources/scala/tools/partest/scalajs/2.12.16/run/virtpatmat_typetag.check

File renamed without changes.

‎project/MultiScalaProject.scala

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,38 @@ object MultiScalaProject {
7878
v.map(v => (v._1, f(v._2)))
7979

8080
private final val versions = Map[String, Seq[String]](
81-
"2.11" -> Seq("2.11.12"),
82-
"2.12" -> Seq("2.12.1", "2.12.2", "2.12.3", "2.12.4", "2.12.5", "2.12.6", "2.12.7", "2.12.8", "2.12.9", "2.12.10", "2.12.11", "2.12.12", "2.12.13", "2.12.14", "2.12.15"),
83-
"2.13" -> Seq("2.13.0", "2.13.1", "2.13.2", "2.13.3", "2.13.4", "2.13.5", "2.13.6", "2.13.7", "2.13.8"),
81+
"2.11" -> Seq(
82+
"2.11.12",
83+
),
84+
"2.12" -> Seq(
85+
"2.12.1",
86+
"2.12.2",
87+
"2.12.3",
88+
"2.12.4",
89+
"2.12.5",
90+
"2.12.6",
91+
"2.12.7",
92+
"2.12.8",
93+
"2.12.9",
94+
"2.12.10",
95+
"2.12.11",
96+
"2.12.12",
97+
"2.12.13",
98+
"2.12.14",
99+
"2.12.15",
100+
"2.12.16",
101+
),
102+
"2.13" -> Seq(
103+
"2.13.0",
104+
"2.13.1",
105+
"2.13.2",
106+
"2.13.3",
107+
"2.13.4",
108+
"2.13.5",
109+
"2.13.6",
110+
"2.13.7",
111+
"2.13.8",
112+
),
84113
)
85114

86115
val Default2_11ScalaVersion = versions("2.11").last

‎sbt-plugin/src/sbt-test/incremental/change-config-and-source/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
scalaVersion := "2.12.15"
1+
scalaVersion := "2.12.16"
22

33
enablePlugins(ScalaJSPlugin)
44

‎sbt-plugin/src/sbt-test/incremental/change-config/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
scalaVersion := "2.12.15"
1+
scalaVersion := "2.12.16"
22

33
enablePlugins(ScalaJSPlugin)
44

‎sbt-plugin/src/sbt-test/incremental/fix-compile-error/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
scalaVersion := "2.12.15"
1+
scalaVersion := "2.12.16"
22

33
enablePlugins(ScalaJSPlugin)
44

‎sbt-plugin/src/sbt-test/linker/concurrent-linker-use/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ lazy val concurrentUseOfLinkerTest = taskKey[Any]("")
1111
name := "Scala.js sbt test"
1212

1313
version := scalaJSVersion
14-
scalaVersion := "2.12.15"
14+
scalaVersion := "2.12.16"
1515

1616
enablePlugins(ScalaJSPlugin)
1717

‎sbt-plugin/src/sbt-test/linker/custom-linker/build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313

1414
inThisBuild(Def.settings(
1515
version := scalaJSVersion,
16-
scalaVersion := "2.12.15",
16+
scalaVersion := "2.12.16",
1717
))
1818

1919
lazy val check = taskKey[Any]("")
2020

2121
lazy val customLinker = project.in(file("custom-linker"))
2222
.settings(
23-
scalaVersion := "2.12.15", // needs to match the minor version of Scala used by sbt
23+
scalaVersion := "2.12.16", // needs to match the minor version of Scala used by sbt
2424
libraryDependencies += "org.scala-js" %% "scalajs-linker" % scalaJSVersion,
2525
)
2626

‎sbt-plugin/src/sbt-test/linker/no-root-dependency-resolution/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name := "Scala.js sbt test"
22

33
version in ThisBuild := scalaJSVersion
4-
scalaVersion in ThisBuild := "2.12.15"
4+
scalaVersion in ThisBuild := "2.12.16"
55

66
// Disable the IvyPlugin on the root project
77
disablePlugins(sbt.plugins.IvyPlugin)

‎sbt-plugin/src/sbt-test/linker/non-existent-classpath/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version := scalaJSVersion
2-
scalaVersion := "2.12.15"
2+
scalaVersion := "2.12.16"
33

44
enablePlugins(ScalaJSPlugin)
55

‎sbt-plugin/src/sbt-test/settings/cross-version/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import org.scalajs.sbtplugin.ScalaJSCrossVersion
33
val check = taskKey[Unit]("Run checks of this test")
44

55
version := scalaJSVersion
6-
scalaVersion := "2.12.15"
6+
scalaVersion := "2.12.16"
77

88
lazy val js = project.enablePlugins(ScalaJSPlugin).settings(
99
check := {

‎sbt-plugin/src/sbt-test/settings/legacy-link-empty/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
version := scalaJSVersion
2-
scalaVersion := "2.12.15"
2+
scalaVersion := "2.12.16"
33

44
enablePlugins(ScalaJSPlugin)

‎sbt-plugin/src/sbt-test/settings/legacy-link-tasks/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
val checkNoClosure = taskKey[Unit]("Check that fullOptJS wasn't run with closure")
22

33
version := scalaJSVersion
4-
scalaVersion := "2.12.15"
4+
scalaVersion := "2.12.16"
55

66
enablePlugins(ScalaJSPlugin)
77

‎sbt-plugin/src/sbt-test/settings/module-init/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import org.scalajs.linker.interface.ModuleInitializer
33
val check = taskKey[Unit]("Run checks of this test")
44

55
version := scalaJSVersion
6-
scalaVersion := "2.12.15"
6+
scalaVersion := "2.12.16"
77

88
enablePlugins(ScalaJSPlugin)
99

‎sbt-plugin/src/sbt-test/settings/source-map/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import org.scalajs.linker.interface.ModuleInitializer
33
val check = taskKey[Unit]("Run checks of this test")
44

55
version := scalaJSVersion
6-
scalaVersion := "2.12.15"
6+
scalaVersion := "2.12.16"
77

88
enablePlugins(ScalaJSPlugin)
99

‎sbt-plugin/src/sbt-test/testing/multi-framework/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
inThisBuild(version := scalaJSVersion)
2-
inThisBuild(scalaVersion := "2.12.15")
2+
inThisBuild(scalaVersion := "2.12.16")
33

44
lazy val root = project.in(file(".")).
55
aggregate(multiTestJS, multiTestJVM)

‎scala-test-suite/src/test/resources/2.12.16/BlacklistedTests.txt

Lines changed: 195 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,195 @@
1+
## Do not compile
2+
scala/lang/annotations/BytecodeTest.scala
3+
scala/lang/annotations/RunTest.scala
4+
scala/lang/traits/BytecodeTest.scala
5+
scala/lang/traits/RunTest.scala
6+
scala/lang/primitives/NaNTest.scala
7+
scala/lang/primitives/BoxUnboxTest.scala
8+
scala/collection/SeqTest.scala
9+
scala/collection/Sizes.scala
10+
scala/collection/immutable/HashMapTest.scala
11+
scala/collection/immutable/HashSetTest.scala
12+
scala/collection/immutable/ListMapTest.scala
13+
scala/collection/immutable/MapHashcodeTest.scala
14+
scala/collection/immutable/SetTest.scala
15+
scala/collection/immutable/SeqTest.scala
16+
scala/collection/immutable/SmallMapTest.scala
17+
scala/collection/immutable/SortedMapTest.scala
18+
scala/collection/immutable/SortedSetTest.scala
19+
scala/collection/immutable/TreeMapTest.scala
20+
scala/collection/immutable/TreeSetTest.scala
21+
scala/reflect/ClassOfTest.scala
22+
scala/reflect/QTest.scala
23+
scala/reflect/io/AbstractFileTest.scala
24+
scala/reflect/io/ZipArchiveTest.scala
25+
scala/reflect/internal/util/AbstractFileClassLoaderTest.scala
26+
scala/reflect/internal/util/FileUtilsTest.scala
27+
scala/reflect/internal/util/SourceFileTest.scala
28+
scala/reflect/internal/util/StringOpsTest.scala
29+
scala/reflect/internal/util/WeakHashSetTest.scala
30+
scala/reflect/internal/LongNamesTest.scala
31+
scala/reflect/internal/MirrorsTest.scala
32+
scala/reflect/internal/NamesTest.scala
33+
scala/reflect/internal/PositionsTest.scala
34+
scala/reflect/internal/PrintersTest.scala
35+
scala/reflect/internal/ScopeTest.scala
36+
scala/reflect/internal/TreeGenTest.scala
37+
scala/reflect/internal/TypesTest.scala
38+
scala/reflect/macros/AttachmentsTest.scala
39+
scala/reflect/runtime/ReflectionUtilsShowTest.scala
40+
scala/reflect/runtime/ThreadSafetyTest.scala
41+
scala/runtime/BooleanBoxingTest.scala
42+
scala/runtime/ByteBoxingTest.scala
43+
scala/runtime/CharBoxingTest.scala
44+
scala/runtime/DoubleBoxingTest.scala
45+
scala/runtime/IntBoxingTest.scala
46+
scala/runtime/FloatBoxingTest.scala
47+
scala/runtime/LongBoxingTest.scala
48+
scala/runtime/ShortBoxingTest.scala
49+
scala/tools/cmd/CommandLineParserTest.scala
50+
scala/tools/nsc/Build.scala
51+
scala/tools/nsc/DeterminismTest.scala
52+
scala/tools/nsc/DeterminismTester.scala
53+
scala/tools/nsc/FileUtils.scala
54+
scala/tools/nsc/GlobalCustomizeClassloaderTest.scala
55+
scala/tools/nsc/PickleWriteTest.scala
56+
scala/tools/nsc/PipelineMainTest.scala
57+
scala/tools/nsc/async/AnnotationDrivenAsync.scala
58+
scala/tools/nsc/async/CustomFuture.scala
59+
scala/tools/nsc/backend/jvm/BTypesTest.scala
60+
scala/tools/nsc/backend/jvm/BytecodeTest.scala
61+
scala/tools/nsc/backend/jvm/DefaultMethodTest.scala
62+
scala/tools/nsc/backend/jvm/DirectCompileTest.scala
63+
scala/tools/nsc/backend/jvm/GenericSignaturesTest.scala
64+
scala/tools/nsc/backend/jvm/IndyLambdaDirectTest.scala
65+
scala/tools/nsc/backend/jvm/IndyLambdaTest.scala
66+
scala/tools/nsc/backend/jvm/IndySammyTest.scala
67+
scala/tools/nsc/backend/jvm/InnerClassAttributeTest.scala
68+
scala/tools/nsc/backend/jvm/LineNumberTest.scala
69+
scala/tools/nsc/backend/jvm/NestedClassesCollectorTest.scala
70+
scala/tools/nsc/backend/jvm/OptimizedBytecodeTest.scala
71+
scala/tools/nsc/backend/jvm/PerRunInitTest.scala
72+
scala/tools/nsc/backend/jvm/StringConcatTest.scala
73+
scala/tools/nsc/backend/jvm/analysis/NullnessAnalyzerTest.scala
74+
scala/tools/nsc/backend/jvm/analysis/ProdConsAnalyzerTest.scala
75+
scala/tools/nsc/backend/jvm/opt/AnalyzerTest.scala
76+
scala/tools/nsc/backend/jvm/opt/BoxUnboxAndInlineTest.scala
77+
scala/tools/nsc/backend/jvm/opt/BoxUnboxTest.scala
78+
scala/tools/nsc/backend/jvm/opt/BTypesFromClassfileTest.scala
79+
scala/tools/nsc/backend/jvm/opt/CallGraphTest.scala
80+
scala/tools/nsc/backend/jvm/opt/ClosureOptimizerTest.scala
81+
scala/tools/nsc/backend/jvm/opt/CompactLocalVariablesTest.scala
82+
scala/tools/nsc/backend/jvm/opt/EmptyExceptionHandlersTest.scala
83+
scala/tools/nsc/backend/jvm/opt/EmptyLabelsAndLineNumbersTest.scala
84+
scala/tools/nsc/backend/jvm/opt/InlineInfoTest.scala
85+
scala/tools/nsc/backend/jvm/opt/InlinerIllegalAccessTest.scala
86+
scala/tools/nsc/backend/jvm/opt/InlinerSeparateCompilationTest.scala
87+
scala/tools/nsc/backend/jvm/opt/InlinerTest.scala
88+
scala/tools/nsc/backend/jvm/opt/InlineSourceMatcherTest.scala
89+
scala/tools/nsc/backend/jvm/opt/InlineWarningTest.scala
90+
scala/tools/nsc/backend/jvm/opt/MethodLevelOptsTest.scala
91+
scala/tools/nsc/backend/jvm/opt/ScalaInlineInfoTest.scala
92+
scala/tools/nsc/backend/jvm/opt/SimplifyJumpsTest.scala
93+
scala/tools/nsc/backend/jvm/opt/UnreachableCodeTest.scala
94+
scala/tools/nsc/backend/jvm/opt/UnusedLocalVariablesTest.scala
95+
scala/tools/nsc/ScriptRunnerTest.scala
96+
scala/tools/nsc/classpath/AggregateClassPathTest.scala
97+
scala/tools/nsc/classpath/JrtClassPathTest.scala
98+
scala/tools/nsc/classpath/MultiReleaseJarTest.scala
99+
scala/tools/nsc/classpath/PathResolverBaseTest.scala
100+
scala/tools/nsc/classpath/VirtualDirectoryClassPathTest.scala
101+
scala/tools/nsc/classpath/ZipAndJarFileLookupFactoryTest.scala
102+
scala/tools/nsc/doc/html/HtmlDocletTest.scala
103+
scala/tools/nsc/interpreter/CompletionTest.scala
104+
scala/tools/nsc/interpreter/ScriptedTest.scala
105+
scala/tools/nsc/interpreter/TabulatorTest.scala
106+
scala/tools/nsc/parser/ParserTest.scala
107+
scala/tools/nsc/reporters/ConsoleReporterTest.scala
108+
scala/tools/nsc/reporters/WConfTest.scala
109+
scala/tools/nsc/settings/ScalaVersionTest.scala
110+
scala/tools/nsc/settings/SettingsTest.scala
111+
scala/tools/nsc/settings/TargetTest.scala
112+
scala/tools/nsc/symtab/CannotHaveAttrsTest.scala
113+
scala/tools/nsc/symtab/FlagsTest.scala
114+
scala/tools/nsc/symtab/FreshNameExtractorTest.scala
115+
scala/tools/nsc/symtab/StdNamesTest.scala
116+
scala/tools/nsc/symtab/SymbolLoadersAssociatedFileTest.scala
117+
scala/tools/nsc/symtab/SymbolTableForUnitTesting.scala
118+
scala/tools/nsc/symtab/SymbolTableTest.scala
119+
scala/tools/nsc/symtab/classfile/PicklerTest.scala
120+
scala/tools/nsc/transform/MixinTest.scala
121+
scala/tools/nsc/transform/SpecializationTest.scala
122+
scala/tools/nsc/transform/ThicketTransformerTest.scala
123+
scala/tools/nsc/transform/delambdafy/DelambdafyTest.scala
124+
scala/tools/nsc/transform/patmat/SolvingTest.scala
125+
scala/tools/nsc/transform/patmat/PatmatBytecodeTest.scala
126+
scala/tools/nsc/typechecker/Implicits.scala
127+
scala/tools/nsc/typechecker/NamerTest.scala
128+
scala/tools/nsc/typechecker/ParamAliasTest.scala
129+
scala/tools/nsc/typechecker/TypedTreeTest.scala
130+
scala/tools/nsc/util/StackTraceTest.scala
131+
scala/tools/testing/AllocationTest.scala
132+
scala/tools/testing/BytecodeTesting.scala
133+
scala/tools/testing/JOL.scala
134+
scala/tools/testing/RunTesting.scala
135+
scala/tools/testing/VirtualCompilerTesting.scala
136+
scala/util/matching/RegexTest.scala
137+
138+
## Do not link
139+
scala/MatchErrorSerializationTest.scala
140+
scala/PartialFunctionSerializationTest.scala
141+
scala/lang/stringinterpol/StringContextTest.scala
142+
scala/collection/IteratorTest.scala
143+
scala/collection/NewBuilderTest.scala
144+
scala/collection/ParallelConsistencyTest.scala
145+
scala/collection/SetMapRulesTest.scala
146+
scala/collection/SeqViewTest.scala
147+
scala/collection/SetMapConsistencyTest.scala
148+
scala/collection/concurrent/TrieMapTest.scala
149+
scala/collection/convert/WrapperSerializationTest.scala
150+
scala/collection/immutable/ListTest.scala
151+
scala/collection/immutable/RedBlackTreeSerialFormat.scala
152+
scala/collection/immutable/StreamTest.scala
153+
scala/collection/immutable/StringLikeTest.scala
154+
scala/collection/immutable/VectorTest.scala
155+
scala/collection/mutable/AnyRefMapTest.scala
156+
scala/collection/mutable/ArrayBufferTest.scala
157+
scala/collection/mutable/MutableListTest.scala
158+
scala/collection/mutable/OpenHashMapTest.scala
159+
scala/collection/mutable/PriorityQueueTest.scala
160+
scala/collection/parallel/TaskTest.scala
161+
scala/collection/parallel/immutable/ParRangeTest.scala
162+
scala/concurrent/FutureTest.scala
163+
scala/concurrent/duration/SerializationTest.scala
164+
scala/concurrent/impl/DefaultPromiseTest.scala
165+
scala/io/SourceTest.scala
166+
scala/runtime/ScalaRunTimeTest.scala
167+
scala/sys/process/PipedProcessTest.scala
168+
scala/sys/process/ProcessTest.scala
169+
scala/tools/testing/AssertUtilTest.scala
170+
scala/tools/testing/AssertThrowsTest.scala
171+
scala/util/SpecVersionTest.scala
172+
scala/util/SystemPropertiesTest.scala
173+
174+
## Tests fail
175+
176+
# Reflection
177+
scala/reflect/ClassTagTest.scala
178+
179+
# Require strict-floats
180+
scala/math/BigDecimalTest.scala
181+
182+
# Difference of getClass() on primitive values
183+
scala/collection/immutable/RangeTest.scala
184+
185+
# Test fails only some times with
186+
# 'set scalaJSOptimizerOptions in scalaTestSuite ~= (_.withDisableOptimizer(true))'
187+
# and' 'set scalaJSUseRhino in Global := false'
188+
scala/collection/immutable/PagedSeqTest.scala
189+
190+
# Bugs
191+
scala/collection/convert/MapWrapperTest.scala
192+
193+
# Tests passed but are too slow (timeouts)
194+
scala/collection/immutable/ListSetTest.scala
195+
scala/util/SortingTest.scala

0 commit comments

Comments
 (0)