summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2019-07-09 02:57:17 +0800
committerLi Haoyi <haoyi.sg@gmail.com>2019-07-09 02:57:17 +0800
commit37556825f2f0b393beb496ff3c80455facd04f6c (patch)
treeb1dcba4cac122e3968905167b69101f2e16a8f1c
parent74efe69750c9a73c0824e6a924805a2fcb1001b4 (diff)
downloadmill-37556825f2f0b393beb496ff3c80455facd04f6c.tar.gz
mill-37556825f2f0b393beb496ff3c80455facd04f6c.tar.bz2
mill-37556825f2f0b393beb496ff3c80455facd04f6c.zip
update readme for 0.5.0
-rw-r--r--docs/pages/1 - Intro to Mill.md48
-rw-r--r--readme.md14
2 files changed, 47 insertions, 15 deletions
diff --git a/docs/pages/1 - Intro to Mill.md b/docs/pages/1 - Intro to Mill.md
index e71b9cf5..8b8d89bf 100644
--- a/docs/pages/1 - Intro to Mill.md
+++ b/docs/pages/1 - Intro to Mill.md
@@ -102,21 +102,9 @@ script directly:
```
The `mill` command will automatically use the version specified by the bootstrap
-script, even if you installed it via other means.
-
-The `./mill` script has a version number embedded within it, which you can
-update simply by editing the script.
-
-Lastly, you can also create a `.mill-version` file to specify the version of
-Mill you wish to use:
-
-```bash
-echo "0.5.0" > .mill-version
-```
-
-`.mill-version` takes precedence over the version of Mill specified in the
-`./mill` script.
-
+script, even if you installed it via other means. The `./mill` file has a
+version number embedded within it, which you can update simply by editing the
+script. Note this only works for versions 0.5.0 and above.
### Development Releases
@@ -842,3 +830,33 @@ build is not behaving as you would expect, feel free to poke around the various
see what is being returned by a particular task. You can also simply delete
folders within `out/` if you want to force portions of your project to be
re-built, e.g. deleting the `out/main/` or `out/main/test/compile/` folders.
+
+## Overriding Mill Versions
+
+Apart from downloading and installing new versions of Mill globally, there are a
+few ways of selecting/updating your Mill version:
+
+- Create a `.mill-version` file to specify the version of Mill you wish to use:
+
+```bash
+echo "0.5.0" > .mill-version
+```
+
+`.mill-version` takes precedence over the version of Mill specified in the
+`./mill` script.
+
+- ass in a `MILL_VERSION` environment variable, e.g.
+
+```bash
+MILL_VERSION=0.5.0-3-4faefb mill __.compile
+ ```
+
+or
+```bash
+MILL_VERSION=0.5.0-3-4faefb ./mill __.compile
+```
+
+to override the Mill version manually. This takes precedence over the version
+specified in `./mill` or `.mill-version`
+
+Note that both of these overrides only work for versions 0.5.0 and above. \ No newline at end of file
diff --git a/readme.md b/readme.md
index f4f4019f..6fb333bf 100644
--- a/readme.md
+++ b/readme.md
@@ -167,6 +167,20 @@ corresponding version of Mill.
## Changelog
+### 0.5.0
+
+- Mill now supports a `./mill`
+ [bootstrap script](http://www.lihaoyi.com/mill/#bootstrap-scripts-linuxos-x-only),
+ allowing a project to pin the version of Mill it requires, as well as letting
+ contributors use `./mill ...` to begin development without needing to install
+ Mill beforehand.
+
+- Support for a `.mill-version` file or `MILL_VERSION` environment variable for
+ [Overriding Mill Versions](http://www.lihaoyi.com/mill/#overriding-mill-versions)
+
+- Fix scoverage: inherit repositories from outer project
+ [#645](https://github.com/lihaoyi/mill/pull/645)
+
### 0.4.2
- Improvements to IntelliJ project generation [#616](https://github.com/lihaoyi/mill/pull/616)