Skip to content

Commit 0d2918a

Browse files
committed
Merge branch 'main' into groovylib
2 parents 2e541d0 + 7b00eb7 commit 0d2918a

File tree

18 files changed

+412
-47
lines changed

18 files changed

+412
-47
lines changed

.github/actions/post-build-selective/action.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ inputs:
88
required: true
99
type: string
1010

11-
coursierarchive:
12-
default: ''
13-
type: string
14-
1511
runs:
1612
using: "composite"
1713
steps:
@@ -48,8 +44,6 @@ runs:
4844
# shell: ${{ inputs.shell }}
4945

5046
- run: ./mill -i -k selective.run ${{ inputs.millargs }}
51-
env:
52-
COURSIER_ARCHIVE_CACHE: ${{ inputs.coursierarchive }}
5347
shell: ${{ inputs.shell }}
5448

5549
- name: Clean-up Test Reports

.github/workflows/post-build-selective.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ on:
1010
required: true
1111
type: string
1212

13-
coursierarchive:
14-
default: "/tmp"
15-
required: false
16-
type: string
1713
java-version:
1814
required: true
1915
type: string
@@ -67,5 +63,4 @@ jobs:
6763

6864
with:
6965
millargs: ${{ inputs.millargs }}
70-
coursierarchive: ${{ inputs.coursierarchive }}
7166
shell: ${{ inputs.shell }}

.github/workflows/publish-artifacts.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,22 @@ jobs:
2727
matrix:
2828
include:
2929
- os: ubuntu-latest
30-
coursierarchive: "/tmp"
3130
publishartifacts: __.publishArtifacts
3231
uploadgithub: true
3332

3433
- os: ubuntu-24.04-arm
35-
coursierarchive: "/tmp"
3634
publishartifacts: dist.native.publishArtifacts
3735
uploadgithub: false
3836

3937
- os: macos-13
40-
coursierarchive: "/tmp"
4138
publishartifacts: dist.native.publishArtifacts
4239
uploadgithub: false
4340

4441
- os: macos-latest
45-
coursierarchive: "/tmp"
4642
publishartifacts: dist.native.publishArtifacts
4743
uploadgithub: false
4844

4945
- os: windows-latest
50-
coursierarchive: C:/coursier-arc
5146
publishartifacts: dist.native.publishArtifacts
5247
uploadgithub: false
5348

@@ -62,7 +57,6 @@ jobs:
6257
LANG: "en_US.UTF-8"
6358
LC_MESSAGES: "en_US.UTF-8"
6459
LC_ALL: "en_US.UTF-8"
65-
COURSIER_ARCHIVE_CACHE: ${{ matrix.coursierarchive }}
6660
REPO_ACCESS_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
6761
steps:
6862
- uses: actions/setup-java@v5

.github/workflows/publish-bridges.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ jobs:
2626
LANG: "en_US.UTF-8"
2727
LC_MESSAGES: "en_US.UTF-8"
2828
LC_ALL: "en_US.UTF-8"
29-
COURSIER_ARCHIVE_CACHE: ${{ matrix.coursierarchive }}
3029
REPO_ACCESS_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
3130
MILL_COMPILER_BRIDGE_VERSIONS: ${{ inputs.bridge_versions }}
3231
steps:

.github/workflows/run-tests.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ jobs:
118118
- uses: ./.github/actions/post-build-selective
119119
with:
120120
millargs: ${{ matrix.millargs }}
121-
coursierarchive: "/tmp"
122121
shell: bash
123122

124123
linux:
@@ -224,9 +223,6 @@ jobs:
224223
os: windows-latest
225224
java-version: ${{ matrix.java-version }}
226225
millargs: ${{ matrix.millargs }}
227-
# Provide a shorter coursier archive folder to avoid hitting path-length bugs when
228-
# running the graal native image binary on windows
229-
coursierarchive: "C:/coursier-arc"
230226
shell: powershell
231227

232228
itest:

CONTRIBUTING.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ We have essential contributor information in the xref:readme.adoc[Project README
88

99
Here are some direct links:
1010

11-
* xref:readme.adoc#intellij-setup[IntelliJ Setup] - IntelliJ IDEA works great for Mill development; other IDEs may work as well
12-
* xref:readme.adoc#project-layout[Project Layout] - The source code repository structure from a high level view
13-
* xref:readme.adoc#manual-automated-testing[Manual and Automated Testing] - How we test Mill
14-
* xref:readme.adoc#project-maintenance[Project Maintenance] - Details about authoring pull request and commit messages
11+
* xref:developer.adoc#intellij-setup[IntelliJ Setup] - IntelliJ IDEA works great for Mill development; other IDEs may work as well
12+
* xref:developer.adoc#project-layout[Project Layout] - The source code repository structure from a high level view
13+
* xref:developer.adoc#manual-automated-testing[Manual and Automated Testing] - How we test Mill
14+
* xref:developer.adoc#project-maintenance[Project Maintenance] - Details about authoring pull request and commit messages
1515
* https://mill-build.org/mill/Intro_to_Mill.html[Mill Documentation] - Documentation for users and developers
1616
* {link-github}/discussions[Discussion Forum on GitHub] - A place to ask question and discuss all kind of questions around Mill
1717
* {link-github}/issues[Issue Tracker on GitHub] - Our issue tracker for bugs and features

changelog.adoc

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,21 @@ def namedTupleTask = Task {
576576
----
577577

578578

579+
580+
[#0-12-16]
581+
=== 0.12.16 - 2025-09-23
582+
:version: 0.12.16
583+
:milestone-name: 0.12.16
584+
:milestone: 128
585+
:prev-version: 0.12.15
586+
587+
_Changes since {prev-version}:_
588+
589+
* Added support for Scala 3.8 ({link-pr}/5797[#5797])
590+
591+
* Added support for Java 25 and updated asm-tree to 9.8 ({link-pr}/5891[#5891])
592+
593+
579594
[#0-12-15]
580595
=== 0.12.15
581596
:version: 0.12.15

core/api/src/mill/api/BuildCtx.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ object BuildCtx {
1414
* This is the `os.Path` pointing to the project root directory.
1515
*
1616
* This is the preferred access to the project directory, and should
17-
* always be prefered over `os.pwd`* (which might also point to the
17+
* always be preferred over `os.pwd`* (which might also point to the
1818
* project directory in classic cli scenarios, but might not in other
1919
* use cases like BSP or LSP server usage).
2020
*/

libs/daemon/server/src/mill/server/Server.scala

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,7 @@ abstract class Server(args: Server.Args) {
136136
exit = msg => {
137137
serverLog(s"watchProcessIdFile: $msg")
138138
serverSocket.close()
139-
},
140-
log = serverLog
139+
}
141140
)
142141

143142
// Wrapper object to encapsulate `activeConnections` and `inactiveTimestampOpt`,
@@ -497,12 +496,10 @@ object Server {
497496
processIdFile: os.Path,
498497
processId: Long,
499498
running: () => Boolean,
500-
exit: String => Unit,
501-
log: String => Unit
499+
exit: String => Unit
502500
): Unit = {
503501
val processIdStr = processId.toString
504502

505-
log(s"watching processId file (expected content = $processIdStr): $processIdFile")
506503
os.write.over(processIdFile, processIdStr, createFolders = true)
507504

508505
val processIdThread = new Thread(

mill-build/src/millbuild/Settings.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ object Settings {
1818
)
1919
val docTags: Seq[String] = Seq(
2020
"0.11.13",
21-
"0.12.14",
21+
"0.12.16",
2222
"1.0.5"
2323
)
2424
val mimaBaseVersions: Seq[String] = Seq("1.0.0", "1.0.1", "1.0.2", "1.0.3", "1.0.4", "1.0.5")

0 commit comments

Comments
 (0)