Refactor ScalaModule to simplify it and delay ivy resolution until the last moment

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
     )