Merge remote-tracking branch 'upstream/main' into improvement/fs-watching

# Conflicts:
#	runner/package.mill

Author: arturaz

.github/workflows/run-tests.yml

@@ -181,6 +181,11 @@ jobs:
             install-android-sdk: true
             install-sbt: false
 
+          - java-version: 17
+            millargs: "'example.thirdparty[android-endless-tunnel].local.server'"
+            install-android-sdk: true
+            install-sbt: false
+
           - java-version: 17
             millargs: "'{example,integration}.migrating.__.local.server'"
             install-android-sdk: false

build.mill

@@ -1,4 +1,4 @@
-//| mill-version: 0.13.0-M2-29-d4e08d
+//| mill-version: 0.13.0-M2-51-773072
 
 package build
 // imports
@@ -194,6 +194,7 @@ object Deps {
   val semanticDBscala = mvn"org.scalameta:::semanticdb-scalac:4.13.4"
   val semanticDbJava = mvn"com.sourcegraph:semanticdb-java:0.10.3"
   val sourcecode = mvn"com.lihaoyi::sourcecode:0.4.3-M5"
+  val springBootTools = mvn"org.springframework.boot:spring-boot-loader-tools:3.4.5"
   val upickle = mvn"com.lihaoyi::upickle:4.1.0"
   // Using "native-terminal-no-ffm" rather than just "native-terminal", as the GraalVM releases currently
   // lacks support for FFM on Mac ARM. That should be fixed soon, see oracle/graal#8113.

ci/mill.ps1

@@ -122,7 +122,7 @@ if (-not (Test-Path -Path $MILL -PathType Leaf)) {
     Invoke-WebRequest -Uri $DOWNLOAD_URL -OutFile $MILL
 }
 
-$MILL_MAIN_CLI = $Env:MILL_MAIN_CLI ?? $PSCommandPath
+
 
 $MILL_FIRST_ARG = $null
 $REMAINING_ARGUMENTS = $remainingArgs
@@ -134,4 +134,4 @@ if ($null -ne $remainingArgs) {
     }
 }
 
-& $MILL $MILL_FIRST_ARG -D "mill.main.cli=$MILL_MAIN_CLI" $REMAINING_ARGUMENTS
+& $MILL $MILL_FIRST_ARG $REMAINING_ARGUMENTS

contrib/jmh/src/mill/contrib/jmh/JmhModule.scala

@@ -42,7 +42,7 @@ trait JmhModule extends JavaModule {
       Jvm.callProcess(
         mainClass = "org.openjdk.jmh.Main",
         classPath = (runClasspath() ++ generatorDeps()).map(_.path) ++
-          Seq(compileGeneratedSources().path, resources),
+          Seq(compileGeneratedSources().path, resources.path),
         mainArgs = args,
         cwd = Task.ctx().dest,
         javaHome = jvmWorker().javaHome().map(_.path),
@@ -58,7 +58,7 @@ trait JmhModule extends JavaModule {
     Task {
       val dest = Task.ctx().dest
       val (sourcesDir, _) = generateBenchmarkSources()
-      val sources = os.walk(sourcesDir).filter(os.isFile)
+      val sources = os.walk(sourcesDir.path).filter(os.isFile)
 
       os.proc(
         Jvm.jdkTool("javac"),
@@ -101,7 +101,7 @@ trait JmhModule extends JavaModule {
         stdout = os.Inherit
       )
 
-      (sourcesDir, resourcesDir)
+      (PathRef(sourcesDir), PathRef(resourcesDir))
     }
 
   def generatorDeps = Task {

contrib/package.mill

@@ -23,7 +23,7 @@ import build.Deps
  * to collaborate on Mill plugins that is more discoverable than individuals
  * hosting their own Github repositories
  */
-object `package` extends RootModule {
+object `package` extends mill.Module {
   def contribModules: Seq[ContribModule] =
     moduleInternal.modules.collect { case m: ContribModule => m }
 
@@ -206,12 +206,11 @@ object `package` extends RootModule {
     def mvnDeps = Agg(build.Deps.requests)
   }
 
-  object sonatypecentral extends ContribModule {
+  object versionfile extends ContribModule {
     def compileModuleDeps = Seq(build.libs.scalalib)
-    def mvnDeps = Agg(build.Deps.sonatypeCentralClient)
   }
 
-  object versionfile extends ContribModule {
+  object sonatypecentral extends ContribModule {
     def compileModuleDeps = Seq(build.libs.scalalib)
   }
 

contrib/sonatypecentral/readme.adoc

@@ -1,4 +1,4 @@
-= Sonatype Central
+= Sonatype Central (Plugin Moved to Scalalib)
 :page-aliases: Plugin_Sonatype_Central.adoc
 
 This plugin allows users to publish open-source packages to Maven Central via the Sonatype Central portal.

contrib/sonatypecentral/src/mill/contrib/sonatypecentral/package.scala

@@ -42,4 +42,9 @@ public class EnvVars {
    * e.g. to turn on additional testing/debug/log-related code
    */
   public static final String MILL_TEST_SUITE = "MILL_TEST_SUITE";
+
+  /**
+   * The path to the currently executing Mill launcher executable
+   */
+  public static final String MILL_EXECUTABLE_PATH = "MILL_EXECUTABLE_PATH";
 }

core/constants/src/mill/constants/EnvVars.java

@@ -124,7 +124,6 @@ public static String interpolateEnvVars(
         matcher.appendReplacement(result, "\\$");
       } else {
         String envVarValue;
-        mill.constants.DebugLog.println("MATCH " + match);
         envVarValue = env.containsKey(match) ? env.get(match) : onMissing.apply(match);
         matcher.appendReplacement(result, envVarValue);
       }

core/constants/src/mill/constants/Util.java

@@ -25,12 +25,7 @@ object `package` extends build.MillStableScalaModule {
     build.Deps.upickle,
     build.Deps.pprint,
     build.Deps.fansi,
-    // Necessary so we can share the JNA classes throughout the build process
-    build.Deps.jna,
-    build.Deps.jnaPlatform,
-    build.Deps.jarjarabrams,
     build.Deps.mainargs,
-    build.Deps.scalaparse,
-    mvn"org.apache.commons:commons-lang3:3.16.0"
+    build.Deps.fastparse
   )
 }