summaryrefslogtreecommitdiff
path: root/scalalib/src
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-01-12 01:39:33 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-01-12 01:39:33 -0800
commitd2832203dfa4880afd1fe8f0a90d8db2e88e2dba (patch)
tree57792cc2493a9a15d749d1e5cb75ce1d84b8febd /scalalib/src
parent865c8fc2c11ef5f364315be197226723a3a47821 (diff)
downloadmill-d2832203dfa4880afd1fe8f0a90d8db2e88e2dba.tar.gz
mill-d2832203dfa4880afd1fe8f0a90d8db2e88e2dba.tar.bz2
mill-d2832203dfa4880afd1fe8f0a90d8db2e88e2dba.zip
- 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`
Diffstat (limited to 'scalalib/src')
-rw-r--r--scalalib/src/main/scala/mill/scalalib/Module.scala8
1 files changed, 4 insertions, 4 deletions
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