Merge pull request #12501 from dotty-staging/upgrade-scala-2.13.6

Upgrade to Scala 2.13.6, Scala.js 1.5.1, sbt 1.5.2

Author: smarter

compiler/src/dotty/tools/backend/sjs/JSExportsGen.scala

@@ -1083,14 +1083,14 @@ final class JSExportsGen(jsCodeGen: JSCodeGen)(using Context) {
       js.VarRef(js.LocalIdent(restParamName))(jstpe.AnyType)
     }
 
-    def genAllArgsRefsForForwarder()(implicit pos: Position): List[js.Tree] = {
+    def genAllArgsRefsForForwarder()(implicit pos: Position): List[js.TreeOrJSSpread] = {
       val fixedArgRefs = fixedParamNames.toList.map { paramName =>
         js.VarRef(js.LocalIdent(paramName))(jstpe.AnyType)
       }
 
       if (needsRestParam) {
         val restArgRef = js.VarRef(js.LocalIdent(restParamName))(jstpe.AnyType)
-        fixedArgRefs :+ restArgRef
+        fixedArgRefs :+ js.JSSpread(restArgRef)
       } else {
         fixedArgRefs
       }

project/Build.scala

@@ -104,8 +104,8 @@ object Build {
    *  scala-library.
    */
   def stdlibVersion(implicit mode: Mode): String = mode match {
-    case NonBootstrapped => "2.13.5"
-    case Bootstrapped => "2.13.5"
+    case NonBootstrapped => "2.13.6"
+    case Bootstrapped => "2.13.6"
   }
 
   val dottyOrganization = "org.scala-lang"
@@ -1173,12 +1173,10 @@ object Build {
             -- "ObjectTest.scala" // compile errors caused by #9588
             -- "StackTraceTest.scala" // would require `npm install source-map-support`
             -- "UnionTypeTest.scala" // requires the Scala 2 macro defined in Typechecking*.scala
-            -- "PromiseMock.scala" // TODO: Enable once we use a Scala.js with https://github.com/scala-js/scala-js/pull/4451 in
-                                   // and remove copy in tests/sjs-junit
             )).get
 
           ++ (dir / "js/src/test/require-2.12" ** (("*.scala": FileFilter)
-            -- "JSOptionalTest212.scala" // TODO: Enable once we use a Scala.js with https://github.com/scala-js/scala-js/pull/4451 in
+            -- "JSOptionalTest212FunParamInference.scala" // TODO: #11694
             )).get
           ++ (dir / "js/src/test/require-sam" ** "*.scala").get
           ++ (dir / "js/src/test/scala-new-collections" ** "*.scala").get
@@ -1387,6 +1385,7 @@ object Build {
       scriptedLaunchOpts ++= Seq(
         "-Dplugin.version=" + version.value,
         "-Dplugin.scalaVersion=" + dottyVersion,
+        "-Dplugin.scala2Version=" + stdlibVersion(Bootstrapped),
         "-Dplugin.scalaJSVersion=" + scalaJSVersion,
         "-Dsbt.boot.directory=" + ((ThisBuild / baseDirectory).value / ".sbt-scripted").getAbsolutePath // Workaround sbt/sbt#3469
       ),

project/build.properties

@@ -1 +1 @@
-sbt.version=1.5.0
+sbt.version=1.5.2

project/plugins.sbt

@@ -2,7 +2,7 @@
 //
 // e.g. addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.1.0")
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
 
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.6")
 

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

@@ -1,7 +1,7 @@
 lazy val scala2Lib = project.in(file("scala2Lib"))
   .enablePlugins(ScalaJSPlugin)
   .settings(
-    scalaVersion := "2.13.5"
+    scalaVersion := sys.props("plugin.scala2Version")
   )
 
 lazy val dottyApp = project.in(file("dottyApp"))

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

@@ -1,6 +1,6 @@
 lazy val scala2Lib = project.in(file("scala2Lib"))
   .settings(
-    scalaVersion := "2.13.5"
+    scalaVersion := sys.props("plugin.scala2Version")
   )
 
 lazy val dottyApp = project.in(file("dottyApp"))

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

@@ -1,5 +1,5 @@
 val scala3Version = sys.props("plugin.scalaVersion")
-val scala2Version = "2.13.5"
+val scala2Version = sys.props("plugin.scala2Version")
 
 lazy val lib = project.in(file("lib"))
   .settings(

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

@@ -1,5 +1,5 @@
 val scala3Version = sys.props("plugin.scalaVersion")
-val scala2Version = "2.13.5"
+val scala2Version = sys.props("plugin.scala2Version")
 
 lazy val lib = project.in(file("lib"))
   .settings(

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

@@ -1,5 +1,5 @@
 val scala3Version = sys.props("plugin.scalaVersion")
-val scala2Version = "2.13.5"
+val scala2Version = sys.props("plugin.scala2Version")
 
 lazy val lib = (project in file ("lib"))
   .settings(scalaVersion := scala2Version)

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

@@ -1,5 +1,5 @@
 val scala3Version = sys.props("plugin.scalaVersion")
-val scala2Version = "2.13.5"
+val scala2Version = sys.props("plugin.scala2Version")
 
 lazy val `i8847-lib` = (project in file ("lib"))
   .settings(scalaVersion := scala2Version)