fixpatch

ci/mill-bootstrap.patch

@@ -1,8 +1,8 @@
 diff --git a/build.sc b/build.sc
-index 46f995a8e..fa704d988 100644
+index 46f995a8e..96c777c30 100644
 --- a/build.sc
 +++ b/build.sc
-@@ -2,22 +2,11 @@
+@@ -2,22 +2,12 @@
  import $file.ci.shared
  import $file.ci.upload
  import $ivy.`org.scalaj::scalaj-http:2.4.2`
@@ -11,7 +11,7 @@ index 46f995a8e..fa704d988 100644
  import $ivy.`net.sourceforge.htmlcleaner:htmlcleaner:2.25`
 +import $ivy.`com.lihaoyi::mill-contrib-buildinfo:$MILL_VERSION`
 +import mill.contrib.buildinfo.BuildInfo
-
+ 
  // imports
 -import com.github.lolgab.mill.mima
 -import com.github.lolgab.mill.mima.{
@@ -27,10 +27,10 @@ index 46f995a8e..fa704d988 100644
  import mill._
  import mill.define.{Command, Source, Sources, Target, Task}
  import mill.eval.Evaluator
-@@ -185,12 +174,8 @@ object Deps {
+@@ -185,12 +175,8 @@ object Deps {
    val requests = ivy"com.lihaoyi::requests:0.8.0"
  }
-
+ 
 -def millVersion: T[String] = T { VcsVersion.vcsState().format() }
 -def millLastTag: T[String] = T {
 -  VcsVersion.vcsState().lastTag.getOrElse(
@@ -42,10 +42,10 @@ index 46f995a8e..fa704d988 100644
  def millBinPlatform: T[String] = T {
    val tag = millLastTag()
    if (tag.contains("-M")) tag
-@@ -201,176 +186,6 @@ def millBinPlatform: T[String] = T {
+@@ -201,176 +187,6 @@ def millBinPlatform: T[String] = T {
  }
  def baseDir = build.millSourcePath
-
+ 
 -
 -trait BuildInfo extends JavaModule {
 -  def buildInfoPackageName: String
@@ -219,10 +219,10 @@ index 46f995a8e..fa704d988 100644
  trait MillPublishModule extends PublishModule {
    override def artifactName = "mill-" + super.artifactName()
    def publishVersion = millVersion()
-@@ -420,27 +235,8 @@ trait MillCoursierModule extends CoursierModule {
+@@ -420,27 +236,8 @@ trait MillCoursierModule extends CoursierModule {
    )
  }
-
+ 
 -trait MillMimaConfig extends mima.Mima {
 +trait MillMimaConfig extends Module {
    def skipPreviousVersions: T[Seq[String]] = T(Seq.empty[String])
@@ -246,43 +246,43 @@ index 46f995a8e..fa704d988 100644
 -  }
 -  lazy val issueFilterByModule: Map[MillMimaConfig, Seq[ProblemFilter]] = Map()
  }
-
+ 
  /** A Module compiled with applied Mill-specific compiler plugins: mill-moduledefs. */
-@@ -729,6 +525,7 @@ object scalajslib extends MillModule with BuildInfo{
+@@ -729,6 +526,7 @@ object scalajslib extends MillModule with BuildInfo{
    }
    object worker extends Cross[WorkerModule]("1")
    class WorkerModule(scalajsWorkerVersion: String) extends MillInternalModule {
 +    override def millSourcePath: os.Path = super.millSourcePath / scalajsWorkerVersion
      override def moduleDeps = Seq(scalajslib.`worker-api`)
      override def ivyDeps = Agg(
        Deps.Scalajs_1.scalajsLinker,
-@@ -791,6 +588,7 @@ object contrib extends MillModule {
-
+@@ -791,6 +589,7 @@ object contrib extends MillModule {
+ 
      object worker extends Cross[WorkerModule](Deps.play.keys.toSeq: _*)
      class WorkerModule(playBinary: String) extends MillInternalModule {
 +      override def millSourcePath: os.Path = super.millSourcePath / playBinary
        override def sources = T.sources {
          // We want to avoid duplicating code as long as the Play APIs allow.
          // But if newer Play versions introduce incompatibilities,
-@@ -982,6 +780,7 @@ object scalanativelib extends MillModule {
+@@ -982,6 +781,7 @@ object scalanativelib extends MillModule {
    object worker extends Cross[WorkerModule]("0.4")
    class WorkerModule(scalaNativeWorkerVersion: String)
        extends MillInternalModule {
 +    override def millSourcePath: os.Path = super.millSourcePath / scalaNativeWorkerVersion
      override def moduleDeps = Seq(scalanativelib.`worker-api`)
      override def ivyDeps = scalaNativeWorkerVersion match {
        case "0.4" =>
-@@ -1142,6 +941,7 @@ trait IntegrationTestModule extends MillScalaModule {
+@@ -1142,6 +942,7 @@ trait IntegrationTestModule extends MillScalaModule {
  }
-
+ 
  trait IntegrationTestCrossModule extends IntegrationTestModule {
 +  override def millSourcePath = super.millSourcePath / repoSlug
    object local extends ModeModule
    object fork extends ModeModule
    object server extends ModeModule
-@@ -1696,53 +1496,7 @@ def launcher = T {
-
-
+@@ -1696,53 +1497,7 @@ def launcher = T {
+ 
+ 
  def uploadToGithub(authKey: String) = T.command {
 -  val vcsState = VcsVersion.vcsState()
 -  val label = vcsState.format()
@@ -333,5 +333,5 @@ index 46f995a8e..fa704d988 100644
 -  }
 +  // never upload a bootstrapped version
  }
-
- def validate(ev: Evaluator): Command[Unit] = T.command {
+ 
+ def validate(ev: Evaluator): Command[Unit] = T.command {