Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump scala-js-cli to 1.15.0.1 #2738

Merged
merged 1 commit into from Feb 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions build.sc
Expand Up @@ -407,6 +407,7 @@ trait Core extends ScalaCliSbtModule with ScalaCliPublishModule with HasTests
| def ghName = "$ghName"
|
| def scalaJsVersion = "${Scala.scalaJs}"
| def scalaJsCliVersion = "${Scala.scalaJsCli}"
| def scalajsEnvJsdomNodejsVersion = "${Deps.scalaJsEnvJsdomNodejs.dep.version}"
| def scalaNativeVersion = "${Deps.nativeTools.dep.version}"
|
Expand Down Expand Up @@ -768,6 +769,7 @@ trait Cli extends SbtModule with ProtoBuildModule with CliLaunchers
|object Constants {
| def defaultScalaVersion = "${Scala.defaultUser}"
| def scalaJsVersion = "${Scala.scalaJs}"
| def scalaJsCliVersion = "${Scala.scalaJsCli}"
| def scalaNativeVersion = "${Deps.nativeTools.dep.version}"
| def ammoniteVersion = "${Deps.ammonite.dep.version}"
| def defaultScalafmtVersion = "${Deps.scalafmtCli.dep.version}"
Expand Down Expand Up @@ -954,6 +956,7 @@ trait CliIntegration extends SbtModule with ScalaCliPublishModule with HasTests
| def defaultScala = "${Scala.defaultUser}"
| def defaultScalafmtVersion = "${Deps.scalafmtCli.dep.version}"
| def scalaJsVersion = "${Scala.scalaJs}"
| def scalaJsCliVersion = "${Scala.scalaJsCli}"
| def scalaNativeVersion = "${Deps.nativeTools.dep.version}"
| def ammoniteVersion = "${Deps.ammonite.dep.version}"
| def defaultGraalVMJavaVersion = "${deps.graalVmJavaVersion}"
Expand Down
Expand Up @@ -87,7 +87,7 @@ final case class ScalaJsOptions(
@Hidden
jsLinkerPath: Option[String] = None,
@Group(HelpGroup.ScalaJs.toString)
@HelpMessage(s"Scala.js CLI version to use for linking (${Constants.scalaJsVersion} by default).")
@HelpMessage(s"Scala.js CLI version to use for linking (${Constants.scalaJsCliVersion} by default).")
@ValueDescription("version")
@Tag(tags.implementation)
@Hidden
Expand Down
Expand Up @@ -12,7 +12,7 @@ final case class ScalaJsLinkerOptions(
linkerPath: Option[os.Path] = None
) {
def finalScalaJsCliVersion = scalaJsCliVersion.orElse(scalaJsVersion).getOrElse {
Constants.scalaJsVersion
Constants.scalaJsCliVersion
}

/** If right, use JVM, if left, use the value as architecture */
Expand Down
3 changes: 2 additions & 1 deletion project/deps.sc
Expand Up @@ -19,7 +19,8 @@ object Scala {
val mainVersions = (Seq(scala3, scala213) ++ defaults).distinct
val runnerScalaVersions = runnerScala3 +: allScala2

def scalaJs = "1.15.0"
def scalaJs = "1.15.0"
def scalaJsCli = "1.15.0.1" // this must be compatible with the Scala.js version

def listAll: Seq[String] = {
def patchVer(sv: String): Int =
Expand Down
2 changes: 1 addition & 1 deletion website/docs/reference/cli-options.md
Expand Up @@ -1316,7 +1316,7 @@ Path to the Scala.js linker
### `--js-cli-version`

[Internal]
Scala.js CLI version to use for linking (1.15.0 by default).
Scala.js CLI version to use for linking (1.15.0.1 by default).

### `--js-cli-java-arg`

Expand Down
2 changes: 1 addition & 1 deletion website/docs/reference/scala-command/cli-options.md
Expand Up @@ -800,7 +800,7 @@ Path to the Scala.js linker

`IMPLEMENTATION specific` per Scala Runner specification

Scala.js CLI version to use for linking (1.15.0 by default).
Scala.js CLI version to use for linking (1.15.0.1 by default).

### `--js-cli-java-arg`

Expand Down
18 changes: 9 additions & 9 deletions website/docs/reference/scala-command/runner-specification.md
Expand Up @@ -402,7 +402,7 @@ Path to the Scala.js linker

**--js-cli-version**

Scala.js CLI version to use for linking (1.15.0 by default).
Scala.js CLI version to use for linking (1.15.0.1 by default).

**--js-cli-java-arg**

Expand Down Expand Up @@ -1147,7 +1147,7 @@ Path to the Scala.js linker

**--js-cli-version**

Scala.js CLI version to use for linking (1.15.0 by default).
Scala.js CLI version to use for linking (1.15.0.1 by default).

**--js-cli-java-arg**

Expand Down Expand Up @@ -1718,7 +1718,7 @@ Path to the Scala.js linker

**--js-cli-version**

Scala.js CLI version to use for linking (1.15.0 by default).
Scala.js CLI version to use for linking (1.15.0.1 by default).

**--js-cli-java-arg**

Expand Down Expand Up @@ -2319,7 +2319,7 @@ Path to the Scala.js linker

**--js-cli-version**

Scala.js CLI version to use for linking (1.15.0 by default).
Scala.js CLI version to use for linking (1.15.0.1 by default).

**--js-cli-java-arg**

Expand Down Expand Up @@ -2929,7 +2929,7 @@ Path to the Scala.js linker

**--js-cli-version**

Scala.js CLI version to use for linking (1.15.0 by default).
Scala.js CLI version to use for linking (1.15.0.1 by default).

**--js-cli-java-arg**

Expand Down Expand Up @@ -3497,7 +3497,7 @@ Path to the Scala.js linker

**--js-cli-version**

Scala.js CLI version to use for linking (1.15.0 by default).
Scala.js CLI version to use for linking (1.15.0.1 by default).

**--js-cli-java-arg**

Expand Down Expand Up @@ -4140,7 +4140,7 @@ Path to the Scala.js linker

**--js-cli-version**

Scala.js CLI version to use for linking (1.15.0 by default).
Scala.js CLI version to use for linking (1.15.0.1 by default).

**--js-cli-java-arg**

Expand Down Expand Up @@ -4790,7 +4790,7 @@ Path to the Scala.js linker

**--js-cli-version**

Scala.js CLI version to use for linking (1.15.0 by default).
Scala.js CLI version to use for linking (1.15.0.1 by default).

**--js-cli-java-arg**

Expand Down Expand Up @@ -5695,7 +5695,7 @@ Path to the Scala.js linker

**--js-cli-version**

Scala.js CLI version to use for linking (1.15.0 by default).
Scala.js CLI version to use for linking (1.15.0.1 by default).

**--js-cli-java-arg**

Expand Down