Skip to content

Commit ecae588

Browse files
autofix-ci[bot]autofix-ci[bot]
authored
[autofix.ci] apply automated fixes
1 parent 5892515 commit ecae588

File tree

10 files changed

+126
-105
lines changed

10 files changed

+126
-105
lines changed

‎core/api/src/mill/api/internal/RootModule.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ object RootModule {
4040
val buildOverrides: Map[String, ujson.Value]
4141
) {
4242
def this(
43-
projectRoot: os.Path,
44-
output: os.Path,
45-
topLevelProjectRoot: os.Path,
46-
) = this(projectRoot, output, topLevelProjectRoot, Map())
43+
projectRoot: os.Path,
44+
output: os.Path,
45+
topLevelProjectRoot: os.Path
46+
) = this(projectRoot, output, topLevelProjectRoot, Map())
4747
def this(
4848
projectRoot0: String,
4949
output0: String,

‎core/exec/src/mill/exec/Execution.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ private[mill] case class Execution(
3030
systemExit: ( /* reason */ String, /* exitCode */ Int) => Nothing,
3131
exclusiveSystemStreams: SystemStreams,
3232
getEvaluator: () => EvaluatorApi,
33-
offline: Boolean,
33+
offline: Boolean
3434
) extends GroupExecution with AutoCloseable {
3535

3636
// this (shorter) constructor is used from [[MillBuildBootstrap]] via reflection
@@ -50,7 +50,7 @@ private[mill] case class Execution(
5050
systemExit: ( /* reason */ String, /* exitCode */ Int) => Nothing,
5151
exclusiveSystemStreams: SystemStreams,
5252
getEvaluator: () => EvaluatorApi,
53-
offline: Boolean,
53+
offline: Boolean
5454
) = this(
5555
baseLogger,
5656
new JsonArrayLogger.Profile(os.Path(outPath) / millProfile),
@@ -68,7 +68,7 @@ private[mill] case class Execution(
6868
systemExit,
6969
exclusiveSystemStreams,
7070
getEvaluator,
71-
offline,
71+
offline
7272
)
7373

7474
def withBaseLogger(newBaseLogger: Logger) = this.copy(baseLogger = newBaseLogger)

‎core/exec/src/mill/exec/GroupExecution.scala‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ trait GroupExecution {
3939
def getEvaluator: () => EvaluatorApi
4040
def offline: Boolean
4141

42-
4342
lazy val constructorHashSignatures: Map[String, Seq[(String, Int)]] =
4443
CodeSigUtils.constructorHashSignatures(codeSignatures)
4544

@@ -105,7 +104,7 @@ trait GroupExecution {
105104
case single if labelled.ctx.enclosingModule.buildOverrides.contains(single) =>
106105
val jsonData = labelled.ctx.enclosingModule.buildOverrides(single)
107106
import collection.JavaConverters._
108-
def rec(x: ujson.Value): ujson.Value = x match{
107+
def rec(x: ujson.Value): ujson.Value = x match {
109108
case ujson.Str(s) => mill.constants.Util.interpolateEnvVars(s, envWithPwd.asJava)
110109
case ujson.Arr(xs) => ujson.Arr(xs.map(rec))
111110
case ujson.Obj(kvs) => ujson.Obj.from(kvs.map((k, v) => (k, rec(v))))

‎core/internal/src/mill/internal/Util.scala‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ private[mill] object Util {
5858
else "`" + s + "`"
5959
}
6060

61-
6261
def parseHeaderData(headerData: String): Map[String, ujson.Value] = {
6362
import org.snakeyaml.engine.v2.api.{Load, LoadSettings}
6463
val loaded = new Load(LoadSettings.builder().build()).loadFromString(headerData)

‎core/resolve/src/mill/resolve/Resolve.scala‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,8 @@ private[mill] trait Resolve[T] {
313313
val resolved = groups.map { case (selectors, args) =>
314314
val selected = selectors.map { case (scopedSel, sel) =>
315315
(scopedSel, sel) match {
316-
case (None, Some(s)) if s.last.value == "kt" || s.last.value == "scala" || s.last.value == "java" =>
316+
case (None, Some(s))
317+
if s.last.value == "kt" || s.last.value == "scala" || s.last.value == "java" =>
317318
Result.Success(scriptModuleResolver(s.render)).map { scriptModule =>
318319
resolveNonEmptyAndHandle(
319320
args,

‎libs/package.mill‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ object `package` extends MillStableScalaModule {
1515
build.libs.scalanativelib,
1616
build.libs.javascriptlib,
1717
build.libs.pythonlib,
18-
build.libs.util,
18+
build.libs.util
1919
)
2020

2121
def runModuleDeps = Seq(
2222
build.libs.init,
2323
build.libs.tabcomplete,
24-
build.libs.scripts,
24+
build.libs.scripts
2525
)
2626
}

‎libs/scripts/src/ScriptModuleInit.scala‎

Lines changed: 102 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,127 +1,144 @@
11
package mill.scripts
22
import mill.*
33
import mill.api.Discover
4-
object ScriptModuleInit extends ((String, Map[String, String]) => mill.api.ExternalModule){
4+
object ScriptModuleInit extends ((String, Map[String, String]) => mill.api.ExternalModule) {
55
def apply(millFileString: String, env: Map[String, String]) = {
66
val workspace = mill.api.BuildCtx.workspaceRoot
77
val millFile = os.Path(millFileString, workspace)
88
val headerData = mill.constants.Util.readBuildHeader(millFile.toNIO, millFile.last, true)
9-
lazy val parsedHeaderData = upickle.read[Map[String, ujson.Value]](mill.internal.Util.parseHeaderData(headerData))
9+
lazy val parsedHeaderData =
10+
upickle.read[Map[String, ujson.Value]](mill.internal.Util.parseHeaderData(headerData))
1011

1112
val testTarget = headerData.linesIterator.collectFirst { case s"tests: $target" => target }
1213
val testTrait = headerData.linesIterator.collectFirst { case s"testTrait: $target" => target }
1314
val bootstrapModule = testTarget match {
1415
case None => millFile.ext match {
15-
case "java" =>
16-
new ScriptModule.Java(millFile) with ScriptModule.Publish {
17-
override lazy val millDiscover = Discover[this.type]
18-
override def buildOverrides = parsedHeaderData
19-
}
20-
case "scala" =>
21-
new ScriptModule.Scala(millFile) with ScriptModule.Publish {
22-
override lazy val millDiscover = Discover[this.type]
23-
override def buildOverrides = parsedHeaderData
24-
}
25-
case "kt" =>
26-
new ScriptModule.Kotlin(millFile) with ScriptModule.Publish {
27-
override lazy val millDiscover = Discover[this.type]
28-
override def buildOverrides = parsedHeaderData
29-
}
30-
}
16+
case "java" =>
17+
new ScriptModule.Java(millFile) with ScriptModule.Publish {
18+
override lazy val millDiscover = Discover[this.type]
19+
override def buildOverrides = parsedHeaderData
20+
}
21+
case "scala" =>
22+
new ScriptModule.Scala(millFile) with ScriptModule.Publish {
23+
override lazy val millDiscover = Discover[this.type]
24+
override def buildOverrides = parsedHeaderData
25+
}
26+
case "kt" =>
27+
new ScriptModule.Kotlin(millFile) with ScriptModule.Publish {
28+
override lazy val millDiscover = Discover[this.type]
29+
override def buildOverrides = parsedHeaderData
30+
}
31+
}
3132
case Some(targetName) =>
3233
val targetPath = millFile / os.up / targetName
3334
import mill.javalib.TestModule.*
3435
millFile.ext match {
3536
case "java" =>
36-
val targetYamlHeader = mill.constants.Util.readBuildHeader(targetPath.toNIO, targetPath.last, true)
37+
mill.constants.Util.readBuildHeader(targetPath.toNIO, targetPath.last, true)
3738
val targetModule = new ScriptModule.Java(targetPath) with ScriptModule.Publish {
3839
override lazy val millDiscover = Discover[this.type]
3940
override def buildOverrides = parsedHeaderData
4041
}
4142
val testModule = testTrait match {
42-
case Some("TestNG") => new ScriptModule.Java(millFile) with targetModule.JavaTests with TestNg {
43-
override lazy val millDiscover = Discover[this.type]
44-
override def buildOverrides = parsedHeaderData
45-
}
46-
case Some("Junit4") => new ScriptModule.Java(millFile) with targetModule.JavaTests with Junit4 {
47-
override lazy val millDiscover = Discover[this.type]
48-
override def buildOverrides = parsedHeaderData
49-
}
50-
case Some("Junit5") => new ScriptModule.Java(millFile) with targetModule.JavaTests with Junit5 {
51-
override lazy val millDiscover = Discover[this.type]
52-
override def buildOverrides = parsedHeaderData
53-
}
43+
case Some("TestNG") =>
44+
new ScriptModule.Java(millFile) with targetModule.JavaTests with TestNg {
45+
override lazy val millDiscover = Discover[this.type]
46+
override def buildOverrides = parsedHeaderData
47+
}
48+
case Some("Junit4") =>
49+
new ScriptModule.Java(millFile) with targetModule.JavaTests with Junit4 {
50+
override lazy val millDiscover = Discover[this.type]
51+
override def buildOverrides = parsedHeaderData
52+
}
53+
case Some("Junit5") =>
54+
new ScriptModule.Java(millFile) with targetModule.JavaTests with Junit5 {
55+
override lazy val millDiscover = Discover[this.type]
56+
override def buildOverrides = parsedHeaderData
57+
}
5458
}
5559
testModule
5660

5761
case "scala" =>
58-
val targetYamlHeader = mill.constants.Util.readBuildHeader(targetPath.toNIO, targetPath.last, true)
62+
mill.constants.Util.readBuildHeader(targetPath.toNIO, targetPath.last, true)
5963
val targetModule = new ScriptModule.Scala(targetPath) with ScriptModule.Publish {
6064
override lazy val millDiscover = Discover[this.type]
6165
override def buildOverrides = parsedHeaderData
6266
}
6367
val testModule = testTrait match {
64-
case Some("TestNG") => new ScriptModule.Scala(millFile) with targetModule.ScalaTests with TestNg {
65-
override lazy val millDiscover = Discover[this.type]
66-
override def buildOverrides = parsedHeaderData
67-
}
68-
case Some("Junit4") => new ScriptModule.Scala(millFile) with targetModule.ScalaTests with Junit4 {
69-
override lazy val millDiscover = Discover[this.type]
70-
override def buildOverrides = parsedHeaderData
71-
}
72-
case Some("Junit5") => new ScriptModule.Scala(millFile) with targetModule.ScalaTests with Junit5 {
73-
override lazy val millDiscover = Discover[this.type]
74-
override def buildOverrides = parsedHeaderData
75-
}
76-
case Some("Scalatest") => new ScriptModule.Scala(millFile) with targetModule.ScalaTests with ScalaTest {
77-
override lazy val millDiscover = Discover[this.type]
78-
override def buildOverrides = parsedHeaderData
79-
}
80-
case Some("Specs2") => new ScriptModule.Scala(millFile) with targetModule.ScalaTests with Specs2 {
81-
override lazy val millDiscover = Discover[this.type]
82-
override def buildOverrides = parsedHeaderData
83-
}
84-
case Some("Utest") => new ScriptModule.Scala(millFile) with targetModule.ScalaTests with Utest {
85-
override lazy val millDiscover = Discover[this.type]
86-
override def buildOverrides = parsedHeaderData
87-
}
88-
case Some("Munit") => new ScriptModule.Scala(millFile) with targetModule.ScalaTests with Munit {
89-
override lazy val millDiscover = Discover[this.type]
90-
override def buildOverrides = parsedHeaderData
91-
}
92-
case Some("Weaver") => new ScriptModule.Scala(millFile) with targetModule.ScalaTests with Weaver {
93-
override lazy val millDiscover = Discover[this.type]
94-
override def buildOverrides = parsedHeaderData
95-
}
96-
case Some("ZioTest") => new ScriptModule.Scala(millFile) with targetModule.ScalaTests with ZioTest {
97-
override lazy val millDiscover = Discover[this.type]
98-
override def buildOverrides = parsedHeaderData
99-
}
100-
case Some("ScalaCheck") => new ScriptModule.Scala(millFile) with targetModule.ScalaTests with ScalaCheck {
101-
override lazy val millDiscover = Discover[this.type]
102-
override def buildOverrides = parsedHeaderData
103-
}
68+
case Some("TestNG") =>
69+
new ScriptModule.Scala(millFile) with targetModule.ScalaTests with TestNg {
70+
override lazy val millDiscover = Discover[this.type]
71+
override def buildOverrides = parsedHeaderData
72+
}
73+
case Some("Junit4") =>
74+
new ScriptModule.Scala(millFile) with targetModule.ScalaTests with Junit4 {
75+
override lazy val millDiscover = Discover[this.type]
76+
override def buildOverrides = parsedHeaderData
77+
}
78+
case Some("Junit5") =>
79+
new ScriptModule.Scala(millFile) with targetModule.ScalaTests with Junit5 {
80+
override lazy val millDiscover = Discover[this.type]
81+
override def buildOverrides = parsedHeaderData
82+
}
83+
case Some("Scalatest") =>
84+
new ScriptModule.Scala(millFile) with targetModule.ScalaTests with ScalaTest {
85+
override lazy val millDiscover = Discover[this.type]
86+
override def buildOverrides = parsedHeaderData
87+
}
88+
case Some("Specs2") =>
89+
new ScriptModule.Scala(millFile) with targetModule.ScalaTests with Specs2 {
90+
override lazy val millDiscover = Discover[this.type]
91+
override def buildOverrides = parsedHeaderData
92+
}
93+
case Some("Utest") =>
94+
new ScriptModule.Scala(millFile) with targetModule.ScalaTests with Utest {
95+
override lazy val millDiscover = Discover[this.type]
96+
override def buildOverrides = parsedHeaderData
97+
}
98+
case Some("Munit") =>
99+
new ScriptModule.Scala(millFile) with targetModule.ScalaTests with Munit {
100+
override lazy val millDiscover = Discover[this.type]
101+
override def buildOverrides = parsedHeaderData
102+
}
103+
case Some("Weaver") =>
104+
new ScriptModule.Scala(millFile) with targetModule.ScalaTests with Weaver {
105+
override lazy val millDiscover = Discover[this.type]
106+
override def buildOverrides = parsedHeaderData
107+
}
108+
case Some("ZioTest") =>
109+
new ScriptModule.Scala(millFile) with targetModule.ScalaTests with ZioTest {
110+
override lazy val millDiscover = Discover[this.type]
111+
override def buildOverrides = parsedHeaderData
112+
}
113+
case Some("ScalaCheck") =>
114+
new ScriptModule.Scala(millFile) with targetModule.ScalaTests with ScalaCheck {
115+
override lazy val millDiscover = Discover[this.type]
116+
override def buildOverrides = parsedHeaderData
117+
}
104118
}
105119
testModule
106120

107121
case "kt" =>
108-
val targetYamlHeader = mill.constants.Util.readBuildHeader(targetPath.toNIO, targetPath.last, true)
122+
mill.constants.Util.readBuildHeader(targetPath.toNIO, targetPath.last, true)
109123
val targetModule = new ScriptModule.Kotlin(targetPath) with ScriptModule.Publish {
110124
override lazy val millDiscover = Discover[this.type]
111125
}
112126
val testModule = testTrait match {
113-
case Some("TestNG") => new ScriptModule.Kotlin(millFile) with targetModule.KotlinTests with TestNg {
114-
override lazy val millDiscover = Discover[this.type]
115-
override def buildOverrides = parsedHeaderData
116-
}
117-
case Some("Junit4") => new ScriptModule.Kotlin(millFile) with targetModule.KotlinTests with Junit4 {
118-
override lazy val millDiscover = Discover[this.type]
119-
override def buildOverrides = parsedHeaderData
120-
}
121-
case Some("Junit5") => new ScriptModule.Kotlin(millFile) with targetModule.KotlinTests with Junit5 {
122-
override lazy val millDiscover = Discover[this.type]
123-
override def buildOverrides = parsedHeaderData
124-
}
127+
case Some("TestNG") =>
128+
new ScriptModule.Kotlin(millFile) with targetModule.KotlinTests with TestNg {
129+
override lazy val millDiscover = Discover[this.type]
130+
override def buildOverrides = parsedHeaderData
131+
}
132+
case Some("Junit4") =>
133+
new ScriptModule.Kotlin(millFile) with targetModule.KotlinTests with Junit4 {
134+
override lazy val millDiscover = Discover[this.type]
135+
override def buildOverrides = parsedHeaderData
136+
}
137+
case Some("Junit5") =>
138+
new ScriptModule.Kotlin(millFile) with targetModule.KotlinTests with Junit5 {
139+
override lazy val millDiscover = Discover[this.type]
140+
override def buildOverrides = parsedHeaderData
141+
}
125142
}
126143
testModule
127144
}

‎runner/daemon/package.mill‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ object `package` extends MillPublishScalaModule {
3535
build.runner.server,
3636
build.runner.launcher,
3737
build.runner.meta,
38-
build.libs.scripts,
38+
build.libs.scripts
3939
)
4040
}

‎runner/daemon/src/mill/daemon/MillBuildBootstrap.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ class MillBuildBootstrap(
222222
.map(_.hashCode())
223223
.getOrElse(0),
224224
depth,
225-
actualBuildFileName = nestedState.buildFile,
225+
actualBuildFileName = nestedState.buildFile
226226
)) { evaluator =>
227227
if (depth == requestedDepth) {
228228
processFinalTasks(nestedState, buildFileApi, evaluator)
@@ -403,7 +403,7 @@ object MillBuildBootstrap {
403403
millClassloaderSigHash: Int,
404404
millClassloaderIdentityHash: Int,
405405
depth: Int,
406-
actualBuildFileName: Option[String] = None,
406+
actualBuildFileName: Option[String] = None
407407
): EvaluatorApi = {
408408
val bootLogPrefix: Seq[String] =
409409
if (depth == 0) Nil
@@ -418,7 +418,7 @@ object MillBuildBootstrap {
418418
val cl = rootModule.getClass.getClassLoader
419419
val evalImplCls = cl.loadClass("mill.eval.EvaluatorImpl")
420420
val execCls = cl.loadClass("mill.exec.Execution")
421-
val classpath = System.getProperty("java.class.path")
421+
System.getProperty("java.class.path")
422422
val scriptInitCls = cl.loadClass("mill.scripts.ScriptModuleInit$")
423423
lazy val evaluator: EvaluatorApi = evalImplCls.getConstructors.head.newInstance(
424424
allowPositionalCommandArgs,
@@ -441,7 +441,7 @@ object MillBuildBootstrap {
441441
(reason: String, exitCode: Int) => systemExit(reason, exitCode),
442442
streams0,
443443
() => evaluator,
444-
offline,
444+
offline
445445
),
446446
scriptInitCls.getField("MODULE$").get(null)
447447
).asInstanceOf[EvaluatorApi]

‎testkit/src/mill/testkit/UnitTester.scala‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ class UnitTester(
135135
throw Exception(s"systemExit called: reason=$reason, exitCode=$exitCode"),
136136
exclusiveSystemStreams = new SystemStreams(outStream, errStream, inStream),
137137
getEvaluator = () => evaluator,
138-
offline = offline,
138+
offline = offline
139139
)
140140

141141
val evaluator: Evaluator = new mill.eval.EvaluatorImpl(
@@ -147,7 +147,12 @@ class UnitTester(
147147

148148
def apply(args: String*): Either[ExecResult.Failing[?], UnitTester.Result[Seq[?]]] = {
149149
Evaluator.withCurrentEvaluator(evaluator) {
150-
Resolve.Tasks.resolve(evaluator.rootModule, args, SelectMode.Separated, scriptModuleResolver = _ => ???)
150+
Resolve.Tasks.resolve(
151+
evaluator.rootModule,
152+
args,
153+
SelectMode.Separated,
154+
scriptModuleResolver = _ => ???
155+
)
151156
} match {
152157
case Result.Failure(err) => Left(ExecResult.Failure(err))
153158
case Result.Success(resolved) => apply(resolved)

0 commit comments

Comments
 (0)