Skip to content

Commit 1bb7657

Browse files
Merge pull request #1477 from scala-steward/update/scalajs-sbt-test-adapter_2.13-1.11.0
Update scalajs-sbt-test-adapter_2.13 to 1.11.0
2 parents 30504be + 614e7f1 commit 1bb7657

File tree

5 files changed

+13
-8
lines changed

5 files changed

+13
-8
lines changed

modules/cli/src/main/scala/scala/cli/internal/ScalaJsLinker.scala

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package scala.cli.internal
22

33
import coursier.Repositories
44
import coursier.cache.{ArchiveCache, FileCache}
5+
import coursier.core.Version
56
import coursier.util.Task
67
import dependency._
78
import org.scalajs.testing.adapter.{TestAdapterInitializer => TAI}
@@ -37,7 +38,10 @@ object ScalaJsLinker {
3738
val scalaJsCliDep = {
3839
val mod =
3940
if (scalaJsCliVersion.contains("-sc"))
40-
mod"io.github.alexarchambault.tmp:scalajs-cli_2.13"
41+
if (Version(scalaJsCliVersion) < Version("1.1.2-sc1"))
42+
mod"io.github.alexarchambault.tmp:scalajs-cli_2.13"
43+
else
44+
mod"io.github.alexarchambault.tmp:scalajscli-${scalaJsVersion}_2.13"
4145
else
4246
mod"org.scala-js:scalajs-cli_2.13"
4347
dependency.Dependency(mod, scalaJsCliVersion)

project/deps.sc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ object Scala {
1414
val mainVersions = Seq(scala3, scala213)
1515
val runnerScalaVersions = runnerScala3 +: allScala2
1616

17-
def scalaJs = "1.10.1"
17+
def scalaJs = "1.11.0"
1818

1919
def listAll: Seq[String] = {
2020
def patchVer(sv: String): Int =
@@ -74,7 +74,7 @@ object InternalDeps {
7474
object Versions {
7575
def mill = os.read(os.pwd / ".mill-version").trim
7676
def lefouMillwRef = "166bcdf5741de8569e0630e18c3b2ef7e252cd96"
77-
def scalaJsCli = "1.1.1-sc6"
77+
def scalaJsCli = "1.1.2-sc1"
7878
}
7979
}
8080

website/docs/guides/scala-js.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,4 +172,5 @@ The table below lists the last supported version of Scala.js in Scala CLI. If yo
172172
| 0.1.0 - 0.1.2 | 1.8.0 |
173173
| 0.1.3 | 1.9.0 |
174174
| 0.1.4 - 0.1.8 | 1.10.0 |
175-
| 0.1.9 - current | 1.10.1 |
175+
| 0.1.9 - 0.1.17 | 1.10.1 |
176+
| 0.1.18 - current | 1.11.0 |

website/docs/reference/cli-options.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,7 +1089,7 @@ Enable Scala.js. To show more options for Scala.js pass `--help-js`
10891089

10901090
### `--js-version`
10911091

1092-
The Scala.js version (1.10.1 by default).
1092+
The Scala.js version (1.11.0 by default).
10931093

10941094
### `--js-mode`
10951095

@@ -1149,7 +1149,7 @@ Path to the Scala.js linker
11491149
### `--js-cli-version`
11501150

11511151
[Internal]
1152-
Scala.js CLI version to use for linking (1.1.1-sc6 by default).
1152+
Scala.js CLI version to use for linking (1.1.2-sc1 by default).
11531153

11541154
### `--js-cli-java-arg`
11551155

website/docs/reference/scala-command/cli-options.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ Enable Scala.js. To show more options for Scala.js pass `--help-js`
505505

506506
### `--js-version`
507507

508-
The Scala.js version (1.10.1 by default).
508+
The Scala.js version (1.11.0 by default).
509509

510510
### `--js-mode`
511511

@@ -565,7 +565,7 @@ Path to the Scala.js linker
565565
### `--js-cli-version`
566566

567567
[Internal]
568-
Scala.js CLI version to use for linking (1.1.1-sc6 by default).
568+
Scala.js CLI version to use for linking (1.1.2-sc1 by default).
569569

570570
### `--js-cli-java-arg`
571571

0 commit comments

Comments
 (0)