4 files changed, 7 insertions, 14 deletions
diff --git a/scalalib/src/mill/scalalib/GenIdea.scala b/scalalib/src/mill/scalalib/GenIdea.scala
index abf8a2a2..095daf31 100644
--- a/scalalib/src/mill/scalalib/GenIdea.scala
+++ b/scalalib/src/mill/scalalib/GenIdea.scala
@@ -17,7 +17,7 @@ object GenIdeaModule extends ExternalModule {
     mill.scalalib.GenIdea(
       implicitly,
       ev.rootModule,
-      ev.discover
+      ev.rootModule.millDiscover
     )
   }
 
@@ -34,7 +34,7 @@ object GenIdea {
     rm! pwd/".idea_modules"
 
 
-    val evaluator = new Evaluator(pwd / 'out, pwd / 'out, rootModule, discover, ctx.log)
+    val evaluator = new Evaluator(pwd / 'out, pwd / 'out, rootModule, ctx.log)
 
     for((relPath, xml) <- xmlFileLayout(evaluator, rootModule)){
       write.over(pwd/relPath, pp.format(xml))
diff --git a/scalalib/src/mill/scalalib/Main.scala b/scalalib/src/mill/scalalib/Main.scala
deleted file mode 100644
index 584fe9d1..00000000
--- a/scalalib/src/mill/scalalib/Main.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package mill.scalalib
-
-object Main {
-  def main(args: Array[String]): Unit = {
-    mill.Main.main(args)
-  }
-}
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)