Merge pull request #60 from lolgab/mill-0.11.0-M8

Support for Mill 0.11.0-M8

build.sc

@@ -13,7 +13,7 @@ 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-M3")
+val millVersions = Seq("0.10.12", "0.11.0-M8")
 val scala213 = "2.13.10"
 val pluginName = "mill-ci-release"
 
@@ -53,10 +53,16 @@ class Plugin(millVersion: String)
     ivy"com.lihaoyi::mill-scalalib:${millVersion}"
   )
   override def ivyDeps = super.ivyDeps() ++ Agg(
-    ivy"de.tototec::de.tobiasroeser.mill.vcs.version_mill${millBinaryVersion(millVersion)}::0.3.0-11-18a465"
+    ivy"de.tototec::de.tobiasroeser.mill.vcs.version_mill${millBinaryVersion(millVersion)}::0.3.1"
   )
   override def scalacOptions = Seq("-Ywarn-unused", "-deprecation")
 
+  override def sources = T.sources {
+    super.sources() ++ Seq(
+      millSourcePath / s"src-mill${millVersion.split('.').take(2).mkString(".")}"
+    ).map(PathRef(_))
+  }
+
   override def scalafixScalaBinaryVersion =
     ZincWorkerUtil.scalaBinaryVersion(scala213)
 

plugin/src-mill0.10/io/kipp/mill/ci/release/Reader.scala

@@ -0,0 +1,8 @@
+package io.kipp.mill.ci.release
+
+import mill.main.EvaluatorScopt
+
+private[release] object Reader {
+  implicit def millScoptEvaluatorReads[A]: EvaluatorScopt[A] =
+    new EvaluatorScopt[A]()
+}

plugin/src-mill0.11/io/kipp/mill/ci/release/Reader.scala

@@ -0,0 +1,6 @@
+package io.kipp.mill.ci.release
+
+private[release] object Reader {
+  implicit def millEvaluatorTokenReader =
+    mill.main.TokenReaders.millEvaluatorTokenReader
+}

plugin/src/io/kipp/mill/ci/release/CiReleaseModule.scala

@@ -6,7 +6,6 @@ import mill.api.Result
 import mill.define.ExternalModule
 import mill.define.Task
 import mill.eval.Evaluator
-import mill.main.EvaluatorScopt
 import mill.main.Tasks
 import mill.scalalib.PublishModule
 import mill.scalalib.publish.Artifact
@@ -226,8 +225,6 @@ object ReleaseModule extends ExternalModule {
   private def releaseModules(ev: Evaluator) =
     ev.rootModule.millInternal.modules.collect { case m: CiReleaseModule => m }
 
-  implicit def millScoptEvaluatorReads[A]: EvaluatorScopt[A] =
-    new mill.main.EvaluatorScopt[A]()
-
+  import Reader._
   lazy val millDiscover = mill.define.Discover[this.type]
 }