summaryrefslogtreecommitdiff
path: root/core/src/test/scala/mill/eval/JavaCompileJarTests.scala
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2017-12-04 22:28:31 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2017-12-04 22:28:31 -0800
commit9aed4601a04a48b3192d1871ff0ebb98fa352726 (patch)
tree2d5c01a5fc935a177da4087550d140e54d3ac14d /core/src/test/scala/mill/eval/JavaCompileJarTests.scala
parent52f5a07a2b2b3f1885e83d09414aa3da385f4419 (diff)
downloadmill-9aed4601a04a48b3192d1871ff0ebb98fa352726.tar.gz
mill-9aed4601a04a48b3192d1871ff0ebb98fa352726.tar.bz2
mill-9aed4601a04a48b3192d1871ff0ebb98fa352726.zip
Standardize on a `mill.util.Logger` class
Diffstat (limited to 'core/src/test/scala/mill/eval/JavaCompileJarTests.scala')
-rw-r--r--core/src/test/scala/mill/eval/JavaCompileJarTests.scala10
1 files changed, 5 insertions, 5 deletions
diff --git a/core/src/test/scala/mill/eval/JavaCompileJarTests.scala b/core/src/test/scala/mill/eval/JavaCompileJarTests.scala
index 6c32f9b8..e0a43c6e 100644
--- a/core/src/test/scala/mill/eval/JavaCompileJarTests.scala
+++ b/core/src/test/scala/mill/eval/JavaCompileJarTests.scala
@@ -4,10 +4,10 @@ import ammonite.ops.ImplicitWd._
import ammonite.ops._
import mill.define.{Target, Task}
import mill.discover.Discovered
-import mill.modules.Jvm.jarUp
+import mill.modules.Jvm
import mill.util.Ctx.DestCtx
import mill.{Module, T}
-import mill.util.OSet
+import mill.util.{DummyLogger, OSet}
import utest._
object JavaCompileJarTests extends TestSuite{
@@ -39,7 +39,7 @@ object JavaCompileJarTests extends TestSuite{
def resourceRoot = T.source{ resourceRootPath }
def allSources = T{ ls.rec(sourceRoot().path).map(PathRef(_)) }
def classFiles = T{ compileAll(allSources()) }
- def jar = T{ jarUp(resourceRoot, classFiles) }
+ def jar = T{ Jvm.createJar(Seq(resourceRoot().path, classFiles().path)) }
def run(mainClsName: String) = T.command{
%%('java, "-cp", classFiles().path, mainClsName)
@@ -50,7 +50,7 @@ object JavaCompileJarTests extends TestSuite{
val mapping = Discovered.mapping(Build)
def eval[T](t: Task[T]): Either[Result.Failing, (T, Int)] = {
- val evaluator = new Evaluator(workspacePath, mapping, _ => ())
+ val evaluator = new Evaluator(workspacePath, mapping, DummyLogger)
val evaluated = evaluator.evaluate(OSet(t))
if (evaluated.failing.keyCount == 0){
@@ -67,7 +67,7 @@ object JavaCompileJarTests extends TestSuite{
}
def check(targets: OSet[Task[_]], expected: OSet[Task[_]]) = {
- val evaluator = new Evaluator(workspacePath, mapping, _ => ())
+ val evaluator = new Evaluator(workspacePath, mapping, DummyLogger)
val evaluated = evaluator.evaluate(targets)
.evaluated