diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-11 01:52:32 -0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-11 01:52:32 -0800 |
commit | 2063febc08963321c367a516b3498d16c21b34ee (patch) | |
tree | 17ab661532e23ca387eb99fd11724c8d05257a23 /scalajslib/src | |
parent | de9e237c7f9cd3fe2939399527df17270cbd322a (diff) | |
download | mill-2063febc08963321c367a516b3498d16c21b34ee.tar.gz mill-2063febc08963321c367a516b3498d16c21b34ee.tar.bz2 mill-2063febc08963321c367a516b3498d16c21b34ee.zip |
Refactor ScalaModule to simplify it and delay ivy resolution until the last moment
Diffstat (limited to 'scalajslib/src')
-rw-r--r-- | scalajslib/src/mill/scalajslib/ScalaJSModule.scala | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala index 7344b54a..018d098c 100644 --- a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala +++ b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala @@ -70,7 +70,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer => ScalaJSBridge.scalaJSBridge(), toolsClasspath(), Seq(compile()), - compileDepClasspath(), + runClasspath(), mainClass(), FastOpt ) @@ -81,7 +81,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer => ScalaJSBridge.scalaJSBridge(), toolsClasspath(), Seq(compile()), - compileDepClasspath(), + runClasspath(), mainClass(), FullOpt ) @@ -107,7 +107,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer => ScalaJSBridge.scalaJSBridge(), toolsClasspath(), Seq(compile()), - compileDepClasspath(), + runClasspath(), Some(mainClass), FastOpt ) @@ -150,7 +150,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer => super.scalacPluginIvyDeps() ++ Seq(ivy"org.scala-js:::scalajs-compiler:${scalaJSVersion()}") } - override def scalaLibraryDeps = T{ + override def scalaLibraryIvyDeps = T{ Seq(ivy"org.scala-js::scalajs-library:${scalaJSVersion()}") } @@ -183,7 +183,7 @@ trait TestScalaJSModule extends ScalaJSModule with TestModule { ScalaJSBridge.scalaJSBridge(), toolsClasspath(), compile() +: upstreamCompileOutput(), - scalaJSTestDeps() ++ compileDepClasspath(), + scalaJSTestDeps() ++ runClasspath(), None, FastOpt ) |