Skip to content

Commit 2a52dac

Browse files
[autofix.ci] apply automated fixes
1 parent 62989aa commit 2a52dac

File tree

2 files changed

+21
-10
lines changed

2 files changed

+21
-10
lines changed

runner/launcher/src/mill/launcher/CoursierClient.scala

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import scala.concurrent.duration.Duration
1212
import mill.coursierutil.TestOverridesRepo
1313

1414
object CoursierClient {
15+
1516
/**
1617
* Resolves the classpath for the mill daemon.
1718
*
@@ -28,12 +29,20 @@ object CoursierClient {
2829
.withCache(coursierCache0)
2930
.withDependencies(Seq(
3031
Dependency(
31-
Module(Organization("com.lihaoyi"), ModuleName("mill-runner-daemon_3"), attributes = Map.empty),
32+
Module(
33+
Organization("com.lihaoyi"),
34+
ModuleName("mill-runner-daemon_3"),
35+
attributes = Map.empty
36+
),
3237
VersionConstraint(mill.client.BuildInfo.millVersion)
3338
)
3439
) ++ scalaLibraryVersion.map { version =>
3540
Dependency(
36-
Module(Organization("org.scala-lang"), ModuleName("scala3-library_3"), attributes = Map.empty),
41+
Module(
42+
Organization("org.scala-lang"),
43+
ModuleName("scala3-library_3"),
44+
attributes = Map.empty
45+
),
3746
VersionConstraint(version)
3847
)
3948
})

runner/launcher/src/mill/launcher/MillProcessLauncher.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,13 @@ static List<String> loadMillConfig(String key) throws Exception {
121121
Object conf = mill.launcher.ConfigReader.readYaml(
122122
buildFile, buildFile.getFileName().toString());
123123
if (!(conf instanceof Map)) return new String[] {};
124-
@SuppressWarnings("unchecked") Map<String, Object> conf2 = (Map<String, Object>) conf;
124+
@SuppressWarnings("unchecked")
125+
Map<String, Object> conf2 = (Map<String, Object>) conf;
125126

126127
if (!conf2.containsKey(key)) return new String[] {};
127128
if (conf2.get(key) instanceof List) {
128-
@SuppressWarnings("unchecked") List<String> list = (List<String>) conf2.get(key);
129+
@SuppressWarnings("unchecked")
130+
List<String> list = (List<String>) conf2.get(key);
129131
String[] arr = new String[list.size()];
130132
for (int i = 0; i < arr.length; i++) {
131133
arr[i] = mill.constants.Util.interpolateEnvVars(list.get(i), env);
@@ -240,13 +242,13 @@ static List<String> millLaunchJvmCommand() throws Exception {
240242
var maybeScalaLibraryVersion = millScalaLibraryVersion();
241243
vmOptions.add("-XX:+HeapDumpOnOutOfMemoryError");
242244
vmOptions.add("-cp");
243-
var classPathCacheKey =
244-
"mill:" + BuildInfo.millVersion +
245-
",scala-library-version:" + (maybeScalaLibraryVersion == null ? "default" : maybeScalaLibraryVersion);
245+
var classPathCacheKey = "mill:" + BuildInfo.millVersion + ",scala-library-version:"
246+
+ (maybeScalaLibraryVersion == null ? "default" : maybeScalaLibraryVersion);
246247
String[] runnerClasspath = cachedComputedValue0(
247-
"resolve-runner", classPathCacheKey,
248-
() -> CoursierClient.resolveMillDaemon(Option$.MODULE$.apply(maybeScalaLibraryVersion)),
249-
arr -> {
248+
"resolve-runner",
249+
classPathCacheKey,
250+
() -> CoursierClient.resolveMillDaemon(Option$.MODULE$.apply(maybeScalaLibraryVersion)),
251+
arr -> {
250252
for (String s : arr) {
251253
if (!Files.exists(Paths.get(s))) return false;
252254
}

0 commit comments

Comments
 (0)