Skip to content

Commit d85a834

Browse files
authored
[build] Use Mill 1.1.1-6-480a23 (#5196)
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.
1 parent c13e34b commit d85a834

2 files changed

Lines changed: 13 additions & 9 deletions

File tree

build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//| mill-version: 1.0.6
1+
//| mill-version: 1.1.1-6-480a23
22
//| mvnDeps:
33
//| - com.lihaoyi::mill-contrib-jmh:$MILL_VERSION
44
//| - com.47deg::github4s:0.33.3

release.mill

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package build
33
import mill._
44
import mill.api.{BuildCtx, Result}
55
import mill.javalib.SonatypeCentralPublishModule
6+
import mill.javalib.api.internal.ZincOp
67
import mill.scalalib._
78
import mill.scalalib.scalafmt._
89
import mill.scalalib.publish._
@@ -201,18 +202,21 @@ trait Unipublish extends ChiselCrossModule with ChiselPublishModule with Mima {
201202
Seq("-d", javadocDir.toString) ++
202203
unidocSourceFiles().map(_.path.toString)
203204

204-
jvmWorker()
205-
.worker()
206-
.docJar(
205+
val worker = jvmWorker().internalWorker()
206+
worker.apply(
207+
ZincOp.ScaladocJar(
207208
scalaVersion(),
208209
scalaOrganization(),
209210
scalaDocClasspath(),
210211
scalacPluginClasspath(),
211-
None,
212-
fullOptions
213-
) match {
214-
case true => Result.Success(PathRef(createJar(Task.dest / "out.jar", Seq(javadocDir))))
215-
case false => Result.Failure("docJar generation failed")
212+
scalaCompilerBridge(),
213+
fullOptions,
214+
workDir = Task.dest
215+
),
216+
javaHome().map(_.path)
217+
) match {
218+
case true => PathRef(Task.dest)
219+
case false => Task.fail("docJar generation failed")
216220
}
217221
}
218222
}

0 commit comments

Comments
 (0)