Merge branch 'main' into tr-path-mapping-optional

Author: lefou

.github/workflows/post-build-raw.yml

@@ -21,7 +21,7 @@ jobs:
     continue-on-error: false
     timeout-minutes: ${{ inputs.timeout-minutes }}
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v6
         with:
           path: .
           name: ${{ inputs.os }}-artifact

.github/workflows/post-build-selective.yml

@@ -40,7 +40,7 @@ jobs:
     steps:
       - uses: coursier/cache-action@v6
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v6
         with:
           path: .
           name: ${{ inputs.os }}-artifact

.github/workflows/pre-build.yml

@@ -37,7 +37,7 @@ jobs:
 
       - run: ./mill -i -k ${{ inputs.compileargs }}
 
-      - uses: actions/upload-artifact@v4.6.2
+      - uses: actions/upload-artifact@v5.0.0
         with:
           path: .
           name: ${{ inputs.os }}-artifact

.github/workflows/run-tests.yml

@@ -158,7 +158,7 @@ jobs:
             setup-android: true
 
           - java-version: 17
-            millargs: "'example.thirdparty[androidtodo].packaged.daemon'"
+            millargs: "'example.thirdparty[android-compose-samples].packaged.daemon'"
             setup-android: true
 
           - java-version: 24

core/api/daemon/src/mill/api/daemon/Segments.scala

@@ -5,8 +5,10 @@ import scala.math.Ordering.Implicits.seqOrdering
 /**
  * Models a path with the Mill build hierarchy, e.g. `amm.util[2.11].test.compile`.
  *
- * `.`-separated segments are [[Segment.Label]]s,
- * while `[]`-delimited segments are [[Segment.Cross]]s
+ * - `.`-separated segments are [[Segment.Label]]s,
+ * - `[]`-delimited segments are [[Segment.Cross]]s
+ * - If the first segment starts with `./`, it refers to a single-file script
+ * - If the first segment ends with `/`, it refers to an external module
  */
 final case class Segments private (value: Seq[Segment]) {
 
@@ -30,7 +32,7 @@ final case class Segments private (value: Seq[Segment]) {
 
   def render: String = {
     def renderCross(cross: Segment.Cross): String = "[" + cross.value.mkString(",") + "]"
-    value.toList match {
+    def renderValue(valueList: List[Segment]) = valueList match {
       case Nil => ""
       case head :: rest =>
         val headSegment = head match
@@ -42,6 +44,15 @@ final case class Segments private (value: Seq[Segment]) {
         }
         headSegment + stringSegments.mkString
     }
+
+    value.toList match {
+      // ScriptModule segments always starts with `./`
+      case Segment.Label(s"./$first") :: Nil => s"./$first"
+      case Segment.Label(s"./$first") :: next :: rest => s"./$first:${renderValue(next :: rest)}"
+      // ExternalModule segments always ends with '/'
+      case Segment.Label(s"$first/") :: next :: rest => s"$first/${renderValue(next :: rest)}"
+      case valueList => renderValue(valueList)
+    }
   }
   override lazy val hashCode: Int = value.hashCode()
 }

core/api/src/mill/api/BuildCtx.scala

@@ -50,7 +50,7 @@ object BuildCtx {
     }
   }
 
-  def watch(p: os.Path): os.Path = {
+  def watch(p: os.Path): os.Path = withFilesystemCheckerDisabled {
     val watchable = Watchable.Path(p.toNIO, false, PathRef(p).sig)
     watchedValues.append(watchable)
     p

core/api/src/mill/api/Evaluator.scala

@@ -48,12 +48,6 @@ trait Evaluator extends AutoCloseable with EvaluatorApi {
       allowPositionalCommandArgs: Boolean = false,
       resolveToModuleTasks: Boolean = false
   ): mill.api.Result[List[Resolved]] = {
-    // These are used in the overrides.
-    val _ = scriptArgs
-    val _ = selectMode
-    val _ = allowPositionalCommandArgs
-    val _ = resolveToModuleTasks
-
     mill.api.Result.Success(Nil)
   }
 

core/api/src/mill/api/ExecutionPaths.scala

@@ -35,7 +35,6 @@ object ExecutionPaths {
   // Dollar sign `$` is our masking-character
   private val Dollar = "[$]".r
   // Forward-slashed are reserved for directory delimiters
-  private val Slash = "/".r
 
   private val steps: Seq[String => String] = Seq(
     // Step 1: mask all existing dollar signs, so we can use the dollar as masking character
@@ -46,13 +45,11 @@ object ExecutionPaths {
       case s => s
     },
     // Step 3: Replace colon (:) with $colon
-    s => Colon.replaceAllIn(s, Matcher.quoteReplacement("$colon")),
-    // Step 4: Replace slash (/) with $slash
-    s => Slash.replaceAllIn(s, Matcher.quoteReplacement("$slash"))
+    s => Colon.replaceAllIn(s, Matcher.quoteReplacement("$colon"))
   )
 
   def sanitizePathSegment(segment: String): os.PathChunk = {
     // sanitize and implicitly convert to PathChunk
-    steps.foldLeft(segment) { (segment, f) => f(segment) }
+    os.SubPath(steps.foldLeft(segment) { (segment, f) => f(segment) })
   }
 }

core/api/src/mill/api/ExternalModule.scala

@@ -27,9 +27,10 @@ abstract class ExternalModule(using
     !" #".exists(millModuleEnclosing0.value.contains(_)),
     "External modules must be at a top-level static path, not " + millModuleEnclosing0.value
   )
-  override def moduleSegments: Segments = {
-    Segments(millModuleEnclosing0.value.split('.').map(Segment.Label(_)).toIndexedSeq)
-  }
+
+  // Include a trailing `/` in the external module first segment to distinguish it
+  // from script modules or normal build.mill modules
+  override def moduleSegments: Segments = Segments.labels(millModuleEnclosing0.value + "/")
 }
 
 object ExternalModule {

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

@@ -3,8 +3,10 @@ package mill.api.internal
 import mill.api.daemon.Segments
 
 private[mill] sealed trait Resolved {
+  def rootModule: RootModule0
   def segments: Segments
   def cls: Class[?]
+  def fullSegments: Segments = rootModule.moduleSegments ++ segments
 }
 
 private[mill] object Resolved {
@@ -23,7 +25,7 @@ private[mill] object Resolved {
     }
   }
 
-  case class Module(segments: Segments, cls: Class[?]) extends Resolved
-  case class Command(segments: Segments, cls: Class[?]) extends Resolved
-  case class NamedTask(segments: Segments, cls: Class[?]) extends Resolved
+  case class Module(rootModule: RootModule0, segments: Segments, cls: Class[?]) extends Resolved
+  case class Command(rootModule: RootModule0, segments: Segments, cls: Class[?]) extends Resolved
+  case class NamedTask(rootModule: RootModule0, segments: Segments, cls: Class[?]) extends Resolved
 }