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

---
 scalalib/src/mill/scalalib/ScalaModule.scala | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'scalalib/src')

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