Merge branch 'main' into rebootstrap

Author: lihaoyi

.editorconfig

@@ -5,7 +5,7 @@ end_of_line = lf
 insert_final_newline = true
 charset = utf-8
 indent_style = space
-indent_size = 4
+indent_size = 2
 
 [*.scala]
 end_of_line = lf

build.mill

@@ -45,10 +45,14 @@ def millVersion: T[String] = Task {
   } else "SNAPSHOT"
 }
 
-def millLastTagTruth: T[String] = Task {
-  VcsVersion.calcVcsState(Task.log).lastTag.getOrElse(
-    sys.error("No (last) git tag found. Your git history seems incomplete!")
-  )
+def latestUnstableVersion = Task.Input {
+  val mavenMetadataXml = requests
+    .get("https://repo1.maven.org/maven2/com/lihaoyi/mill-dist/maven-metadata.xml")
+    .text()
+
+  val xml = scala.xml.XML.loadString(mavenMetadataXml)
+
+  (xml \\ "version").map(_.text).last
 }
 
 def millLastTag: T[String] = Task {

ci/mill-bootstrap.patch

@@ -20,6 +20,18 @@ index 4465e163a55..6b8da38aae7 100644
 
  val dummyDeps: Seq[Dep] = Seq(
    Deps.DocDeps.millScip,
+diff --git a/integration/package.mill b/integration/package.mill
+index a5183fc0a5a..4cb6f6689cd 100644
+--- a/integration/package.mill
++++ b/integration/package.mill
+@@ -14,6 +14,7 @@ import mill.T
+ import mill.define.Cross
+ import mill.testrunner.TestResult
+ import millbuild.*
++import upickle.implicits.namedTuples.default.given
+ 
+ object `package` extends mill.Module {
+   // We compile the test code once and then offer multiple modes to
 diff --git a/runner/codesig/package.mill b/runner/codesig/package.mill
 index 3950422474a..1ed233d24f7 100644
 --- a/runner/codesig/package.mill

contrib/testng/test/src/mill/testng/TestNGTests.scala

@@ -53,18 +53,18 @@ object TestNGTests extends TestSuite {
       eval =>
         val Right(result) = eval.apply(demo.test.testForked()): @unchecked
         val tres = result.value
-        assert(tres._2.size == 8)
+        assert(tres.results.size == 8)
     }
     test("noGrouping") - UnitTester(demo, resourcePath).scoped {
       eval =>
         val Right(result) = eval.apply(demo.testng.testForked()): @unchecked
-        val tres = result.value._2
+        val tres = result.value.results
         assert(tres.map(_.fullyQualifiedName).toSet == Set("foo.HelloTests", "foo.WorldTests"))
     }
     test("testForkGrouping") - UnitTester(demo, resourcePath).scoped {
       eval =>
         val Right(result) = eval.apply(demo.testngGrouping.testForked()): @unchecked
-        val tres = result.value._2
+        val tres = result.value.results
         assert(tres.map(_.fullyQualifiedName).toSet == Set("foo.HelloTests", "foo.WorldTests"))
     }
   }

core/api/src/mill/api/Watchable.scala

@@ -8,6 +8,22 @@ package mill.api
  */
 private[mill] sealed trait Watchable
 private[mill] object Watchable {
+
+  /**
+   * Watched path, can be watched via polling or via a notification system.
+   *
+   * @param p the path to watch
+   * @param quick if true, only watch file attributes
+   * @param signature the initial hash of the path contents
+   */
   case class Path(p: java.nio.file.Path, quick: Boolean, signature: Int) extends Watchable
+
+  /**
+   * Watched expression, can only be watched via polling.
+   *
+   * @param f the expression to watch, returns some sort of hash
+   * @param signature the initial hash from the first invocation of the expression
+   * @param pretty human-readable name
+   */
   case class Value(f: () => Long, signature: Long, pretty: String) extends Watchable
 }

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

@@ -58,8 +58,9 @@ trait ScalaModuleApi extends JavaModuleApi
 trait ScalaJSModuleApi extends JavaModuleApi
 trait ScalaNativeModuleApi extends JavaModuleApi
 trait TestModuleApi extends ModuleApi {
-  def testLocal(args: String*): TaskApi[(String, Seq[Any])]
-  private[mill] def bspBuildTargetScalaTestClasses: TaskApi[(String, Seq[String])]
+  def testLocal(args: String*): TaskApi[(msg: String, results: Seq[Any])]
+  private[mill] def bspBuildTargetScalaTestClasses
+      : TaskApi[(frameworkName: String, classes: Seq[String])]
 }
 trait MainModuleApi extends ModuleApi {
   private[mill] def bspClean(

core/define/src/mill/define/Task.scala

@@ -124,7 +124,8 @@ object Task extends TaskBase {
   inline def Command[T](inline t: Result[T])(implicit
       inline w: Writer[T],
       inline ctx: ModuleCtx
-  ): Command[T] = ${ TaskMacros.commandImpl[T]('t)('w, 'ctx, exclusive = '{ false }) }
+  ): Command[T] =
+    ${ TaskMacros.commandImpl[T]('t)('w, 'ctx, exclusive = '{ false }, persistent = '{ false }) }
 
   /**
    * @param exclusive Exclusive commands run serially at the end of an evaluation,
@@ -133,16 +134,20 @@ object Task extends TaskBase {
    *                  These are normally used for "top level" commands which are
    *                  run directly to perform some action or display some output
    *                  to the user.
+   * @param persistent If true the `Task.dest` directory is not cleaned between
+   *                   runs.
    */
   def Command(
       t: NamedParameterOnlyDummy = new NamedParameterOnlyDummy,
-      exclusive: Boolean = false
-  ): CommandFactory = new CommandFactory(exclusive)
-  class CommandFactory private[mill] (val exclusive: Boolean) {
+      exclusive: Boolean = false,
+      persistent: Boolean = false
+  ): CommandFactory = new CommandFactory(exclusive = exclusive, persistent = persistent)
+  class CommandFactory private[mill] (val exclusive: Boolean, val persistent: Boolean) {
     inline def apply[T](inline t: Result[T])(implicit
         inline w: Writer[T],
         inline ctx: ModuleCtx
-    ): Command[T] = ${ TaskMacros.commandImpl[T]('t)('w, 'ctx, '{ this.exclusive }) }
+    ): Command[T] =
+      ${ TaskMacros.commandImpl[T]('t)('w, 'ctx, '{ this.exclusive }, '{ this.persistent }) }
   }
 
   /**
@@ -400,7 +405,8 @@ class Command[+T](
     val ctx0: mill.define.ModuleCtx,
     val writer: Writer[?],
     val isPrivate: Option[Boolean],
-    val exclusive: Boolean
+    val exclusive: Boolean,
+    override val persistent: Boolean
 ) extends NamedTask[T] {
 
   override def asCommand: Some[Command[T]] = Some(this)
@@ -555,12 +561,21 @@ private object TaskMacros {
   )(t: Expr[Result[T]])(
       w: Expr[Writer[T]],
       ctx: Expr[mill.define.ModuleCtx],
-      exclusive: Expr[Boolean]
+      exclusive: Expr[Boolean],
+      persistent: Expr[Boolean]
   ): Expr[Command[T]] = {
     appImpl[Command, T](
       (in, ev) =>
         '{
-          new Command[T]($in, $ev, $ctx, $w, ${ taskIsPrivate() }, exclusive = $exclusive)
+          new Command[T](
+            $in,
+            $ev,
+            $ctx,
+            $w,
+            ${ taskIsPrivate() },
+            exclusive = $exclusive,
+            persistent = $persistent
+          )
         },
       t
     )

dist/package.mill

@@ -237,7 +237,7 @@ object `package` extends MillJavaModule with DistModule {
       os.copy(examplePath.path, Task.dest / exampleStr, createFolders = true)
       val ignoreErrorsOnCI = Task.dest / exampleStr / "ignoreErrorsOnCI"
       if (os.exists(ignoreErrorsOnCI)) os.remove(ignoreErrorsOnCI)
-      os.write(Task.dest / exampleStr / ".mill-version", build.millLastTag())
+      os.write(Task.dest / exampleStr / ".mill-version", build.millVersion())
       os.copy(bootstrapLauncher().path, Task.dest / exampleStr / "mill")
       os.copy(bootstrapLauncherBat().path, Task.dest / exampleStr / "mill.bat")
       val zip = Task.dest / s"$exampleStr.zip"

example/androidlib/java/1-hello-world/build.mill

@@ -120,17 +120,17 @@ object app extends AndroidAppModule {
 
 > ./mill show app.it
 ...
-[
-  "",
-  [
+{
+  "msg": "",
+  "results": [
     {
       "fullyQualifiedName": "com.helloworld.app.ExampleInstrumentedTest.useAppContext",
       "selector": "com.helloworld.app.ExampleInstrumentedTest.useAppContext",
       "duration": ...,
       "status": "Success"
     }
   ]
-]
+}
 ...
 
 > cat out/app/it/testForked.dest/test-report.xml

example/androidlib/java/4-sum-lib-java/build.mill

@@ -142,9 +142,9 @@ Publish ... to /home/.../.m2/repository/...
 
 > ./mill show app.test
 ...
-[
-  "",
-  [
+{
+  "msg": "",
+  "results": [
     {
       "fullyQualifiedName": "com.example.app.CalculatorUnitTest.textSize_isCorrect",
       "selector": "com.example.app.CalculatorUnitTest.textSize_isCorrect",
@@ -158,6 +158,6 @@ Publish ... to /home/.../.m2/repository/...
       "status": "Success"
     }
   ]
-]
+}
 ...
 */