Merge branch 'main' into code-review

Author: lefou

.github/workflows/run-tests.yml

@@ -243,7 +243,7 @@ jobs:
         include:
           # bootstrap tests
           - java-version: 11 # Have one job on oldest JVM
-            buildcmd: ci/test-dist-run.sh && ci/test-install-local.sh && ./mill -i -k __.ivyDepsTree && ./mill -i -k __.ivyDepsTree --withRuntime
+            buildcmd: ci/test-dist-run.sh && ci/test-install-local.sh && ./mill -i -k __:^IntegrationCrossModule:^TestModule.ivyDepsTree && ./mill -i -k __:^IntegrationCrossModule:^TestModule.ivyDepsTree --withRuntime
           - java-version: 17 # Have one job on default JVM
             buildcmd: ci/test-mill-bootstrap.sh
 

bsp/src/mill/bsp/BSP.scala

@@ -1,7 +1,7 @@
 package mill.bsp
 
 import mill.api.{Ctx, PathRef}
-import mill.{Agg, T, Task, given}
+import mill.{T, Task, given}
 import mill.define.{Command, Discover, ExternalModule}
 import mill.main.BuildInfo
 import mill.eval.Evaluator
@@ -12,7 +12,7 @@ object BSP extends ExternalModule with CoursierModule {
 
   lazy val millDiscover = Discover[this.type]
 
-  private def bspWorkerLibs: T[Agg[PathRef]] = Task {
+  private def bspWorkerLibs: T[Seq[PathRef]] = Task {
     millProjectModule("mill-bsp-worker", repositoriesTask())
   }
 

bsp/src/mill/bsp/BspContext.scala

@@ -1,6 +1,6 @@
 package mill.bsp
 
-import mill.api.{DummyInputStream, Logger, SystemStreams}
+import mill.api.{DummyInputStream, Logger, Result, SystemStreams}
 
 import java.io.PrintStream
 import scala.util.control.NonFatal
@@ -27,10 +27,7 @@ private[mill] class BspContext(
         streams = streams,
         logStream = bspLogStream,
         canReload = true
-      ) match {
-        case Left(err) => sys.error(err)
-        case Right(res) => res
-      }
+      ).get
     } catch {
       case NonFatal(e) =>
         streams.err.println(s"Could not start BSP server. ${e.getMessage}")
@@ -43,7 +40,7 @@ private[mill] class BspContext(
       streams: SystemStreams,
       logStream: Option[PrintStream],
       canReload: Boolean
-  ): Either[String, BspServerHandle] = {
+  ): Result[BspServerHandle] = {
     val log: Logger = new Logger {
       override def colored: Boolean = false
       override def systemStreams: SystemStreams = new SystemStreams(

bsp/src/mill/bsp/BspWorker.scala

@@ -1,6 +1,6 @@
 package mill.bsp
 
-import mill.api.{Logger, SystemStreams}
+import mill.api.{Logger, SystemStreams, Result}
 
 import java.io.PrintStream
 import java.net.URL
@@ -13,7 +13,7 @@ private trait BspWorker {
       logStream: PrintStream,
       logDir: os.Path,
       canReload: Boolean
-  ): Either[String, BspServerHandle]
+  ): Result[BspServerHandle]
 }
 
 private object BspWorker {
@@ -25,9 +25,9 @@ private object BspWorker {
       home0: os.Path,
       log: Logger,
       workerLibs: Option[Seq[URL]] = None
-  ): Either[String, BspWorker] = boundary {
+  ): Result[BspWorker] = boundary {
     worker match {
-      case Some(x) => Right(x)
+      case Some(x) => Result.Success(x)
       case None =>
         val urls = workerLibs.map { urls =>
           log.debug("Using direct submitted worker libs")
@@ -36,7 +36,7 @@ private object BspWorker {
           // load extra classpath entries from file
           val resources = s"${Constants.serverName}-${mill.main.BuildInfo.millVersion}.resources"
           val cpFile = workspace / Constants.bspDir / resources
-          if (!os.exists(cpFile)) boundary.break(Left(
+          if (!os.exists(cpFile)) boundary.break(Result.Failure(
             "You need to run `mill mill.bsp.BSP/install` before you can use the BSP server"
           ))
 
@@ -54,7 +54,7 @@ private object BspWorker {
         val ctr = workerCls.getConstructor()
         val workerImpl = ctr.newInstance().asInstanceOf[BspWorker]
         worker = Some(workerImpl)
-        Right(workerImpl)
+        Result.Success(workerImpl)
     }
   }
 

bsp/worker/src/mill/bsp/worker/BspWorkerImpl.scala

@@ -4,7 +4,7 @@ import ch.epfl.scala.bsp4j.BuildClient
 import mill.main.BuildInfo
 import mill.bsp.{BspServerHandle, BspServerResult, BspWorker, Constants}
 import mill.eval.Evaluator
-import mill.api.SystemStreams
+import mill.api.{Result, SystemStreams}
 import org.eclipse.lsp4j.jsonrpc.Launcher
 
 import java.io.{PrintStream, PrintWriter}
@@ -20,7 +20,7 @@ private class BspWorkerImpl() extends BspWorker {
       logStream: PrintStream,
       logDir: os.Path,
       canReload: Boolean
-  ): Either[String, BspServerHandle] = {
+  ): mill.api.Result[BspServerHandle] = {
 
     val millServer =
       new MillBuildServer(
@@ -90,12 +90,12 @@ private class BspWorkerImpl() extends BspWorker {
         executor.shutdown()
       }).start()
 
-      Right(bspServerHandle)
+      Result.Success(bspServerHandle)
     } catch {
       case _: CancellationException =>
-        Left("The mill server was shut down.")
+        Result.Failure("The mill server was shut down.")
       case e: Exception =>
-        Left(
+        Result.Failure(
           s"""An exception occurred while connecting to the client.
              |Cause: ${e.getCause}
              |Message: ${e.getMessage}

bsp/worker/src/mill/bsp/worker/MillBuildServer.scala

@@ -3,15 +3,9 @@ package mill.bsp.worker
 import ch.epfl.scala.bsp4j
 import ch.epfl.scala.bsp4j._
 import com.google.gson.JsonObject
-import mill.api.Loose.Agg
-import mill.api.{
-  ColorLogger,
-  CompileProblemReporter,
-  DummyTestReporter,
-  Result,
-  Strict,
-  TestReporter
-}
+
+import mill.api.ExecResult
+import mill.api.{ColorLogger, CompileProblemReporter, DummyTestReporter, Result, TestReporter}
 import mill.bsp.{BspServerResult, Constants}
 import mill.bsp.worker.Utils.{makeBuildTarget, outputPaths, sanitizeUri}
 import mill.define.Segment.Label
@@ -273,7 +267,7 @@ private class MillBuildServer(
       }.toSeq
 
       val ids = groupList(tasksEvaluators)(_._2)(_._1)
-        .flatMap { case (ev, ts) => ev.evalOrThrow()(ts) }
+        .flatMap { case (ev, ts) => ev.evaluateValues(ts) }
         .flatten
 
       new InverseSourcesResult(ids.asJava)
@@ -479,7 +473,7 @@ private class MillBuildServer(
       val runTask = module.run(Task.Anon(Args(args)))
       val runResult = evaluate(
         ev,
-        Strict.Agg(runTask),
+        Seq(runTask),
         Utils.getBspLoggedReporterPool(runParams.getOriginId, state.bspIdByModule, client),
         logger = new MillBspLogger(client, runTask.hashCode(), ev.baseLogger)
       )
@@ -544,7 +538,7 @@ private class MillBuildServer(
 
               val results = evaluate(
                 ev,
-                Strict.Agg(testTask),
+                Seq(testTask),
                 Utils.getBspLoggedReporterPool(
                   testParams.getOriginId,
                   state.bspIdByModule,
@@ -605,16 +599,15 @@ private class MillBuildServer(
             val cleanTask = mainModule.clean(ev, Seq(compileTargetName)*)
             val cleanResult = evaluate(
               ev,
-              Strict.Agg(cleanTask),
+              Seq(cleanTask),
               logger = new MillBspLogger(client, cleanTask.hashCode, ev.baseLogger)
             )
             if (cleanResult.failing.size > 0) (
               msg + s" Target ${compileTargetName} could not be cleaned. See message from mill: \n" +
                 (cleanResult.results(cleanTask) match {
-                  case TaskResult(Result.Failure(msg, _), _) => msg
-                  case TaskResult(ex: Result.Exception, _) => ex.toString()
-                  case TaskResult(Result.Skipped, _) => "Task was skipped"
-                  case TaskResult(Result.Aborted, _) => "Task was aborted"
+                  case TaskResult(ex: ExecResult.Exception, _) => ex.toString()
+                  case TaskResult(ExecResult.Skipped, _) => "Task was skipped"
+                  case TaskResult(ExecResult.Aborted, _) => "Task was aborted"
                   case _ => "could not retrieve the failure message"
                 }),
               false
@@ -680,7 +673,7 @@ private class MillBuildServer(
         .map { case ((ev, id), ts) =>
           val results = evaluate(ev, ts)
           val failures = results.results.collect {
-            case (_, TaskResult(res: Result.Failing[_], _)) => res
+            case (_, TaskResult(res: ExecResult.Failing[_], _)) => res
           }
 
           def logError(errorMsg: String): Unit = {
@@ -807,7 +800,7 @@ private class MillBuildServer(
 
   private def evaluate(
       evaluator: Evaluator,
-      goals: Agg[Task[?]],
+      goals: Seq[Task[?]],
       reporter: Int => Option[CompileProblemReporter] = _ => Option.empty[CompileProblemReporter],
       testReporter: TestReporter = DummyTestReporter,
       logger: ColorLogger = null
@@ -823,7 +816,7 @@ private class MillBuildServer(
       },
       streams = logger0.systemStreams
     ) {
-      evaluator.evaluate(
+      evaluator.execution.executeTasks(
         goals,
         reporter,
         testReporter,

bsp/worker/src/mill/bsp/worker/MillScalaBuildServer.scala

@@ -13,7 +13,7 @@ import ch.epfl.scala.bsp4j.{
   ScalacOptionsParams,
   ScalacOptionsResult
 }
-import mill.{Agg, Task}
+import mill.Task
 import mill.bsp.worker.Utils.sanitizeUri
 import mill.util.Jvm
 import mill.scalalib.{JavaModule, ScalaModule, TestModule, UnresolvedPath}
@@ -41,7 +41,7 @@ private trait MillScalaBuildServer extends ScalaBuildServer { this: MillBuildSer
           val compileClasspathTask =
             if (enableJvmCompileClasspathProvider) {
               // We have a dedicated request for it
-              Task.Anon { Agg.empty[UnresolvedPath] }
+              Task.Anon { Seq.empty[UnresolvedPath] }
             } else {
               m.bspCompileClasspath
             }
@@ -119,7 +119,7 @@ private trait MillScalaBuildServer extends ScalaBuildServer { this: MillBuildSer
       }
     ) {
       case (ev, state, id, m: TestModule, Some((classpath, testFramework, testClasspath))) =>
-        val (frameworkName, classFingerprint): (String, Agg[(Class[?], Fingerprint)]) =
+        val (frameworkName, classFingerprint): (String, Seq[(Class[?], Fingerprint)]) =
           Jvm.withClassLoader(
             classPath = classpath.map(_.path).toVector,
             sharedPrefixes = Seq("sbt.testing.")
@@ -128,7 +128,7 @@ private trait MillScalaBuildServer extends ScalaBuildServer { this: MillBuildSer
             val discoveredTests = TestRunnerUtils.discoverTests(
               classLoader,
               framework,
-              Agg.from(testClasspath.map(_.path))
+              Seq.from(testClasspath.map(_.path))
             )
             (framework.name(), discoveredTests)
           }: @unchecked

bsp/worker/src/mill/bsp/worker/Utils.scala

@@ -11,7 +11,7 @@ import ch.epfl.scala.bsp4j.{
   TaskId
 }
 import mill.api.{CompileProblemReporter, PathRef}
-import mill.api.Result.{Skipped, Success}
+import mill.api.ExecResult.{Skipped, Success}
 import mill.exec.ExecResults
 import mill.scalalib.JavaModule
 import mill.scalalib.bsp.{BspBuildTarget, BspModule}

build.mill

@@ -392,6 +392,7 @@ trait MillJavaModule extends JavaModule {
   }
 
   def testIvyDeps: T[Agg[Dep]] = Agg(Deps.TestDeps.utest)
+  def testForkEnv: T[Map[String, String]] = forkEnv()
   def testModuleDeps: Seq[JavaModule] =
     if (this == build.main) Seq(build.main)
     else Seq(this, build.main.test)
@@ -540,7 +541,7 @@ trait MillScalaModule extends ScalaModule with MillJavaModule with ScalafixModul
     def forkArgs = super.forkArgs() ++ outer.testArgs()
     def moduleDeps = outer.testModuleDeps
     def ivyDeps = super.ivyDeps() ++ outer.testIvyDeps()
-    def forkEnv = super.forkEnv() ++ outer.forkEnv()
+    def forkEnv = super.forkEnv() ++ outer.testForkEnv()
     override def testForkGrouping = discoveredTestClasses().grouped(1).toSeq
   }
 }

ci/mill-bootstrap.patch

@@ -1,5 +1,5 @@
 diff --git a/build.mill b/build.mill
-index 7a8ea3a31a5..5b77aa31591 100644
+index 019adfc8cb9..c9df11158ef 100644
 --- a/build.mill
 +++ b/build.mill
 @@ -1,16 +1,16 @@
@@ -65,7 +65,25 @@ index 7a8ea3a31a5..5b77aa31591 100644
    def scalaVersion = Deps.scalaVersion
    def scalapVersion: T[String] = Deps.scala2Version
    def scalafixScalaBinaryVersion = T {
-@@ -535,7 +535,7 @@ trait MillScalaModule extends ScalaModule with MillJavaModule with ScalafixModul
+@@ -520,8 +520,8 @@ trait MillScalaModule extends ScalaModule with MillJavaModule with ScalafixModul
+     val binaryVersion = ZincWorkerUtil.scalaBinaryVersion(sv)
+     val hasModuleDefs = binaryVersion == "2.13" || binaryVersion == "3"
+     super.scalacPluginIvyDeps() ++
+-      Agg.when(binaryVersion != "3")(Deps.acyclic) ++
+-      Agg.when(hasModuleDefs)(Deps.millModuledefsPlugin)
++      Option.when(binaryVersion != "3")(Deps.acyclic) ++
++      Option.when(hasModuleDefs)(Deps.millModuledefsPlugin)
+   }
+ 
+   def mandatoryIvyDeps = T {
+@@ -529,13 +529,13 @@ trait MillScalaModule extends ScalaModule with MillJavaModule with ScalafixModul
+     val binaryVersion = ZincWorkerUtil.scalaBinaryVersion(sv)
+     val hasModuleDefs = binaryVersion == "2.13" || binaryVersion == "3"
+     super.mandatoryIvyDeps() ++
+-      Agg.when(hasModuleDefs)(Deps.millModuledefs)
++      Option.when(hasModuleDefs)(Deps.millModuledefs)
+   }
+ 
    /** Default tests module. */
    lazy val test: MillScalaTests = new MillScalaTests {}
    trait MillScalaTests extends ScalaTests with MillJavaModule with MillBaseTestsModule
@@ -94,7 +112,7 @@ index 7a8ea3a31a5..5b77aa31591 100644
 
  object bridge extends Cross[BridgeModule](compilerBridgeScalaVersions)
 diff --git a/contrib/package.mill b/contrib/package.mill
-index 421b2955955..7277bba90ff 100644
+index 421b2955955..30c453234b9 100644
 --- a/contrib/package.mill
 +++ b/contrib/package.mill
 @@ -3,13 +3,12 @@ package build.contrib
@@ -141,6 +159,15 @@ index 421b2955955..7277bba90ff 100644
        }
 
        def scalaVersion = build.Deps.play(playBinary).scalaVersion
+@@ -139,7 +138,7 @@ object `package` extends RootModule {
+           build.Deps.scalacScoverage2Reporter,
+           build.Deps.scalacScoverage2Domain,
+           build.Deps.scalacScoverage2Serializer
+-        ) ++ Agg.when(!ZincWorkerUtil.isScala3(scalaVersion()))(build.Deps.scalacScoverage2Plugin)
++        ) ++ Option.when(!ZincWorkerUtil.isScala3(scalaVersion()))(build.Deps.scalacScoverage2Plugin)
+       }
+       def mandatoryIvyDeps = Agg.empty[Dep]
+     }
 diff --git a/core/codesig/package.mill b/core/codesig/package.mill
 index e49f218f4be..9d03aa073f3 100644
 --- a/core/codesig/package.mill
@@ -518,6 +545,19 @@ index af00b40d3f0..303bb74cbc0 100644
    trait IntegrationCrossModule extends build.MillScalaModule with IntegrationTestModule {
      override def moduleDeps = super[IntegrationTestModule].moduleDeps
      def forkEnv = super.forkEnv() ++ Seq(
+diff --git a/main/package.mill b/main/package.mill
+index 08980f56dda..fe819532072 100644
+--- a/main/package.mill
++++ b/main/package.mill
+@@ -63,7 +63,7 @@ object `package` extends RootModule with build.MillStableScalaModule with BuildI
+             build.dist.resolutionCustomizer(),
+             Some(Task.ctx()),
+             build.dist.coursierCacheCustomizer()
+-          ).getOrThrow.minDependencies.toSeq
++          ).get.minDependencies.toSeq
+             // change to this when bumping Mill
+             //   ).getOrThrow.minDependencies.toSeq
+             .map(d => s"${d.module.organization.value}:${d.module.name.value}:${d.version}")
 diff --git a/mill-build/build.mill b/mill-build/build.mill
 index 957d929826d..112f1aaccb8 100644
 --- a/mill-build/build.mill

contrib/bloop/src/mill/contrib/bloop/BloopImpl.scala

@@ -191,7 +191,7 @@ class BloopImpl(evs: () => Seq[Evaluator], wd: os.Path) extends ExternalModule {
 
     val classpath = Task.Anon {
       val transitiveCompileClasspath = Task.traverse(module.transitiveModuleCompileModuleDeps)(m =>
-        Task.Anon { m.localCompileClasspath().map(_.path) ++ Agg(classes(m)) }
+        Task.Anon { m.localCompileClasspath().map(_.path) ++ Seq(classes(m)) }
       )().flatten
 
       module.resolvedIvyDeps().map(_.path) ++