summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2019-06-13 16:11:01 +0200
committerLi Haoyi <haoyi.sg@gmail.com>2019-06-13 16:11:01 +0200
commit0da4b9a210bdf8b1679548cf7651eb3bf8b10976 (patch)
treeee718eacc191338acbff15634704762224db3471
parent2dbc451d596805dc8999e9cdf98141647a351575 (diff)
downloadmill-0da4b9a210bdf8b1679548cf7651eb3bf8b10976.tar.gz
mill-0da4b9a210bdf8b1679548cf7651eb3bf8b10976.tar.bz2
mill-0da4b9a210bdf8b1679548cf7651eb3bf8b10976.zip
.
-rw-r--r--scalajslib/src/ScalaJSModule.scala13
1 files changed, 9 insertions, 4 deletions
diff --git a/scalajslib/src/ScalaJSModule.scala b/scalajslib/src/ScalaJSModule.scala
index 93fe2637..75eb8af2 100644
--- a/scalajslib/src/ScalaJSModule.scala
+++ b/scalajslib/src/ScalaJSModule.scala
@@ -41,13 +41,18 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
ivy"org.scala-js::scalajs-sbt-test-adapter:${scalaJSVersion()}"
)
val envDep = scalaJSBinaryVersion() match {
- case v if v.startsWith("0.6") => ivy"org.scala-js::scalajs-js-envs:${scalaJSVersion()}"
- case v if v.startsWith("1.0") => ivy"org.scala-js::scalajs-env-nodejs:${scalaJSVersion()}"
+ case v if v.startsWith("0.6") => Seq(ivy"org.scala-js::scalajs-js-envs:${scalaJSVersion()}")
+ case v if v.startsWith("1.0") =>
+ Seq(
+ ivy"org.scala-js::scalajs-env-nodejs:${scalaJSVersion()}",
+ ivy"org.scala-js::scalajs-env-jsdom-nodejs:${scalaJSVersion()}",
+ ivy"org.scala-js::scalajs-env-phantomjs:${scalaJSVersion()}"
+ )
}
resolveDependencies(
repositories,
Lib.depToDependency(_, "2.12.4", ""),
- commonDeps :+ envDep,
+ commonDeps ++ envDep,
ctx = Some(implicitly[mill.util.Ctx.Log])
)
}
@@ -147,7 +152,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
override def platformSuffix = s"_sjs${artifactScalaJSVersion()}"
- def jsEnvConfig = T { JsEnvConfig.NodeJs() }
+ def jsEnvConfig: T[JsEnvConfig] = T { JsEnvConfig.NodeJs() }
def moduleKind: T[ModuleKind] = T { ModuleKind.NoModule }
}