Merge pull request #1477 from scala-steward/update/scalajs-sbt-test-a…

…dapter_2.13-1.11.0 Update scalajs-sbt-test-adapter_2.13 to 1.11.0
VirtusLab · Nov 17, 2022 · 1bb7657 · 1bb7657
2 parents 30504be + 614e7f1
commit 1bb7657
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/modules/cli/src/main/scala/scala/cli/internal/ScalaJsLinker.scala b/modules/cli/src/main/scala/scala/cli/internal/ScalaJsLinker.scala
@@ -2,6 +2,7 @@ package scala.cli.internal
 
 import coursier.Repositories
 import coursier.cache.{ArchiveCache, FileCache}
+import coursier.core.Version
 import coursier.util.Task
 import dependency._
 import org.scalajs.testing.adapter.{TestAdapterInitializer => TAI}
@@ -37,7 +38,10 @@ object ScalaJsLinker {
         val scalaJsCliDep = {
           val mod =
             if (scalaJsCliVersion.contains("-sc"))
-              mod"io.github.alexarchambault.tmp:scalajs-cli_2.13"
+              if (Version(scalaJsCliVersion) < Version("1.1.2-sc1"))
+                mod"io.github.alexarchambault.tmp:scalajs-cli_2.13"
+              else
+                mod"io.github.alexarchambault.tmp:scalajscli-${scalaJsVersion}_2.13"
             else
               mod"org.scala-js:scalajs-cli_2.13"
           dependency.Dependency(mod, scalaJsCliVersion)

diff --git a/project/deps.sc b/project/deps.sc
@@ -14,7 +14,7 @@ object Scala {
   val mainVersions = Seq(scala3, scala213)
   val runnerScalaVersions = runnerScala3 +: allScala2
 
-  def scalaJs = "1.10.1"
+  def scalaJs = "1.11.0"
 
   def listAll: Seq[String] = {
     def patchVer(sv: String): Int =
@@ -74,7 +74,7 @@ object InternalDeps {
   object Versions {
     def mill          = os.read(os.pwd / ".mill-version").trim
     def lefouMillwRef = "166bcdf5741de8569e0630e18c3b2ef7e252cd96"
-    def scalaJsCli    = "1.1.1-sc6"
+    def scalaJsCli    = "1.1.2-sc1"
   }
 }
 

diff --git a/website/docs/guides/scala-js.md b/website/docs/guides/scala-js.md
@@ -172,4 +172,5 @@ The table below lists the last supported version of Scala.js in Scala CLI. If yo
 | 0.1.0 - 0.1.2        |   1.8.0            |
 | 0.1.3                |   1.9.0            |
 | 0.1.4 - 0.1.8        |   1.10.0           |
-| 0.1.9 - current      |   1.10.1           |
+| 0.1.9 - 0.1.17       |   1.10.1           |
+| 0.1.18 - current     |   1.11.0           |
diff --git a/website/docs/reference/cli-options.md b/website/docs/reference/cli-options.md
@@ -1089,7 +1089,7 @@ Enable Scala.js. To show more options for Scala.js pass `--help-js`
 
 ### `--js-version`
 
-The Scala.js version (1.10.1 by default).
+The Scala.js version (1.11.0 by default).
 
 ### `--js-mode`
 
@@ -1149,7 +1149,7 @@ Path to the Scala.js linker
 ### `--js-cli-version`
 
 [Internal]
-Scala.js CLI version to use for linking (1.1.1-sc6 by default).
+Scala.js CLI version to use for linking (1.1.2-sc1 by default).
 
 ### `--js-cli-java-arg`
 

diff --git a/website/docs/reference/scala-command/cli-options.md b/website/docs/reference/scala-command/cli-options.md
@@ -505,7 +505,7 @@ Enable Scala.js. To show more options for Scala.js pass `--help-js`
 
 ### `--js-version`
 
-The Scala.js version (1.10.1 by default).
+The Scala.js version (1.11.0 by default).
 
 ### `--js-mode`
 
@@ -565,7 +565,7 @@ Path to the Scala.js linker
 ### `--js-cli-version`
 
 [Internal]
-Scala.js CLI version to use for linking (1.1.1-sc6 by default).
+Scala.js CLI version to use for linking (1.1.2-sc1 by default).
 
 ### `--js-cli-java-arg`