From 36ffe17e436c87767bc7f0dab745f6eadaa2707d Mon Sep 17 00:00:00 2001 From: Jack Koenig Date: Wed, 4 Feb 2026 11:26:36 -0800 Subject: [PATCH] [build] Use Mill 1.1.1-6-480a23 It includes an important fix for propagating system properties to ScalaTest when using the native image launcher. This also required updating the unidoc invocation, I made the same change that Mill made to their internal Unidoc. --- build.mill | 2 +- release.mill | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/build.mill b/build.mill index 96fd38c532e..53333832c73 100644 --- a/build.mill +++ b/build.mill @@ -1,4 +1,4 @@ -//| mill-version: 1.0.6 +//| mill-version: 1.1.1-6-480a23 //| mvnDeps: //| - com.lihaoyi::mill-contrib-jmh:$MILL_VERSION //| - com.47deg::github4s:0.33.3 diff --git a/release.mill b/release.mill index 5125fc7e403..e4074a7b165 100644 --- a/release.mill +++ b/release.mill @@ -3,6 +3,7 @@ package build import mill._ import mill.api.{BuildCtx, Result} import mill.javalib.SonatypeCentralPublishModule +import mill.javalib.api.internal.ZincOp import mill.scalalib._ import mill.scalalib.scalafmt._ import mill.scalalib.publish._ @@ -201,18 +202,21 @@ trait Unipublish extends ChiselCrossModule with ChiselPublishModule with Mima { Seq("-d", javadocDir.toString) ++ unidocSourceFiles().map(_.path.toString) - jvmWorker() - .worker() - .docJar( + val worker = jvmWorker().internalWorker() + worker.apply( + ZincOp.ScaladocJar( scalaVersion(), scalaOrganization(), scalaDocClasspath(), scalacPluginClasspath(), - None, - fullOptions - ) match { - case true => Result.Success(PathRef(createJar(Task.dest / "out.jar", Seq(javadocDir)))) - case false => Result.Failure("docJar generation failed") + scalaCompilerBridge(), + fullOptions, + workDir = Task.dest + ), + javaHome().map(_.path) + ) match { + case true => PathRef(Task.dest) + case false => Task.fail("docJar generation failed") } } }