vendor ammonite.main code so we can properly handle arity-0 CLI args, fix GenIdea by making it take an Evaluator as an argument

7 files changed, 3 insertions, 8 deletions

diff --git a/core/test/src/mill/define/CacherTests.scala b/core/test/src/mill/define/CacherTests.scala
index 077fea8d..606de846 100644
--- a/core/test/src/mill/define/CacherTests.scala
+++ b/core/test/src/mill/define/CacherTests.scala
@@ -9,7 +9,6 @@ import utest._
 import utest.framework.TestPath
 import mill.util.TestEvaluator.implicitDisover
 
-import TargetScopt.millScoptTargetReads
 object CacherTests extends TestSuite{
   object Base extends Base
   trait Base extends TestUtil.BaseModule{
diff --git a/core/test/src/mill/eval/CrossTests.scala b/core/test/src/mill/eval/CrossTests.scala
index 4e772a40..aa12e180 100644
--- a/core/test/src/mill/eval/CrossTests.scala
+++ b/core/test/src/mill/eval/CrossTests.scala
@@ -1,12 +1,11 @@
 package mill.eval
 
 import ammonite.ops._
-import mill.define.{Discover, TargetScopt}
+import mill.define.Discover
 import mill.util.TestEvaluator
 import mill.util.TestEvaluator.implicitDisover
 import mill.util.TestGraphs.{crossResolved, doubleCross, nestedCrosses, singleCross}
 import utest._
-import TargetScopt.millScoptTargetReads
 object CrossTests extends TestSuite{
   val tests = Tests{
     'singleCross - {
diff --git a/core/test/src/mill/eval/FailureTests.scala b/core/test/src/mill/eval/FailureTests.scala
index 6bf53f7c..90cff686 100644
--- a/core/test/src/mill/eval/FailureTests.scala
+++ b/core/test/src/mill/eval/FailureTests.scala
@@ -6,7 +6,7 @@ import mill.eval.Result.OuterStack
 import utest._
 import utest.framework.TestPath
 import mill.util.TestEvaluator.implicitDisover
-import mill.define.TargetScopt.millScoptTargetReads
+
 object FailureTests extends TestSuite{
 
   val tests = Tests{
diff --git a/core/test/src/mill/eval/ModuleTests.scala b/core/test/src/mill/eval/ModuleTests.scala
index 278b46cc..c6125b32 100644
--- a/core/test/src/mill/eval/ModuleTests.scala
+++ b/core/test/src/mill/eval/ModuleTests.scala
@@ -6,7 +6,6 @@ import mill.T
 import mill.define.Discover
 import mill.util.TestEvaluator.implicitDisover
 import utest._
-import mill.define.TargetScopt.millScoptTargetReads
 
 object ModuleTests extends TestSuite{
   object ExternalModule extends mill.define.ExternalModule {
diff --git a/core/test/src/mill/eval/TaskTests.scala b/core/test/src/mill/eval/TaskTests.scala
index ea82677d..114a2910 100644
--- a/core/test/src/mill/eval/TaskTests.scala
+++ b/core/test/src/mill/eval/TaskTests.scala
@@ -5,7 +5,6 @@ import ammonite.ops._
 import mill.T
 import mill.util.TestEvaluator.implicitDisover
 import mill.util.TestEvaluator
-import mill.define.TargetScopt.millScoptTargetReads
 object TaskTests extends TestSuite{
   val tests = Tests{
     object build extends mill.util.TestUtil.BaseModule{
diff --git a/core/test/src/mill/main/MainTests.scala b/core/test/src/mill/main/MainTests.scala
index e1a419cb..22f93ae0 100644
--- a/core/test/src/mill/main/MainTests.scala
+++ b/core/test/src/mill/main/MainTests.scala
@@ -4,7 +4,6 @@ import mill.define.{Discover, Segment, Task}
 import mill.util.TestGraphs._
 import mill.util.TestEvaluator.implicitDisover
 import utest._
-import mill.define.TargetScopt.millScoptTargetReads
 object MainTests extends TestSuite{
 
   def check[T <: mill.Module](module: T)(
diff --git a/core/test/src/mill/util/TestUtil.scala b/core/test/src/mill/util/TestUtil.scala
index 9a5baf11..7ef43943 100644
--- a/core/test/src/mill/util/TestUtil.scala
+++ b/core/test/src/mill/util/TestUtil.scala
@@ -1,6 +1,6 @@
 package mill.util
 
-import ammonite.main.Router.Overrides
+import mill.main.Router.Overrides
 import ammonite.ops.pwd
 import mill.define._
 import mill.eval.Result