From de9e237c7f9cd3fe2939399527df17270cbd322a Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Sun, 11 Feb 2018 01:24:31 -0800
Subject: make ScalaJSModule override scalaLibraryDeps instead of overriding
 ivyDeps, to reduce the change for conflict

---
 scalajslib/src/mill/scalajslib/ScalaJSModule.scala | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'scalajslib')

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()}")
   }
 
-- 
cgit v1.2.3