summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/src/mill/eval/Evaluator.scala1
-rw-r--r--main/test/src/mill/define/CacherTests.scala4
-rw-r--r--main/test/src/mill/eval/CrossTests.scala2
-rw-r--r--main/test/src/mill/eval/EvaluationTests.scala5
-rw-r--r--main/test/src/mill/eval/FailureTests.scala2
-rw-r--r--main/test/src/mill/eval/JavaCompileJarTests.scala1
-rw-r--r--main/test/src/mill/eval/ModuleTests.scala2
-rw-r--r--main/test/src/mill/eval/TaskTests.scala2
-rw-r--r--main/test/src/mill/main/MainTests.scala11
-rw-r--r--main/test/src/mill/util/TestEvaluator.scala9
-rw-r--r--main/test/src/mill/util/TestGraphs.scala7
-rw-r--r--scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala4
-rw-r--r--scalalib/test/src/mill/scalalib/GenIdeaTests.scala2
-rw-r--r--scalalib/test/src/mill/scalalib/HelloWorldTests.scala8
14 files changed, 29 insertions, 31 deletions
diff --git a/core/src/mill/eval/Evaluator.scala b/core/src/mill/eval/Evaluator.scala
index de0f2660..85dcf877 100644
--- a/core/src/mill/eval/Evaluator.scala
+++ b/core/src/mill/eval/Evaluator.scala
@@ -39,7 +39,6 @@ case class Evaluator[T](outPath: Path,
val topoSorted = Graph.topoSorted(transitive)
val sortedGroups = Graph.groupAroundImportantTargets(topoSorted){
case t: NamedTask[Any] =>
-
val segments = t.ctx.segments
val finalTaskOverrides = t match{
case t: Target[_] =>
diff --git a/main/test/src/mill/define/CacherTests.scala b/main/test/src/mill/define/CacherTests.scala
index 606de846..03232930 100644
--- a/main/test/src/mill/define/CacherTests.scala
+++ b/main/test/src/mill/define/CacherTests.scala
@@ -7,7 +7,7 @@ import mill.T
import mill.eval.Result.Success
import utest._
import utest.framework.TestPath
-import mill.util.TestEvaluator.implicitDisover
+
object CacherTests extends TestSuite{
object Base extends Base
@@ -27,7 +27,7 @@ object CacherTests extends TestSuite{
val tests = Tests{
def eval[T <: TestUtil.BaseModule, V](mapping: T, v: Task[V])
- (implicit discover: Discover[T], tp: TestPath) = {
+ (implicit tp: TestPath) = {
val evaluator = new TestEvaluator(mapping)
evaluator(v).right.get._1
}
diff --git a/main/test/src/mill/eval/CrossTests.scala b/main/test/src/mill/eval/CrossTests.scala
index aa12e180..3dec0222 100644
--- a/main/test/src/mill/eval/CrossTests.scala
+++ b/main/test/src/mill/eval/CrossTests.scala
@@ -3,7 +3,7 @@ package mill.eval
import ammonite.ops._
import mill.define.Discover
import mill.util.TestEvaluator
-import mill.util.TestEvaluator.implicitDisover
+
import mill.util.TestGraphs.{crossResolved, doubleCross, nestedCrosses, singleCross}
import utest._
object CrossTests extends TestSuite{
diff --git a/main/test/src/mill/eval/EvaluationTests.scala b/main/test/src/mill/eval/EvaluationTests.scala
index da399449..3de78998 100644
--- a/main/test/src/mill/eval/EvaluationTests.scala
+++ b/main/test/src/mill/eval/EvaluationTests.scala
@@ -8,12 +8,11 @@ import mill.util.{DummyLogger, TestEvaluator, TestGraphs, TestUtil}
import mill.util.Strict.Agg
import utest._
import utest.framework.TestPath
-import mill.util.TestEvaluator.implicitDisover
+
import ammonite.ops._
object EvaluationTests extends TestSuite{
- class Checker[T <: TestUtil.BaseModule](module: T)
- (implicit tp: TestPath, discover: Discover[T]) {
+ class Checker[T <: TestUtil.BaseModule](module: T)(implicit tp: TestPath) {
// Make sure data is persisted even if we re-create the evaluator each time
def evaluator = new TestEvaluator(module).evaluator
diff --git a/main/test/src/mill/eval/FailureTests.scala b/main/test/src/mill/eval/FailureTests.scala
index 90cff686..244b084d 100644
--- a/main/test/src/mill/eval/FailureTests.scala
+++ b/main/test/src/mill/eval/FailureTests.scala
@@ -5,7 +5,7 @@ import ammonite.ops.{Path, pwd, rm}
import mill.eval.Result.OuterStack
import utest._
import utest.framework.TestPath
-import mill.util.TestEvaluator.implicitDisover
+
object FailureTests extends TestSuite{
diff --git a/main/test/src/mill/eval/JavaCompileJarTests.scala b/main/test/src/mill/eval/JavaCompileJarTests.scala
index 966c272f..0921ae6d 100644
--- a/main/test/src/mill/eval/JavaCompileJarTests.scala
+++ b/main/test/src/mill/eval/JavaCompileJarTests.scala
@@ -10,7 +10,6 @@ import mill.util.{DummyLogger, Loose, TestEvaluator, TestUtil}
import mill.util.Strict.Agg
import utest._
import mill._
-import TestEvaluator.implicitDisover
object JavaCompileJarTests extends TestSuite{
def compileAll(sources: Seq[PathRef])(implicit ctx: Dest) = {
mkdir(ctx.dest)
diff --git a/main/test/src/mill/eval/ModuleTests.scala b/main/test/src/mill/eval/ModuleTests.scala
index c6125b32..d2fa7184 100644
--- a/main/test/src/mill/eval/ModuleTests.scala
+++ b/main/test/src/mill/eval/ModuleTests.scala
@@ -4,7 +4,7 @@ import ammonite.ops._
import mill.util.{TestEvaluator, TestUtil}
import mill.T
import mill.define.Discover
-import mill.util.TestEvaluator.implicitDisover
+
import utest._
object ModuleTests extends TestSuite{
diff --git a/main/test/src/mill/eval/TaskTests.scala b/main/test/src/mill/eval/TaskTests.scala
index 114a2910..4ba65e17 100644
--- a/main/test/src/mill/eval/TaskTests.scala
+++ b/main/test/src/mill/eval/TaskTests.scala
@@ -3,7 +3,7 @@ package mill.eval
import utest._
import ammonite.ops._
import mill.T
-import mill.util.TestEvaluator.implicitDisover
+
import mill.util.TestEvaluator
object TaskTests extends TestSuite{
val tests = Tests{
diff --git a/main/test/src/mill/main/MainTests.scala b/main/test/src/mill/main/MainTests.scala
index fbf193e1..f9bf7aec 100644
--- a/main/test/src/mill/main/MainTests.scala
+++ b/main/test/src/mill/main/MainTests.scala
@@ -2,21 +2,20 @@ package mill.main
import mill.define.{Discover, Segment, Task}
import mill.util.TestGraphs._
-import mill.util.TestEvaluator.implicitDisover
+
import utest._
object MainTests extends TestSuite{
- def check[T <: mill.Module](module: T)(
- selectorString: String,
- expected0: Either[String, Seq[T => Task[_]]])
- (implicit discover: Discover[T])= {
+ def check[T <: mill.define.BaseModule](module: T)(
+ selectorString: String,
+ expected0: Either[String, Seq[T => Task[_]]])= {
val expected = expected0.map(_.map(_(module)))
val resolved = for{
selectors <- mill.util.ParseArgs(Seq(selectorString), multiSelect = false).map(_._1.head)
val crossSelectors = selectors._2.value.map{case Segment.Cross(x) => x.toList.map(_.toString) case _ => Nil}
task <- mill.main.ResolveTasks.resolve(
- selectors._2.value.toList, module, discover, Nil, crossSelectors.toList, Nil
+ selectors._2.value.toList, module, module.millDiscover, Nil, crossSelectors.toList, Nil
)
} yield task
assert(resolved == expected)
diff --git a/main/test/src/mill/util/TestEvaluator.scala b/main/test/src/mill/util/TestEvaluator.scala
index b35ebeb8..be91abaa 100644
--- a/main/test/src/mill/util/TestEvaluator.scala
+++ b/main/test/src/mill/util/TestEvaluator.scala
@@ -11,20 +11,17 @@ import utest.framework.TestPath
import language.experimental.macros
object TestEvaluator{
- implicit def implicitDisover[T]: Discover[T] = macro applyImpl[T]
val externalOutPath = pwd / 'target / 'external
def static[T <: TestUtil.BaseModule](module: T)
- (implicit discover: Discover[T],
- fullName: sourcecode.FullName) = {
- new TestEvaluator[T](module)(discover, fullName, TestPath(Nil))
+ (implicit fullName: sourcecode.FullName) = {
+ new TestEvaluator[T](module)(fullName, TestPath(Nil))
}
}
class TestEvaluator[T <: TestUtil.BaseModule](module: T)
- (implicit discover: Discover[T],
- fullName: sourcecode.FullName,
+ (implicit fullName: sourcecode.FullName,
tp: TestPath){
val outPath = TestUtil.getOutPath()
diff --git a/main/test/src/mill/util/TestGraphs.scala b/main/test/src/mill/util/TestGraphs.scala
index 581d5e0a..20f5c9ef 100644
--- a/main/test/src/mill/util/TestGraphs.scala
+++ b/main/test/src/mill/util/TestGraphs.scala
@@ -1,6 +1,6 @@
package mill.util
import TestUtil.test
-import mill.define.Cross
+import mill.define.{Cross, Discover}
import mill.{Module, T}
/**
@@ -180,6 +180,7 @@ object TestGraphs{
object canOverrideSuper extends TestUtil.BaseModule with BaseModule {
override def foo = T{ super.foo() ++ Seq("object") }
override def cmd(i: Int) = T.command{ super.cmd(i)() ++ Seq("object" + i) }
+ def millDiscover: Discover[this.type] = Discover[this.type]
}
trait TraitWithModule extends Module{ outer =>
@@ -191,7 +192,9 @@ object TestGraphs{
// Make sure nested objects inherited from traits work
- object TraitWithModuleObject extends TestUtil.BaseModule with TraitWithModule
+ object TraitWithModuleObject extends TestUtil.BaseModule with TraitWithModule{
+ def millDiscover: Discover[this.type] = Discover[this.type]
+ }
object singleCross extends TestUtil.BaseModule {
diff --git a/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala b/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
index 6738d7d3..f3dd7def 100644
--- a/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
+++ b/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
@@ -6,12 +6,13 @@ import javax.script.{ScriptContext, ScriptEngineManager}
import ammonite.ops._
import mill._
+import mill.define.Discover
import mill.eval.{Evaluator, Result}
import mill.scalalib.{CrossScalaModule, DepSyntax, Lib, PublishModule, TestRunner}
import mill.scalalib.publish.{Developer, License, PomSettings, SCM}
import mill.util.{TestEvaluator, TestUtil}
import utest._
-import mill.util.TestEvaluator.implicitDisover
+
import scala.collection.JavaConverters._
@@ -74,6 +75,7 @@ object HelloJSWorldTests extends TestSuite {
)
}
}
+ override def millDiscover = Discover[this.type]
}
val millSourcePath = pwd / 'scalajslib / 'test / 'resources / "hello-js-world"
diff --git a/scalalib/test/src/mill/scalalib/GenIdeaTests.scala b/scalalib/test/src/mill/scalalib/GenIdeaTests.scala
index 4f40bc5a..a6700824 100644
--- a/scalalib/test/src/mill/scalalib/GenIdeaTests.scala
+++ b/scalalib/test/src/mill/scalalib/GenIdeaTests.scala
@@ -5,7 +5,7 @@ import mill._
import mill.define.Discover
import mill.util.{TestEvaluator, TestUtil}
import utest._
-import mill.util.TestEvaluator.implicitDisover
+
object GenIdeaTests extends TestSuite {
val millSourcePath = pwd / 'target / 'workspace / "gen-idea"
diff --git a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala b/scalalib/test/src/mill/scalalib/HelloWorldTests.scala
index 7a788b1f..2499f09f 100644
--- a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala
+++ b/scalalib/test/src/mill/scalalib/HelloWorldTests.scala
@@ -10,7 +10,7 @@ import mill.eval.{Evaluator, Result}
import mill.scalalib.publish._
import mill.util.{TestEvaluator, TestUtil}
import utest._
-import mill.util.TestEvaluator.implicitDisover
+
import utest.framework.TestPath
import scala.collection.JavaConverters._
@@ -122,9 +122,9 @@ object HelloWorldTests extends TestSuite {
"Person$.class"
)
- def workspaceTest[T, M <: TestUtil.BaseModule: Discover](m: M, resourcePath: Path = resourcePath)
- (t: TestEvaluator[M] => T)
- (implicit tp: TestPath): T = {
+ def workspaceTest[T, M <: TestUtil.BaseModule](m: M, resourcePath: Path = resourcePath)
+ (t: TestEvaluator[M] => T)
+ (implicit tp: TestPath): T = {
val eval = new TestEvaluator(m)
rm(m.millSourcePath)
rm(eval.outPath)
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-18 20:42:54 +0000