|  | 
| 1 | 1 | diff --git a/build.mill b/build.mill | 
| 2 |  | -index a4039a6288..c8a686e492 100644 | 
|  | 2 | +index 4fad3481fa..2f2bfd9e32 100644 | 
| 3 | 3 | --- a/build.mill | 
| 4 | 4 | +++ b/build.mill | 
| 5 | 5 | @@ -18,6 +18,7 @@ import mill.define.Cross | 
| 6 |  | - | 
|  | 6 | +  | 
| 7 | 7 |  // plugins and dependencies | 
| 8 | 8 |  import $meta._ | 
| 9 | 9 | +import $packages._ | 
| 10 | 10 |  import $file.ci.shared | 
| 11 | 11 |  import $file.ci.upload | 
|  | 12 | +  | 
|  | 13 | +@@ -228,12 +229,13 @@ object Deps { | 
|  | 14 | +   } | 
|  | 15 | + } | 
|  | 16 | +  | 
|  | 17 | +-def millVersion: T[String] = T { VcsVersion.vcsState().format() } | 
|  | 18 | ++def millVersion: T[String] = T { "0.13.0-SCALA3" } //T { VcsVersion.vcsState().format() } | 
|  | 19 | +  | 
|  | 20 | + def millLastTag: T[String] = T { | 
|  | 21 | +-  VcsVersion.vcsState().lastTag.getOrElse( | 
|  | 22 | +-    sys.error("No (last) git tag found. Your git history seems incomplete!") | 
|  | 23 | +-  ) | 
|  | 24 | ++  "0.12.0-RC2" | 
|  | 25 | ++  // VcsVersion.vcsState().lastTag.getOrElse( | 
|  | 26 | ++  //   sys.error("No (last) git tag found. Your git history seems incomplete!") | 
|  | 27 | ++  // ) | 
|  | 28 | + } | 
|  | 29 | +  | 
|  | 30 | + def millBinPlatform: T[String] = T { | 
|  | 31 | +diff --git a/ci/mill-bootstrap.patch b/ci/mill-bootstrap.patch | 
|  | 32 | +index 75846a75b7..e69de29bb2 100644 | 
|  | 33 | +--- a/ci/mill-bootstrap.patch | 
|  | 34 | ++++ b/ci/mill-bootstrap.patch | 
|  | 35 | +@@ -1,11 +0,0 @@ | 
|  | 36 | +-diff --git a/build.mill b/build.mill | 
|  | 37 | +-index a4039a6288..c8a686e492 100644 | 
|  | 38 | +---- a/build.mill | 
|  | 39 | +-+++ b/build.mill | 
|  | 40 | +-@@ -18,6 +18,7 @@ import mill.define.Cross | 
|  | 41 | +- | 
|  | 42 | +- // plugins and dependencies | 
|  | 43 | +- import $meta._ | 
|  | 44 | +-+import $packages._ | 
|  | 45 | +- import $file.ci.shared | 
|  | 46 | +- import $file.ci.upload | 
|  | 47 | +diff --git a/docs/package.mill b/docs/package.mill | 
|  | 48 | +index 8ff6287d88..85472f8bb1 100644 | 
|  | 49 | +--- a/docs/package.mill | 
|  | 50 | ++++ b/docs/package.mill | 
|  | 51 | +@@ -127,7 +127,7 @@ object `package` extends RootModule { | 
|  | 52 | +     os.write.over(dest / "antora.yml", (lines ++ newLines).mkString("\n")) | 
|  | 53 | +   } | 
|  | 54 | +  | 
|  | 55 | +-  def githubPagesPlaybookText(authorMode: Boolean) = T.task { extraSources: Seq[os.Path] => | 
|  | 56 | ++  def githubPagesPlaybookText(authorMode: Boolean) = T.task { (extraSources: Seq[os.Path]) => | 
|  | 57 | +     val taggedSources = for (path <- extraSources) yield { | 
|  | 58 | +       s"""    - url: ${build.baseDir} | 
|  | 59 | +          |      start_path: ${path.relativeTo(build.baseDir)} | 
|  | 60 | +@@ -192,23 +192,23 @@ object `package` extends RootModule { | 
|  | 61 | +   } | 
|  | 62 | +  | 
|  | 63 | +   def githubPages: T[PathRef] = T { | 
|  | 64 | +-    generatePages(authorMode = false)().apply(oldDocSources().map(_.path)) | 
|  | 65 | ++    generatePages(authorMode = false).apply().apply(oldDocSources().map(_.path)) | 
|  | 66 | +   } | 
|  | 67 | +  | 
|  | 68 | +   def localPages = T { | 
|  | 69 | +-    val pages = generatePages(authorMode = true)().apply(oldDocSources().map(_.path)) | 
|  | 70 | ++    val pages = generatePages(authorMode = true).apply().apply(oldDocSources().map(_.path)) | 
|  | 71 | +     T.log.outputStream.println( | 
|  | 72 | +       s"You can browse the local pages at: ${(pages.path / "index.html").toNIO.toUri()}" | 
|  | 73 | +     ) | 
|  | 74 | +   } | 
|  | 75 | +   def fastPages = T { | 
|  | 76 | +-    val pages = generatePages(authorMode = true)().apply(Nil) | 
|  | 77 | ++    val pages = generatePages(authorMode = true).apply().apply(Nil) | 
|  | 78 | +     T.log.outputStream.println( | 
|  | 79 | +       s"You can browse the local pages at: ${(pages.path / "index.html").toNIO.toUri()}" | 
|  | 80 | +     ) | 
|  | 81 | +   } | 
|  | 82 | +  | 
|  | 83 | +-  def generatePages(authorMode: Boolean) = T.task { extraSources: Seq[os.Path] => | 
|  | 84 | ++  def generatePages(authorMode: Boolean) = T.task { (extraSources: Seq[os.Path]) => | 
|  | 85 | +     T.log.errorStream.println("Creating Antora playbook ...") | 
|  | 86 | +     // dependency to sources | 
|  | 87 | +     source() | 
|  | 88 | +@@ -217,7 +217,7 @@ object `package` extends RootModule { | 
|  | 89 | +     val siteDir = docSite / "site" | 
|  | 90 | +     os.write( | 
|  | 91 | +       target = playbook, | 
|  | 92 | +-      data = githubPagesPlaybookText(authorMode)().apply(extraSources), | 
|  | 93 | ++      data = githubPagesPlaybookText(authorMode).apply().apply(extraSources), | 
|  | 94 | +       createFolders = true | 
|  | 95 | +     ) | 
|  | 96 | +     T.log.errorStream.println("Running Antora ...") | 
|  | 97 | +diff --git a/mill-build/build.mill b/mill-build/build.mill | 
|  | 98 | +index 356e9306d2..3dcfda144b 100644 | 
|  | 99 | +--- a/mill-build/build.mill | 
|  | 100 | ++++ b/mill-build/build.mill | 
|  | 101 | +@@ -4,12 +4,12 @@ import mill.scalalib._ | 
|  | 102 | +  | 
|  | 103 | + object `package` extends MillBuildRootModule { | 
|  | 104 | +   override def ivyDeps = Agg( | 
|  | 105 | +-    ivy"org.scalaj::scalaj-http:2.4.2", | 
|  | 106 | +-    ivy"de.tototec::de.tobiasroeser.mill.vcs.version::0.4.0", | 
|  | 107 | +-    ivy"com.github.lolgab::mill-mima::0.1.1", | 
|  | 108 | ++    ivy"org.scalaj::scalaj-http:2.4.2".withDottyCompat(scalaVersion()), | 
|  | 109 | ++    ivy"de.tototec::de.tobiasroeser.mill.vcs.version::0.4.0".withDottyCompat(scalaVersion()), | 
|  | 110 | ++    ivy"com.github.lolgab::mill-mima::0.1.1".withDottyCompat(scalaVersion()), | 
|  | 111 | +     ivy"net.sourceforge.htmlcleaner:htmlcleaner:2.29", | 
|  | 112 | +     // TODO: implement empty version for ivy deps as we do in import parser | 
|  | 113 | +     ivy"com.lihaoyi::mill-contrib-buildinfo:${mill.api.BuildInfo.millVersion}", | 
|  | 114 | +-    ivy"com.goyeau::mill-scalafix::0.4.1" | 
|  | 115 | ++    ivy"com.goyeau::mill-scalafix::0.4.1".withDottyCompat(scalaVersion()) | 
|  | 116 | +   ) | 
|  | 117 | + } | 
0 commit comments