diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-07 07:55:07 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-07 09:16:47 -0800 |
| commit | e381552b992a5ba4743fa54f5111db9a2e9d98e2 (patch) | |
| tree | 394b6eace1d4e30f42c0790f31ed0b25cdcd17e5 /core/test | |
| parent | 3ba213bc51e33a54787d3a1e758384dff8052c1e (diff) | |
| download | mill-e381552b992a5ba4743fa54f5111db9a2e9d98e2.tar.gz mill-e381552b992a5ba4743fa54f5111db9a2e9d98e2.tar.bz2 mill-e381552b992a5ba4743fa54f5111db9a2e9d98e2.zip | |
attempt to fix publishAll
Diffstat (limited to 'core/test')
| -rw-r--r-- | core/test/src/mill/define/CacherTests.scala | 2 | ||||
| -rw-r--r-- | core/test/src/mill/eval/EvaluationTests.scala | 2 | ||||
| -rw-r--r-- | core/test/src/mill/util/TestEvaluator.scala | 4 | ||||
| -rw-r--r-- | core/test/src/mill/util/TestUtil.scala | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/core/test/src/mill/define/CacherTests.scala b/core/test/src/mill/define/CacherTests.scala index ce97202b..611db8c9 100644 --- a/core/test/src/mill/define/CacherTests.scala +++ b/core/test/src/mill/define/CacherTests.scala @@ -26,7 +26,7 @@ object CacherTests extends TestSuite{ } val tests = Tests{ - def eval[T <: TestUtil.TestBuild, V](mapping: T, v: Task[V]) + def eval[T <: TestUtil.BaseModule, V](mapping: T, v: Task[V]) (implicit discover: Discover[T], tp: TestPath) = { val evaluator = new TestEvaluator(mapping) evaluator(v).right.get._1 diff --git a/core/test/src/mill/eval/EvaluationTests.scala b/core/test/src/mill/eval/EvaluationTests.scala index 5b9936cb..9c4ace41 100644 --- a/core/test/src/mill/eval/EvaluationTests.scala +++ b/core/test/src/mill/eval/EvaluationTests.scala @@ -11,7 +11,7 @@ import utest.framework.TestPath import mill.util.TestEvaluator.implicitDisover import ammonite.ops._ object EvaluationTests extends TestSuite{ - class Checker[T <: TestUtil.TestBuild](module: T) + class Checker[T <: TestUtil.BaseModule](module: T) (implicit tp: TestPath, discover: Discover[T]) { // Make sure data is persisted even if we re-create the evaluator each time diff --git a/core/test/src/mill/util/TestEvaluator.scala b/core/test/src/mill/util/TestEvaluator.scala index c9230065..a5be0488 100644 --- a/core/test/src/mill/util/TestEvaluator.scala +++ b/core/test/src/mill/util/TestEvaluator.scala @@ -15,14 +15,14 @@ object TestEvaluator{ val externalOutPath = pwd / 'target / 'external - def static[T <: TestUtil.TestBuild](module: T) + def static[T <: TestUtil.BaseModule](module: T) (implicit discover: Discover[T], fullName: sourcecode.FullName) = { new TestEvaluator[T](module)(discover, fullName, TestPath(Nil)) } } -class TestEvaluator[T <: TestUtil.TestBuild](module: T) +class TestEvaluator[T <: TestUtil.BaseModule](module: T) (implicit discover: Discover[T], fullName: sourcecode.FullName, tp: TestPath){ diff --git a/core/test/src/mill/util/TestUtil.scala b/core/test/src/mill/util/TestUtil.scala index 93ea5ad8..9a5baf11 100644 --- a/core/test/src/mill/util/TestUtil.scala +++ b/core/test/src/mill/util/TestUtil.scala @@ -27,13 +27,13 @@ object TestUtil { pwd / 'target / 'worksources } - trait TestBuild extends mill.define.Module class BaseModule(implicit millModuleEnclosing0: sourcecode.Enclosing, millModuleLine0: sourcecode.Line, millName0: sourcecode.Name, overrides: Overrides) - extends mill.define.BaseModule(getSrcPathBase() / millModuleEnclosing0.value.split("\\.| |#")) - with TestBuild + extends mill.define.BaseModule(getSrcPathBase() / millModuleEnclosing0.value.split("\\.| |#")){ + def millDiscover: Discover[this.type] = Discover[this.type] + } object test{ |