From 0da4b9a210bdf8b1679548cf7651eb3bf8b10976 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Thu, 13 Jun 2019 16:11:01 +0200 Subject: . --- scalajslib/src/ScalaJSModule.scala | 13 +++++++++---- 1 file 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 } } -- cgit v1.2.3