Skip to content

Commit a20276a

Browse files
authored
Merge pull request #11138 from griggt/fix-#11137
Fix #11137: Use a system property for the Scala.js version in sbt scripted tests
2 parents ba70cc0 + 3a6a57e commit a20276a

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

project/Build.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,6 +1256,7 @@ object Build {
12561256
scriptedLaunchOpts ++= Seq(
12571257
"-Dplugin.version=" + version.value,
12581258
"-Dplugin.scalaVersion=" + dottyVersion,
1259+
"-Dplugin.scalaJSVersion=" + scalaJSVersion,
12591260
"-Dsbt.boot.directory=" + ((baseDirectory in ThisBuild).value / ".sbt-scripted").getAbsolutePath // Workaround sbt/sbt#3469
12601261
),
12611262
// Pass along ivy home and repositories settings to sbt instances run from the tests
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))
2-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.0")
2+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % sys.props("plugin.scalaJSVersion"))

0 commit comments

Comments
 (0)