summaryrefslogtreecommitdiff
path: root/scalajslib
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-02-11 01:24:31 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-02-11 01:24:31 -0800
commitde9e237c7f9cd3fe2939399527df17270cbd322a (patch)
tree3edfa0fb91122ba02934d5f88346544f4b4b81ed /scalajslib
parenta40be9487a39ca5d98444d1f7adc053adbc42649 (diff)
downloadmill-de9e237c7f9cd3fe2939399527df17270cbd322a.tar.gz
mill-de9e237c7f9cd3fe2939399527df17270cbd322a.tar.bz2
mill-de9e237c7f9cd3fe2939399527df17270cbd322a.zip
make ScalaJSModule override scalaLibraryDeps instead of overriding ivyDeps, to reduce the change for conflict
Diffstat (limited to 'scalajslib')
-rw-r--r--scalajslib/src/mill/scalajslib/ScalaJSModule.scala3
1 files changed, 1 insertions, 2 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()}")
}