Skip to content

Commit

Permalink
Merge pull request #1239 from scala-steward/update/mill-main-0.11.2
Browse files Browse the repository at this point in the history
Update Mill to 0.11
  • Loading branch information
alexarchambault authored Feb 16, 2024
2 parents ab45c1e + f6ed921 commit aa03283
Show file tree
Hide file tree
Showing 8 changed files with 346 additions and 234 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ jobs:
echo "-Xmx2g" > .mill-jvm-opts
cat .mill-jvm-opts.bak | grep -v Xmx >> .mill-jvm-opts
# sometimes running into memory issues when attempting __.publishLocal upfront
for SV in $(./mill scalaVersions); do
for SV in $(./mill dev.scalaVersions); do
./mill -i '__['"$SV"'].compile'
./mill -i '__['"$SV"'].docJar'
./mill -i '__['"$SV"'].publishLocal'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ jobs:
mv .mill-jvm-opts .mill-jvm-opts.bak
cat .mill-jvm-opts.bak | grep -v Xmx > .mill-jvm-opts
# sometimes running into memory issues when attempting __.publishLocal or __.publishArtifacts upfront
for SV in $(./mill scalaVersions); do
for SV in $(./mill dev.scalaVersions); do
./mill -i '__['"$SV"'].compile'
./mill -i '__['"$SV"'].docJar'
./mill -i '__['"$SV"'].publishLocal'
done
./mill -i __.publishLocal
./mill -i publishSonatype __.publishArtifacts
./mill -i ci.publishSonatype __.publishArtifacts
shell: bash
env:
PGP_PASSWORD: ${{ secrets.PUBLISH_SECRET_KEY_PASSWORD }}
Expand Down
2 changes: 1 addition & 1 deletion .mill-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.10.15
0.11.7
307 changes: 167 additions & 140 deletions build.sc

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions docs/pages/dev-from-sources.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ We list below useful commands, to help get you started using mill to build almon
## Run a Jupyter notebook server without installing a kernel

```text
$ ./mill -i jupyterFast
$ ./mill -i dev.jupyterFast
```

This should
Expand All @@ -46,24 +46,24 @@ From the JupyterLab instance, select the kernel "Scala (sources)".

Optionally, pass a Scala version and / or JupyterLab options, like
```text
$ ./mill -i jupyterFast 2.12.13
$ ./mill -i jupyterFast --ip=192.168.0.1
$ ./mill -i jupyterFast 2.12.13 --ip=192.168.0.1
$ ./mill -i dev.jupyterFast 2.12.13
$ ./mill -i dev.jupyterFast --ip=192.168.0.1
$ ./mill -i dev.jupyterFast 2.12.13 --ip=192.168.0.1
```
(If specified, the Scala version needs to be passed first.)

## Build a kernel launcher

```text
$ ./mill launcherFast
$ ./mill dev.launcherFast
```

Once done building, this should print the path to the kernel launcher, like
`out/scala/scala-kernel/2.13.4/unixLauncherFast/dest/launcher`.

Optionally, pass a Scala version, like
```text
$ ./mill launcherFast 2.12.13
$ ./mill dev.launcherFast 2.12.13
```

You can then run that launcher to install it on your system:
Expand All @@ -76,32 +76,32 @@ Pass `--help` or see [this page](install-options.md) for the available options.

You can re-build a launcher upon source changes with
```text
$ ./mill -w launcherFast
$ ./mill -w dev.launcherFast
```

If you [ran a JupyterLab server from the almond sources](#run-a-jupyter-notebook-server-without-installing-a-kernel),
you can restart the kernel from a notebook via JupyterLab to pick a newly built launcher. If you passed a Scala
version to `./mill jupyter`, beware to pass the same version to `./mill -w launcher`.
version to `./mill dev.jupyter`, beware to pass the same version to `./mill -w dev.launcher`.

## Useful commands

### List available Scala versions
```text
$ ./mill scalaVersions
$ ./mill dev.scalaVersions
2.13.4
2.13.3
```

### Print the latest supported Scala 2.13 version
```text
$ ./mill scala213
$ ./mill dev.scala213
2.13.4
```

### Print the latest supported Scala 2.12 version
```text
$ ./mill scala212
$ ./mill dev.scala212
2.12.13
```

Expand Down
1 change: 1 addition & 0 deletions project/deps.sc
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ object Deps {
def scalaRx = ivy"com.lihaoyi::scalarx:0.4.3"
def scalatags = ivy"com.lihaoyi::scalatags:0.12.0"
def slf4jNop = ivy"org.slf4j:slf4j-nop:1.7.36"
def sourcecode = ivy"com.lihaoyi::sourcecode:0.3.0"
def upickle =
ivy"com.lihaoyi::upickle:3.1.4" // trying to use the same version as Ammonite, to avoid bin compat issues
def upickleCompat(sv: String) =
Expand Down
Loading

0 comments on commit aa03283

Please sign in to comment.