Merge pull request #92 from lolgab/mill-0.11.0-M10

Update Mill 0.11 to 0.11.0-M10

Author: ckipp01

build.sc

@@ -17,9 +17,9 @@ import de.tobiasroeser.mill.vcs.version.VcsVersion
 import io.kipp.mill.ci.release.CiReleaseModule
 import io.kipp.mill.ci.release.SonatypeHost
 
-val millVersions = Seq("0.10.12", "0.11.0-M8")
+val millVersions = Seq("0.10.12", "0.11.0-M10")
 val millBinaryVersions = millVersions.map(scalaNativeBinaryVersion)
-val scala213 = "2.13.8"
+val scala213 = "2.13.10"
 val artifactBase = "mill-github-dependency-graph"
 
 def millBinaryVersion(millVersion: String) = scalaNativeBinaryVersion(

…ill/github/dependency/graph/Reader.scala …l/github/dependency/graph/Discover.scalaplugin/src-mill0.10/io/kipp/mill/github/dependency/graph/Reader.scala renamed to plugin/src-mill0.10/io/kipp/mill/github/dependency/graph/Discover.scala plugin/src-mill0.10/io/kipp/mill/github/dependency/graph/Reader.scala renamed to plugin/src-mill0.10/io/kipp/mill/github/dependency/graph/Discover.scala

@@ -2,7 +2,9 @@ package io.kipp.mill.github.dependency.graph
 
 import mill.main.EvaluatorScopt
 
-private[graph] object Reader {
+private[graph] object Discover {
   implicit def millScoptEvaluatorReads[A]: EvaluatorScopt[A] =
     new EvaluatorScopt[A]()
+
+  def apply[T] = mill.define.Discover[T]
 }

plugin/src-mill0.11/io/kipp/mill/github/dependency/graph/Discover.scala

@@ -0,0 +1,5 @@
+package io.kipp.mill.github.dependency.graph
+
+private[graph] object Discover {
+  def apply[T] = mill.define.Discover[T]
+}

plugin/src-mill0.11/io/kipp/mill/github/dependency/graph/Reader.scala

@@ -20,7 +20,7 @@ object Resolver {
   private[graph] def resolveModuleTrees(
       evaluator: Evaluator,
       javaModules: Seq[JavaModule]
-  ): Seq[ModuleTrees] = Evaluator.evalOrThrow(evaluator) {
+  ): Seq[ModuleTrees] = evaluator.evalOrThrow() {
     javaModules.map { javaModule =>
       T.task {
 

plugin/src-mill0.11/io/kipp/mill/github/dependency/graph/Resolver.scala

@@ -3,7 +3,6 @@ package io.kipp.mill.github.dependency.graph
 import io.kipp.github.dependency.graph.domain
 import mill._
 import mill.define.Command
-import mill.define.Discover
 import mill.define.ExternalModule
 import mill.eval.Evaluator
 
@@ -27,6 +26,5 @@ object Graph extends ExternalModule {
       manifests
     }
 
-  import Reader._
-  lazy val millDiscover: Discover[this.type] = mill.define.Discover[this.type]
+  lazy val millDiscover: mill.define.Discover[this.type] = Discover[this.type]
 }