Skip to content

Commit 96a04a4

Browse files
authored
Revert "build: bump to mill 0.12.10 (#4876)" (#4906)
This reverts commit ffb940b.
1 parent cef8a89 commit 96a04a4

File tree

3 files changed

+12
-21
lines changed

3 files changed

+12
-21
lines changed

.mill-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.12.10
1+
0.12.7

docs/package.mill

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ object `package` extends RootModule with SbtModule with HasScalaPlugin with HasC
2828

2929
override def moduleDeps = Seq(chisel(v.scalaVersion))
3030

31-
override def mainClass = Task(Some("mdoc.Main"))
32-
3331
// Suppress missing interpolator warnings because mdoc appears to introduce them.
3432
override def extraWarnConf = Seq("msg=possible missing interpolator:s")
3533

@@ -79,24 +77,22 @@ object `package` extends RootModule with SbtModule with HasScalaPlugin with HasC
7977
super.generatedSources() :+ firtoolVersionsTable()
8078
}
8179

82-
def mdocArgs = Task.Anon {
80+
def mdoc = T {
8381
val classpath = runClasspath().map(_.path)
8482
val outDir = mdocOutDir()
83+
8584
val inOutArgs =
8685
mdocSources().flatMap(inDir => Seq[String]("--in", inDir.path.toString, "--out", outDir.toString))
86+
val mdocArgs =
87+
Seq("--classpath", classpath.mkString(":")) ++
88+
Seq("--scalac-options", scalacOptions().map("\"" + _ + "\"").mkString(" ")) ++
89+
inOutArgs ++ mdocExtraArguments()
8790

88-
val args = Seq("--classpath", classpath.mkString(":")) ++
89-
Seq("--scalac-options", scalacOptions().map("\"" + _ + "\"").mkString(" ")) ++
90-
inOutArgs ++ mdocExtraArguments()
91+
T.log.debug("Running mdoc with args: " + mdocArgs.mkString(" "))
9192

92-
T.log.debug("Running mdoc with args: " + args.mkString(" "))
93-
94-
Args(args)
95-
}
93+
Jvm.runLocal("mdoc.Main", classpath, mdocArgs)
9694

97-
def mdoc = Task {
98-
runLocal(mdocArgs)()
99-
PathRef(mdocOutDir())
95+
PathRef(outDir)
10096
}
10197

10298
def contributors = Task {

release.mill

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,10 @@ trait Unipublish extends ScalaModule with ChiselPublishModule {
4848
override def artifactName = "chisel"
4949

5050
/** Publish both this project and the plugin (for the default Scala version) */
51-
override def publishLocal(
52-
localIvyRepo: String = null,
53-
sources: Boolean = true,
54-
doc: Boolean = true,
55-
transitive: Boolean = false
56-
) = Task.Command {
51+
override def publishLocal(localIvyRepo: String = null) = Task.Command {
5752
// TODO consider making this parallel and publishing all cross-versions for plugin
5853
plugin.cross(v.scalaVersion).publishLocal(localIvyRepo)()
59-
super.publishLocal(localIvyRepo, sources, doc, transitive)()
54+
super.publishLocal(localIvyRepo)()
6055
}
6156

6257
// Explicitly not using moduleDeps because that influences so many things

0 commit comments

Comments
 (0)