From d2832203dfa4880afd1fe8f0a90d8db2e88e2dba Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Fri, 12 Jan 2018 01:39:33 -0800
Subject: - Better error reporting in `ReplApplyHandler` - Logger now prints a
 newline when transitioning to ticker-mode, to avoid over-writing anything on
 the current line - Consolidate `scalalib.Module` logic around
 `assemblyClasspath`

---
 scalalib/src/main/scala/mill/scalalib/Module.scala | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'scalalib/src')

diff --git a/scalalib/src/main/scala/mill/scalalib/Module.scala b/scalalib/src/main/scala/mill/scalalib/Module.scala
index 4437c08f..125fc288 100644
--- a/scalalib/src/main/scala/mill/scalalib/Module.scala
+++ b/scalalib/src/main/scala/mill/scalalib/Module.scala
@@ -36,7 +36,7 @@ trait TestModule extends Module with TaskModule {
       jvmOptions = forkArgs(),
       options = Seq(
         testFramework(),
-        (runDepClasspath().map(_.path) :+ compile().classes.path).distinct.mkString(" "),
+        assemblyClasspath().map(_.path).distinct.mkString(" "),
         Seq(compile().classes.path).mkString(" "),
         args.mkString(" "),
         outputPath.toString,
@@ -53,7 +53,7 @@ trait TestModule extends Module with TaskModule {
   def test(args: String*) = T.command{
     val (doneMsg, results) = TestRunner(
       testFramework(),
-      runDepClasspath().map(_.path) :+ compile().classes.path,
+      assemblyClasspath().map(_.path),
       Seq(compile().classes.path),
       args
     )
@@ -259,7 +259,7 @@ trait Module extends mill.Module with TaskModule { outer =>
   def run(args: String*) = T.command{
     subprocess(
       mainClass().getOrElse(throw new RuntimeException("No mainClass provided!")),
-      runDepClasspath().map(_.path) :+ compile().classes.path,
+      assemblyClasspath().map(_.path),
       forkArgs(),
       args,
       workingDir = ammonite.ops.pwd)
@@ -268,7 +268,7 @@ trait Module extends mill.Module with TaskModule { outer =>
   def runMain(mainClass: String, args: String*) = T.command{
     subprocess(
       mainClass,
-      runDepClasspath().map(_.path) :+ compile().classes.path,
+      assemblyClasspath().map(_.path),
       forkArgs(),
       args,
       workingDir = ammonite.ops.pwd
-- 
cgit v1.2.3