Merge pull request #4559 from sjrd/scala-2.12.15

Upgrade to Scala 2.12.15.

Jenkinsfile

@@ -410,8 +410,8 @@ def otherJavaVersions = ["11", "16"]
 def allJavaVersions = otherJavaVersions.clone()
 allJavaVersions << mainJavaVersion
 
-def mainScalaVersion = "2.12.14"
-def mainScalaVersions = ["2.11.12", "2.12.14", "2.13.6"]
+def mainScalaVersion = "2.12.15"
+def mainScalaVersions = ["2.11.12", "2.12.15", "2.13.6"]
 def otherScalaVersions = [
   "2.11.12",
   "2.12.1",
@@ -427,6 +427,7 @@ def otherScalaVersions = [
   "2.12.11",
   "2.12.12",
   "2.12.13",
+  "2.12.14",
   "2.13.0",
   "2.13.1",
   "2.13.2",
@@ -475,7 +476,7 @@ allESVersions.each { esVersion ->
 allJavaVersions.each { javaVersion ->
   if (!isExcludedForScala211(javaVersion)) {
     // the sbt plugin tests want to compile everything for 2.11, 2.12 and 2.13
-    quickMatrix.add([task: "tools-sbtplugin", scala: "2.12.14", java: javaVersion])
+    quickMatrix.add([task: "tools-sbtplugin", scala: "2.12.15", java: javaVersion])
     quickMatrix.add([task: "tools", scala: "2.11.12", java: javaVersion])
   }
   quickMatrix.add([task: "tools", scala: "2.13.6", java: javaVersion])

project/MultiScalaProject.scala

@@ -79,7 +79,7 @@ object MultiScalaProject {
 
   private final val versions = Map[String, Seq[String]](
     "2.11" -> Seq("2.11.12"),
-    "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" -> 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"),
     "2.13" -> Seq("2.13.0", "2.13.1", "2.13.2", "2.13.3", "2.13.4", "2.13.5", "2.13.6"),
   )
 

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

@@ -1,4 +1,4 @@
-scalaVersion := "2.12.14"
+scalaVersion := "2.12.15"
 
 enablePlugins(ScalaJSPlugin)
 

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

@@ -1,4 +1,4 @@
-scalaVersion := "2.12.14"
+scalaVersion := "2.12.15"
 
 enablePlugins(ScalaJSPlugin)
 

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

@@ -1,4 +1,4 @@
-scalaVersion := "2.12.14"
+scalaVersion := "2.12.15"
 
 enablePlugins(ScalaJSPlugin)
 

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

@@ -11,7 +11,7 @@ lazy val concurrentUseOfLinkerTest = taskKey[Any]("")
 name := "Scala.js sbt test"
 
 version := scalaJSVersion
-scalaVersion := "2.12.14"
+scalaVersion := "2.12.15"
 
 enablePlugins(ScalaJSPlugin)
 

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

@@ -13,14 +13,14 @@
 
 inThisBuild(Def.settings(
   version := scalaJSVersion,
-  scalaVersion := "2.12.14",
+  scalaVersion := "2.12.15",
 ))
 
 lazy val check = taskKey[Any]("")
 
 lazy val customLinker = project.in(file("custom-linker"))
   .settings(
-    scalaVersion := "2.12.14", // needs to match the minor version of Scala used by sbt
+    scalaVersion := "2.12.15", // needs to match the minor version of Scala used by sbt
     libraryDependencies += "org.scala-js" %% "scalajs-linker" % scalaJSVersion,
   )
 

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

@@ -1,7 +1,7 @@
 name := "Scala.js sbt test"
 
 version in ThisBuild := scalaJSVersion
-scalaVersion in ThisBuild := "2.12.14"
+scalaVersion in ThisBuild := "2.12.15"
 
 // Disable the IvyPlugin on the root project
 disablePlugins(sbt.plugins.IvyPlugin)

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

@@ -1,5 +1,5 @@
 version := scalaJSVersion
-scalaVersion := "2.12.14"
+scalaVersion := "2.12.15"
 
 enablePlugins(ScalaJSPlugin)
 

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

@@ -3,7 +3,7 @@ import org.scalajs.sbtplugin.ScalaJSCrossVersion
 val check = taskKey[Unit]("Run checks of this test")
 
 version := scalaJSVersion
-scalaVersion := "2.12.14"
+scalaVersion := "2.12.15"
 
 lazy val js = project.enablePlugins(ScalaJSPlugin).settings(
     check := {

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

@@ -1,4 +1,4 @@
 version := scalaJSVersion
-scalaVersion := "2.12.14"
+scalaVersion := "2.12.15"
 
 enablePlugins(ScalaJSPlugin)

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

@@ -1,7 +1,7 @@
 val checkNoClosure = taskKey[Unit]("Check that fullOptJS wasn't run with closure")
 
 version := scalaJSVersion
-scalaVersion := "2.12.14"
+scalaVersion := "2.12.15"
 
 enablePlugins(ScalaJSPlugin)
 

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

@@ -3,7 +3,7 @@ import org.scalajs.linker.interface.ModuleInitializer
 val check = taskKey[Unit]("Run checks of this test")
 
 version := scalaJSVersion
-scalaVersion := "2.12.14"
+scalaVersion := "2.12.15"
 
 enablePlugins(ScalaJSPlugin)
 

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

@@ -3,7 +3,7 @@ import org.scalajs.linker.interface.ModuleInitializer
 val check = taskKey[Unit]("Run checks of this test")
 
 version := scalaJSVersion
-scalaVersion := "2.12.14"
+scalaVersion := "2.12.15"
 
 enablePlugins(ScalaJSPlugin)
 

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

@@ -1,5 +1,5 @@
 inThisBuild(version := scalaJSVersion)
-inThisBuild(scalaVersion := "2.12.14")
+inThisBuild(scalaVersion := "2.12.15")
 
 lazy val root = project.in(file(".")).
   aggregate(multiTestJS, multiTestJVM)

scala-test-suite/src/test/resources/2.12.15/BlacklistedTests.txt

@@ -0,0 +1,195 @@
+## Do not compile
+scala/lang/annotations/BytecodeTest.scala
+scala/lang/annotations/RunTest.scala
+scala/lang/traits/BytecodeTest.scala
+scala/lang/traits/RunTest.scala
+scala/lang/primitives/NaNTest.scala
+scala/lang/primitives/BoxUnboxTest.scala
+scala/collection/SeqTest.scala
+scala/collection/Sizes.scala
+scala/collection/immutable/HashMapTest.scala
+scala/collection/immutable/HashSetTest.scala
+scala/collection/immutable/ListMapTest.scala
+scala/collection/immutable/MapHashcodeTest.scala
+scala/collection/immutable/SetTest.scala
+scala/collection/immutable/SeqTest.scala
+scala/collection/immutable/SmallMapTest.scala
+scala/collection/immutable/SortedMapTest.scala
+scala/collection/immutable/SortedSetTest.scala
+scala/collection/immutable/TreeMapTest.scala
+scala/collection/immutable/TreeSetTest.scala
+scala/collection/mutable/ListBufferTest.scala
+scala/reflect/ClassOfTest.scala
+scala/reflect/QTest.scala
+scala/reflect/io/AbstractFileTest.scala
+scala/reflect/io/ZipArchiveTest.scala
+scala/reflect/internal/util/AbstractFileClassLoaderTest.scala
+scala/reflect/internal/util/FileUtilsTest.scala
+scala/reflect/internal/util/SourceFileTest.scala
+scala/reflect/internal/util/StringOpsTest.scala
+scala/reflect/internal/util/WeakHashSetTest.scala
+scala/reflect/internal/LongNamesTest.scala
+scala/reflect/internal/MirrorsTest.scala
+scala/reflect/internal/NamesTest.scala
+scala/reflect/internal/PositionsTest.scala
+scala/reflect/internal/PrintersTest.scala
+scala/reflect/internal/ScopeTest.scala
+scala/reflect/internal/TreeGenTest.scala
+scala/reflect/internal/TypesTest.scala
+scala/reflect/macros/AttachmentsTest.scala
+scala/reflect/runtime/ReflectionUtilsShowTest.scala
+scala/reflect/runtime/ThreadSafetyTest.scala
+scala/runtime/BooleanBoxingTest.scala
+scala/runtime/ByteBoxingTest.scala
+scala/runtime/CharBoxingTest.scala
+scala/runtime/DoubleBoxingTest.scala
+scala/runtime/IntBoxingTest.scala
+scala/runtime/FloatBoxingTest.scala
+scala/runtime/LongBoxingTest.scala
+scala/runtime/ShortBoxingTest.scala
+scala/tools/cmd/CommandLineParserTest.scala
+scala/tools/nsc/Build.scala
+scala/tools/nsc/DeterminismTest.scala
+scala/tools/nsc/DeterminismTester.scala
+scala/tools/nsc/FileUtils.scala
+scala/tools/nsc/GlobalCustomizeClassloaderTest.scala
+scala/tools/nsc/PickleWriteTest.scala
+scala/tools/nsc/PipelineMainTest.scala
+scala/tools/nsc/async/AnnotationDrivenAsync.scala
+scala/tools/nsc/async/CustomFuture.scala
+scala/tools/nsc/backend/jvm/BTypesTest.scala
+scala/tools/nsc/backend/jvm/BytecodeTest.scala
+scala/tools/nsc/backend/jvm/DefaultMethodTest.scala
+scala/tools/nsc/backend/jvm/DirectCompileTest.scala
+scala/tools/nsc/backend/jvm/GenericSignaturesTest.scala
+scala/tools/nsc/backend/jvm/IndyLambdaDirectTest.scala
+scala/tools/nsc/backend/jvm/IndyLambdaTest.scala
+scala/tools/nsc/backend/jvm/IndySammyTest.scala
+scala/tools/nsc/backend/jvm/InnerClassAttributeTest.scala
+scala/tools/nsc/backend/jvm/LineNumberTest.scala
+scala/tools/nsc/backend/jvm/NestedClassesCollectorTest.scala
+scala/tools/nsc/backend/jvm/OptimizedBytecodeTest.scala
+scala/tools/nsc/backend/jvm/PerRunInitTest.scala
+scala/tools/nsc/backend/jvm/StringConcatTest.scala
+scala/tools/nsc/backend/jvm/analysis/NullnessAnalyzerTest.scala
+scala/tools/nsc/backend/jvm/analysis/ProdConsAnalyzerTest.scala
+scala/tools/nsc/backend/jvm/opt/AnalyzerTest.scala
+scala/tools/nsc/backend/jvm/opt/BoxUnboxAndInlineTest.scala
+scala/tools/nsc/backend/jvm/opt/BoxUnboxTest.scala
+scala/tools/nsc/backend/jvm/opt/BTypesFromClassfileTest.scala
+scala/tools/nsc/backend/jvm/opt/CallGraphTest.scala
+scala/tools/nsc/backend/jvm/opt/ClosureOptimizerTest.scala
+scala/tools/nsc/backend/jvm/opt/CompactLocalVariablesTest.scala
+scala/tools/nsc/backend/jvm/opt/EmptyExceptionHandlersTest.scala
+scala/tools/nsc/backend/jvm/opt/EmptyLabelsAndLineNumbersTest.scala
+scala/tools/nsc/backend/jvm/opt/InlineInfoTest.scala
+scala/tools/nsc/backend/jvm/opt/InlinerIllegalAccessTest.scala
+scala/tools/nsc/backend/jvm/opt/InlinerSeparateCompilationTest.scala
+scala/tools/nsc/backend/jvm/opt/InlinerTest.scala
+scala/tools/nsc/backend/jvm/opt/InlineSourceMatcherTest.scala
+scala/tools/nsc/backend/jvm/opt/InlineWarningTest.scala
+scala/tools/nsc/backend/jvm/opt/MethodLevelOptsTest.scala
+scala/tools/nsc/backend/jvm/opt/ScalaInlineInfoTest.scala
+scala/tools/nsc/backend/jvm/opt/SimplifyJumpsTest.scala
+scala/tools/nsc/backend/jvm/opt/UnreachableCodeTest.scala
+scala/tools/nsc/backend/jvm/opt/UnusedLocalVariablesTest.scala
+scala/tools/nsc/ScriptRunnerTest.scala
+scala/tools/nsc/classpath/AggregateClassPathTest.scala
+scala/tools/nsc/classpath/JrtClassPathTest.scala
+scala/tools/nsc/classpath/MultiReleaseJarTest.scala
+scala/tools/nsc/classpath/PathResolverBaseTest.scala
+scala/tools/nsc/classpath/VirtualDirectoryClassPathTest.scala
+scala/tools/nsc/classpath/ZipAndJarFileLookupFactoryTest.scala
+scala/tools/nsc/doc/html/HtmlDocletTest.scala
+scala/tools/nsc/interpreter/CompletionTest.scala
+scala/tools/nsc/interpreter/ScriptedTest.scala
+scala/tools/nsc/interpreter/TabulatorTest.scala
+scala/tools/nsc/parser/ParserTest.scala
+scala/tools/nsc/reporters/ConsoleReporterTest.scala
+scala/tools/nsc/reporters/WConfTest.scala
+scala/tools/nsc/settings/ScalaVersionTest.scala
+scala/tools/nsc/settings/SettingsTest.scala
+scala/tools/nsc/symtab/CannotHaveAttrsTest.scala
+scala/tools/nsc/symtab/FlagsTest.scala
+scala/tools/nsc/symtab/FreshNameExtractorTest.scala
+scala/tools/nsc/symtab/StdNamesTest.scala
+scala/tools/nsc/symtab/SymbolLoadersAssociatedFileTest.scala
+scala/tools/nsc/symtab/SymbolTableForUnitTesting.scala
+scala/tools/nsc/symtab/SymbolTableTest.scala
+scala/tools/nsc/symtab/classfile/PicklerTest.scala
+scala/tools/nsc/transform/MixinTest.scala
+scala/tools/nsc/transform/SpecializationTest.scala
+scala/tools/nsc/transform/ThicketTransformerTest.scala
+scala/tools/nsc/transform/delambdafy/DelambdafyTest.scala
+scala/tools/nsc/transform/patmat/SolvingTest.scala
+scala/tools/nsc/transform/patmat/PatmatBytecodeTest.scala
+scala/tools/nsc/typechecker/Implicits.scala
+scala/tools/nsc/typechecker/NamerTest.scala
+scala/tools/nsc/typechecker/ParamAliasTest.scala
+scala/tools/nsc/typechecker/TypedTreeTest.scala
+scala/tools/nsc/util/StackTraceTest.scala
+scala/tools/testing/AllocationTest.scala
+scala/tools/testing/AssertUtil.scala
+scala/tools/testing/BytecodeTesting.scala
+scala/tools/testing/JOL.scala
+scala/tools/testing/RunTesting.scala
+scala/tools/testing/VirtualCompilerTesting.scala
+scala/util/matching/RegexTest.scala
+
+## Do not link
+scala/MatchErrorSerializationTest.scala
+scala/PartialFunctionSerializationTest.scala
+scala/lang/stringinterpol/StringContextTest.scala
+scala/collection/IteratorTest.scala
+scala/collection/NewBuilderTest.scala
+scala/collection/ParallelConsistencyTest.scala
+scala/collection/SetMapRulesTest.scala
+scala/collection/SeqViewTest.scala
+scala/collection/SetMapConsistencyTest.scala
+scala/collection/concurrent/TrieMapTest.scala
+scala/collection/convert/WrapperSerializationTest.scala
+scala/collection/immutable/ListTest.scala
+scala/collection/immutable/RedBlackTreeSerialFormat.scala
+scala/collection/immutable/StreamTest.scala
+scala/collection/immutable/StringLikeTest.scala
+scala/collection/mutable/AnyRefMapTest.scala
+scala/collection/mutable/ArrayBufferTest.scala
+scala/collection/mutable/MutableListTest.scala
+scala/collection/mutable/OpenHashMapTest.scala
+scala/collection/mutable/PriorityQueueTest.scala
+scala/collection/parallel/TaskTest.scala
+scala/collection/parallel/immutable/ParRangeTest.scala
+scala/concurrent/FutureTest.scala
+scala/concurrent/duration/SerializationTest.scala
+scala/concurrent/impl/DefaultPromiseTest.scala
+scala/io/SourceTest.scala
+scala/runtime/ScalaRunTimeTest.scala
+scala/sys/process/PipedProcessTest.scala
+scala/sys/process/ProcessTest.scala
+scala/tools/testing/AssertUtilTest.scala
+scala/tools/testing/AssertThrowsTest.scala
+scala/util/SpecVersionTest.scala
+scala/util/SystemPropertiesTest.scala
+
+## Tests fail
+
+# Reflection
+scala/reflect/ClassTagTest.scala
+
+# Require strict-floats
+scala/math/BigDecimalTest.scala
+
+# Difference of getClass() on primitive values
+scala/collection/immutable/RangeTest.scala
+
+# Test fails only some times with
+#   'set scalaJSOptimizerOptions in scalaTestSuite ~= (_.withDisableOptimizer(true))'
+#   and' 'set scalaJSUseRhino in Global := false'
+scala/collection/immutable/PagedSeqTest.scala
+
+# Bugs
+scala/collection/convert/MapWrapperTest.scala
+
+# Tests passed but are too slow (timeouts)
+scala/collection/immutable/ListSetTest.scala
+scala/util/SortingTest.scala