From 3a6a57ec59baa1acc4d5f12a742eff69b1a278f0 Mon Sep 17 00:00:00 2001 From: Tom Grigg Date: Sat, 16 Jan 2021 08:52:13 -0800 Subject: [PATCH] Use a system property for the Scala.js version in sbt scripted tests Prevents the Scala.js version in the tests from getting out of sync with the rest of the build. --- project/Build.scala | 1 + sbt-dotty/sbt-test/scalajs/basic/project/plugins.sbt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/project/Build.scala b/project/Build.scala index 5600d934695c..e94257a073dc 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1256,6 +1256,7 @@ object Build { scriptedLaunchOpts ++= Seq( "-Dplugin.version=" + version.value, "-Dplugin.scalaVersion=" + dottyVersion, + "-Dplugin.scalaJSVersion=" + scalaJSVersion, "-Dsbt.boot.directory=" + ((baseDirectory in ThisBuild).value / ".sbt-scripted").getAbsolutePath // Workaround sbt/sbt#3469 ), // Pass along ivy home and repositories settings to sbt instances run from the tests diff --git a/sbt-dotty/sbt-test/scalajs/basic/project/plugins.sbt b/sbt-dotty/sbt-test/scalajs/basic/project/plugins.sbt index 70503e9f7c7a..f69df9c39cc7 100644 --- a/sbt-dotty/sbt-test/scalajs/basic/project/plugins.sbt +++ b/sbt-dotty/sbt-test/scalajs/basic/project/plugins.sbt @@ -1,2 +1,2 @@ addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version")) -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % sys.props("plugin.scalaJSVersion"))