Merge branch 'main' into consolidate-jvm-subprocess-and-inprocess-functions

Author: sake92

build.mill

@@ -158,7 +158,7 @@ object Deps {
   val junitInterface = ivy"com.github.sbt:junit-interface:0.13.3"
   val commonsIo = ivy"commons-io:commons-io:2.18.0"
   val log4j2Core = ivy"org.apache.logging.log4j:log4j-core:2.24.3"
-  val osLib = ivy"com.lihaoyi::os-lib:0.11.4-M5"
+  val osLib = ivy"com.lihaoyi::os-lib:0.11.4-M6"
   val pprint = ivy"com.lihaoyi::pprint:0.9.0"
   val mainargs = ivy"com.lihaoyi::mainargs:0.7.6"
   val millModuledefsVersion = "0.11.3-M3"
@@ -398,7 +398,7 @@ trait MillJavaModule extends JavaModule {
 
   def writeLocalTestOverrides = Task.Anon {
     for ((k, v) <- testTransitiveDeps()) {
-      os.write(Task.dest / "mill" / "local-test-overrides" / k, v, createFolders = true)
+      os.write(Task.dest / "mill/local-test-overrides" / k, v, createFolders = true)
     }
     Seq(PathRef(Task.dest))
   }

contrib/playlib/src/mill/playlib/Layout.scala

@@ -5,8 +5,8 @@ import mill.scalalib._
 
 private[playlib] trait Layout extends JavaModule {
 
-  def conf = Task.Sources { millSourcePath / "conf" }
-  def app = Task.Sources { millSourcePath / "app" }
+  def conf = Task.Sources { "conf" }
+  def app = Task.Sources { "app" }
 
   override def sources = Task { app() }
   override def resources = Task { conf() }

contrib/playlib/src/mill/playlib/RouterModule.scala

@@ -9,7 +9,7 @@ import mill.{Agg, T, Task}
 
 trait RouterModule extends ScalaModule with Version {
 
-  def routes: T[Seq[PathRef]] = Task.Sources { millSourcePath / "routes" }
+  def routes: T[Seq[PathRef]] = Task.Sources { "routes" }
 
   def routeFiles = Task {
     val paths = routes().flatMap(file => os.walk(file.path))

contrib/playlib/src/mill/playlib/Static.scala

@@ -25,7 +25,7 @@ trait Static extends ScalaModule {
   /**
    *  Directories to include assets from
    */
-  def assetSources = Task.Sources { millSourcePath / assetsPath() }
+  def assetSources = Task.Sources { os.sub / assetsPath() }
 
   /*
   Collected static assets for the project

contrib/versionfile/src/mill/contrib/versionfile/VersionFileModule.scala

@@ -5,7 +5,7 @@ import mill._
 trait VersionFileModule extends Module {
 
   /** The file containing the current version. */
-  def versionFile: T[PathRef] = Task.Source(millSourcePath / "version")
+  def versionFile: T[PathRef] = Task.Source("version")
 
   /** The current version. */
   def currentVersion: T[Version] = Task { Version.of(os.read(versionFile().path).trim) }

dist/package.mill

@@ -41,7 +41,7 @@ trait InstallModule extends build.MillPublishJavaModule {
   def installLocalCache() = Task.Command {
     val path = installLocalTask(
       Task.Anon(
-        (os.home / ".cache" / "mill" / "download" / (build.millVersion() + batExt)).toString()
+        (os.home / ".cache/mill/download" / (build.millVersion() + batExt)).toString()
       )
     )()
     Task.log.outputStream.println(path.toString())

docs/modules/ROOT/nav.adoc

@@ -102,14 +102,14 @@
 ** xref:extending/meta-build.adoc[]
 ** xref:extending/example-typescript-support.adoc[]
 ** xref:extending/example-python-support.adoc[]
+* xref:large/large.adoc[]
+** xref:large/selective-execution.adoc[]
+** xref:large/multi-file-builds.adoc[]
+** xref:large/multi-language-builds.adoc[]
 // This section focuses on diving into deeper, more advanced topics for Mill.
 // These are things that most Mill developers would not encounter day to day,
 // but people developing Mill plugins or working on particularly large or
 // sophisticated Mill builds will need to understand.
-* xref:large/large.adoc[]
-** xref:large/selective-execution.adoc[]
-** xref:large/multi-file-builds.adoc[]
-
 * Mill In Depth
 ** xref:depth/sandboxing.adoc[]
 ** xref:depth/execution-model.adoc[]

docs/modules/ROOT/pages/comparisons/maven.adoc

@@ -391,7 +391,7 @@ import $ivy.`ant:ant-optional:1.5.3-1`
 
 object common extends NettyModule{
   ...
-  def script = Task.Source(millSourcePath / "src" / "main" / "script")
+  def script = Task.Source("src" / "main" / "script")
   def generatedSources0 = Task {
     val shell = new groovy.lang.GroovyShell()
     val context = new java.util.HashMap[String, Object]
@@ -520,8 +520,8 @@ with the `make` command essentially being a bash script wrapped in layers of XML
 In contrast, the Mill configuration for this logic is as follows:
 
 ```scala
-def makefile = Task.Source(millSourcePath / "Makefile")
-def cSources = Task.Source(millSourcePath / "src" / "main" / "c")
+def makefile = Task.Source("Makefile")
+def cSources = Task.Source("src" / "main" / "c")
 def cHeaders = Task {
   for(p <- os.walk(cSources().path) if p.ext == "h"){
     os.copy(p, Task.dest / p.relativeTo(cSources().path), createFolders = true)

docs/modules/ROOT/pages/comparisons/unique.adoc

@@ -176,8 +176,8 @@ them into classfiles, and then the `jar` executable to package them together int
 ```scala
 def mainClass: T[Option[String]] = Some("foo.Foo")
 
-def sources = Task.Source(millSourcePath / "src")
-def resources = Task.Source(millSourcePath / "resources")
+def sources = Task.Source("src")
+def resources = Task.Source("resources")
 
 def compile = Task {
   val allSources = os.walk(sources().path)

docs/modules/ROOT/pages/large/multi-language-builds.adoc

@@ -0,0 +1,4 @@
+= Multi-Language Builds
+:page-aliases: Multi_Language_Builds.adoc
+
+include::partial$example/large/multi/14-multi-language.adoc[]