Fix

Author: sake92

kotlinlib/src/mill/kotlinlib/android/AndroidAppKotlinModule.scala

@@ -251,7 +251,8 @@ trait AndroidAppKotlinModule extends AndroidAppModule with KotlinModule { outer
           "-Dlayoutlib.thread.profile.timeoutms=10000",
           "-Djava.security.manager=allow"
         ),
-        mainArgs = Seq(composePreviewArgs().path.toString())
+        mainArgs = Seq(composePreviewArgs().path.toString()),
+        cwd = Task.dest
       )
       mill.util.ProcessUtil.toResult(processResult).getOrThrow
       val previewGenOut = processResult.out.lines()

main/util/src/mill/util/Jvm.scala

@@ -35,9 +35,9 @@ object Jvm extends CoursierSupport {
    * @param env Environment variables used when starting the forked JVM
    * @param propagateEnv If `true` then the current process' environment variables are propagated to subprocess
    * @param cwd The working directory to be used by the forked JVM
-   * @param stdin Standard input override
-   * @param stdout Standard output override
-   * @param stderr Standard error override
+   * @param stdin Standard input
+   * @param stdout Standard output
+   * @param stderr Standard error
    * @param mergeErrIntoOut If `true` then the error output is merged into standard output
    */
   def call(
@@ -70,20 +70,20 @@ object Jvm extends CoursierSupport {
         classPath
       }
 
-    val commandArgs =
-      Vector(javaExe(javaHome)) ++
+    val commandArgs = (Vector(javaExe(javaHome)) ++
         jvmArgs ++
-        Vector("-cp", cp.mkString(java.io.File.pathSeparator), mainClass) ++
+        Option.when(cp.nonEmpty)(Vector("-cp", cp.mkString(java.io.File.pathSeparator))).getOrElse(Vector.empty) ++
+        Vector(mainClass) ++
         mainArgs
+        ).filterNot(_.isBlank)
 
-    val workingDir1 = Option(cwd).getOrElse(ctx.dest)
-    os.makeDir.all(workingDir1)
+    if (cwd != null) os.makeDir.all(cwd)
 
-    ctx.log.debug(s"Run subprocess with args: ${commandArgs.map(a => s"'${a}'").mkString(" ")}")
+    ctx.log.debug(s"Call subprocess with args: ${commandArgs.map(a => s"'${a}'").mkString(" ")}")
 
     os.proc(commandArgs)
       .call(
-        cwd = workingDir1,
+        cwd = cwd,
         env = env,
         check = false,
         stdin = stdin,
@@ -148,22 +148,18 @@ object Jvm extends CoursierSupport {
         classPath
       }
 
-    val cpArgument = if (cp.nonEmpty) {
-      Vector("-cp", cp.mkString(java.io.File.pathSeparator))
-    } else Seq.empty
-    val mainClassArgument = if (mainClass.nonEmpty) {
-      Seq(mainClass)
-    } else Seq.empty
-    val args =
-      Vector(javaExe(javaHome)) ++
-        jvmArgs ++
-        cpArgument ++
-        mainClassArgument ++
-        mainArgs
+    val commandArgs =    (Vector(javaExe(javaHome)) ++
+      jvmArgs ++
+      Option.when(cp.nonEmpty)(Vector("-cp", cp.mkString(java.io.File.pathSeparator))).getOrElse(Vector.empty) ++
+      Vector(mainClass) ++
+      mainArgs
+      ).filterNot(_.isBlank)
 
-    ctx.log.debug(s"Run subprocess with args: ${args.map(a => s"'${a}'").mkString(" ")}")
+    if (cwd != null) os.makeDir.all(cwd)
+
+    ctx.log.debug(s"Spawn subprocess with args: ${commandArgs.map(a => s"'${a}'").mkString(" ")}")
 
-    val process = os.proc(args).spawn(
+    val process = os.proc(commandArgs).spawn(
       cwd = cwd,
       env = env,
       stdin = stdin,

scalalib/src/mill/scalalib/JavaModule.scala

@@ -1206,6 +1206,8 @@ trait JavaModule
     super.forkEnv()
   }
 
+  def launcher: T[PathRef] = Task { launcher0() }
+
   /**
    * Task that print the transitive dependency tree to STDOUT.
    * NOTE: that when `whatDependsOn` is used with `inverse` it will just

scalalib/src/mill/scalalib/RunModule.scala

@@ -53,7 +53,8 @@ trait RunModule extends WithZincWorker {
         classPath = zincWorker().classpath().map(_.path).toVector,
         mainArgs = Seq(classpath.mkString(",")),
         javaHome = zincWorker().javaHome().map(_.path),
-        stdout = os.Pipe
+        stdout = os.Pipe,
+        cwd = Task.dest
       )
       mill.util.ProcessUtil.toResult(processResult).getOrThrow
       processResult.out.lines()
@@ -340,7 +341,7 @@ object RunModule {
           env = env,
           mainArgs = mainArgs,
           cwd = cwd,
-          stdin = ProcessInput.makeSourceInput(""): os.ProcessInput,
+          stdin = "",
           stdout = stdout,
           stderr = stderr,
           useCpPassingJar = useClasspathPassingJar,

scalalib/src/mill/scalalib/ScalaModule.scala

@@ -434,7 +434,7 @@ trait ScalaModule extends JavaModule with TestModule.ScalaModuleBase { outer =>
     } else {
       val useJavaCp = "-usejavacp"
 
-      Jvm.spawn(
+      val processResult = Jvm.call(
         mainClass =
           if (ZincWorkerUtil.isDottyOrScala3(scalaVersion()))
             "dotty.tools.repl.Main"
@@ -448,6 +448,7 @@ trait ScalaModule extends JavaModule with TestModule.ScalaModuleBase { outer =>
         mainArgs = Seq(useJavaCp) ++ consoleScalacOptions().filterNot(Set(useJavaCp)),
         cwd = forkWorkingDir()
       )
+      mill.util.ProcessUtil.toResult(processResult).getOrThrow
       Result.Success(())
     }
   }
@@ -509,14 +510,15 @@ trait ScalaModule extends JavaModule with TestModule.ScalaModuleBase { outer =>
     } else {
       val mainClass = ammoniteMainClass()
       Task.log.debug(s"Using ammonite main class: ${mainClass}")
-      Jvm.spawn(
+      val processResult = Jvm.call(
         mainClass = mainClass,
         classPath = ammoniteReplClasspath().map(_.path).toVector,
         jvmArgs = forkArgs(),
         env = forkEnv(),
         mainArgs = replOptions,
         cwd = forkWorkingDir()
       )
+      mill.util.ProcessUtil.toResult(processResult).getOrThrow
       Result.Success(())
     }
 

scalalib/src/mill/scalalib/TestModule.scala

@@ -50,7 +50,8 @@ trait TestModule
             testClasspath().flatMap(p => Seq("--testCp", p.path.toString())) ++
             Seq("--framework", testFramework()),
         javaHome = zincWorker().javaHome().map(_.path),
-        stdout = os.Pipe
+        stdout = os.Pipe,
+        cwd = Task.dest
       )
       mill.util.ProcessUtil.toResult(processResult).getOrThrow
       processResult.out.lines()

scalalib/src/mill/scalalib/TestModuleUtil.scala

@@ -112,7 +112,8 @@ private[scalalib] object TestModuleUtil {
                 selectors.flatMap(s => Seq("--selectors", s)) ++
                 args.flatMap(s => Seq("--args", s)),
             javaHome = javaHome,
-            stdout = os.Pipe
+            stdout = os.Pipe,
+            cwd = Task.dest
           )
           mill.util.ProcessUtil.toResult(processResult).getOrThrow
           processResult.out.lines().toSet