diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2017-12-31 01:13:59 -0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2017-12-31 01:21:13 -0800 |
commit | 7e8d847b29c733b43ae150d5a199f0a71ee02bf3 (patch) | |
tree | a6def0f3cc641d5e456c40ab3d8fdd77bbd2d1f5 /core/src/test/scala | |
parent | 13f896a36eb275de9784ce3400dde09311afd6bd (diff) | |
download | mill-7e8d847b29c733b43ae150d5a199f0a71ee02bf3.tar.gz mill-7e8d847b29c733b43ae150d5a199f0a71ee02bf3.tar.bz2 mill-7e8d847b29c733b43ae150d5a199f0a71ee02bf3.zip |
Split out generic `T.input` tasks from the `T.source` helpers, allowing `T.source` to behave as before but `T.input` can be used for other things. Fixes https://github.com/lihaoyi/mill/issues/77
Diffstat (limited to 'core/src/test/scala')
-rw-r--r-- | core/src/test/scala/mill/eval/JavaCompileJarTests.scala | 8 | ||||
-rw-r--r-- | core/src/test/scala/mill/util/TestEvaluator.scala | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/src/test/scala/mill/eval/JavaCompileJarTests.scala b/core/src/test/scala/mill/eval/JavaCompileJarTests.scala index 667aaa22..95ad6669 100644 --- a/core/src/test/scala/mill/eval/JavaCompileJarTests.scala +++ b/core/src/test/scala/mill/eval/JavaCompileJarTests.scala @@ -2,7 +2,7 @@ package mill.eval import ammonite.ops.ImplicitWd._ import ammonite.ops._ -import mill.define.{Source, Target, Task} +import mill.define.{Input, Target, Task} import mill.discover.Discovered import mill.modules.Jvm import mill.util.Ctx.DestCtx @@ -36,8 +36,8 @@ object JavaCompileJarTests extends TestSuite{ // | // v // resourceRoot ----> jar - def sourceRoot = T.source{ PathRef(sourceRootPath) } - def resourceRoot = T.source{ PathRef(resourceRootPath) } + def sourceRoot = T.source{ sourceRootPath } + def resourceRoot = T.source{ resourceRootPath } def allSources = T{ ls.rec(sourceRoot().path).map(PathRef(_)) } def classFiles = T{ compileAll(allSources()) } def jar = T{ Jvm.createJar(Seq(resourceRoot().path, classFiles().path)) } @@ -74,7 +74,7 @@ object JavaCompileJarTests extends TestSuite{ .evaluated .flatMap(_.asTarget) .filter(mapping.targets.contains) - .filter(!_.isInstanceOf[Source[_]]) + .filter(!_.isInstanceOf[Input[_]]) assert(evaluated == expected) } diff --git a/core/src/test/scala/mill/util/TestEvaluator.scala b/core/src/test/scala/mill/util/TestEvaluator.scala index 6ae90167..646ca418 100644 --- a/core/src/test/scala/mill/util/TestEvaluator.scala +++ b/core/src/test/scala/mill/util/TestEvaluator.scala @@ -1,7 +1,7 @@ package mill.util import ammonite.ops.Path -import mill.define.{Source, Target, Task} +import mill.define.{Input, Target, Task} import mill.discover.{Discovered, Mirror} import mill.eval.{Evaluator, Result} @@ -18,7 +18,7 @@ class TestEvaluator(mapping: Discovered.Mapping[_], Tuple2( evaluated.rawValues.head.asInstanceOf[Result.Success[T]].value, evaluated.evaluated.collect { - case t: Target[_] if mapping.targets.contains(t) && !t.isInstanceOf[Source[_]] => t + case t: Target[_] if mapping.targets.contains(t) && !t.isInstanceOf[Input[_]] => t case t: mill.define.Command[_] => t }.size )) |