Skip to content

Commit

Permalink
Prepared release 0.9.6
Browse files Browse the repository at this point in the history
  • Loading branch information
lefou committed Apr 3, 2021
1 parent b742183 commit d3813be
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 19 deletions.
38 changes: 22 additions & 16 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,18 @@ import mill.scalalib.publish._
import mill.modules.Jvm
import os.RelPath

object Settings {
val pomOrg = "com.lihaoyi"
val githubOrg = "com-lihaoyi"
val githubRepo = "mill"
val projectUrl = s"https://github.com/${githubOrg}/${githubRepo}"
val docUrl = "https://com-lihaoyi.github.io/mill"
// the exact branches containing a doc root
val docBranches = Seq()
// the exact tags containing a doc root
val docTags = Seq("0.9.6")
}

object Deps {

// The Scala version to use
Expand Down Expand Up @@ -92,14 +104,6 @@ object Deps {
val jarjarabrams = ivy"com.eed3si9n.jarjarabrams::jarjar-abrams-core:0.3.0"
}

object Settings {
val pomOrg = "com.lihaoyi"
val githubOrg = "com-lihaoyi"
val githubRepo = "mill"
val projectUrl = s"https://github.com/${githubOrg}/${githubRepo}"
val docUrl = "https://com-lihaoyi.github.io/mill"
}

def millVersion = T { VcsVersion.vcsState().format() }
def millLastTag = T { VcsVersion.vcsState().lastTag.get }
def baseDir = build.millSourcePath
Expand Down Expand Up @@ -916,6 +920,10 @@ object docs extends Module {
val lines = os.read(dest / "antora.yml").linesIterator.map {
case l if l.startsWith("version:") =>
s"version: 'master'" + "\n" + s"display-version: '${millVersion()}'"
case l if l.startsWith(" mill-version:") =>
s" mill-version: '${millVersion()}'"
case l if l.startsWith(" mill-last-tag:") =>
s" mill-last-tag: '${millLastTag()}'"
case l => l
}
os.write.over(dest / "antora.yml", lines.mkString("\n"))
Expand All @@ -929,12 +937,12 @@ object docs extends Module {
|
|content:
| sources:
| # the in-repo version-tagged documentation (currently only the pr branch)
| # TODO: switch branch to master and add tags for releases with antora docs
| ##- url: ${if (authorMode) baseDir else Settings.projectUrl}
| ## branches: ${if (authorMode) "HEAD" else "antora"}
| ## start_path: docs/antora
| # the master documentation
| - url: ${if (authorMode) baseDir else Settings.projectUrl}
| branches: ${ if(Settings.docBranches.isEmpty) "~"
else Settings.docBranches.map("'" + _ + "'").mkString("[", ",", "]") }
| tags: ${Settings.docTags.map("'" + _ + "'").mkString("[", ",", "]")}
| start_path: docs/antora
| # the master documentation (always in author mode)
| - url: ${baseDir}
| # edit_url: ${ Settings.projectUrl }/edit/{refname}/{path}
| branches: HEAD
Expand All @@ -947,8 +955,6 @@ object docs extends Module {
|
|asciidoc:
| attributes:
| mill-version: '${millVersion()}'
| mill-last-tag: '${millLastTag()}'
| mill-github-url: ${Settings.projectUrl}
| mill-doc-url: ${Settings.docUrl}
| utest-github-url: https://github.com/com-lihaoyi/utest
Expand Down
6 changes: 5 additions & 1 deletion docs/antora/antora.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
name: mill
title: Mill Documentation
version: '0.9.5'
version: '0.9.6'
nav:
- modules/ROOT/nav.adoc
asciidoc:
attributes:
mill-version: '0.9.6'
mill-last-tag: '0.9.6'
24 changes: 22 additions & 2 deletions readme.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,28 @@ corresponding version of Mill.
=== master

_For details refer to
{link-milestone}/47?closed=1[milestone after 0.9.5]
and the {link-compare}/0.9.5\...master[list of commits]._
{link-milestone}/48?closed=1[milestone after 0.9.6]
and the {link-compare}/0.9.6\...master[list of commits]._


=== 0.9.6 - 2021-04-03

_The mill project home and repository has been moved to https://github.com/com-lihaoyi/mill._

* `repl` and `console` targets now support `forkArgs` and `forkEnv`
* Support for Scala 3 release candidates and new Scaladoc 3 tool
* Support for Scala.js on Scala 3
* Scala Native improvements
* Test runner now uses an args file to support running tests on Windows
* GenIdea: better supports source jars, full config contributions and provided/runtime dependencies
* Various dependency updates
* Documentation site reworked to support multiple release versions
* Improved CI setup to better test mill on Windows

_For details refer to
{link-milestone}/47?closed=1[milestone 0.9.6]
and the {link-compare}/0.9.5\...0.9.6[list of commits]._


=== 0.9.5 - 2021-01-26

Expand Down

0 comments on commit d3813be

Please sign in to comment.