diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-11 01:24:31 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-11 01:24:31 -0800 |
| commit | de9e237c7f9cd3fe2939399527df17270cbd322a (patch) | |
| tree | 3edfa0fb91122ba02934d5f88346544f4b4b81ed | |
| parent | a40be9487a39ca5d98444d1f7adc053adbc42649 (diff) | |
| download | mill-de9e237c7f9cd3fe2939399527df17270cbd322a.tar.gz mill-de9e237c7f9cd3fe2939399527df17270cbd322a.tar.bz2 mill-de9e237c7f9cd3fe2939399527df17270cbd322a.zip | |
make ScalaJSModule override scalaLibraryDeps instead of overriding ivyDeps, to reduce the change for conflict
| -rw-r--r-- | scalajslib/src/mill/scalajslib/ScalaJSModule.scala | 3 | ||||
| -rw-r--r-- | scalalib/src/mill/scalalib/ScalaModule.scala | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala index 5ab54716..7344b54a 100644 --- a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala +++ b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala @@ -150,8 +150,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer => super.scalacPluginIvyDeps() ++ Seq(ivy"org.scala-js:::scalajs-compiler:${scalaJSVersion()}") } - override def ivyDeps = T{ - super.ivyDeps() ++ + override def scalaLibraryDeps = T{ Seq(ivy"org.scala-js::scalajs-library:${scalaJSVersion()}") } diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala index 3c5d9479..9c30ad7c 100644 --- a/scalalib/src/mill/scalalib/ScalaModule.scala +++ b/scalalib/src/mill/scalalib/ScalaModule.scala @@ -106,6 +106,7 @@ trait ScalaModule extends mill.Module with TaskModule { outer => T.task{scalacPluginIvyDeps()} )() + def scalaLibraryDeps = T{ scalaRuntimeIvyDeps(scalaVersion()) } /** * Classpath of the Scala Compiler & any compiler plugins */ @@ -122,7 +123,7 @@ trait ScalaModule extends mill.Module with TaskModule { outer => Agg.from(upstreamRunClasspath().flatten) ++ depClasspath() ++ resolveDeps( - T.task{ivyDeps() ++ runIvyDeps() ++ scalaRuntimeIvyDeps(scalaVersion())} + T.task{ivyDeps() ++ runIvyDeps() ++ scalaLibraryDeps() } )() } |