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

Author: lefou

example/javalib/basic/1-script/build.mill

@@ -31,6 +31,18 @@ compiling 1 Java source to...
 
 //// SNIPPET:END
 
+//// SNIPPET:RESOLVE
+/** Usage
+
+> ./mill resolve Foo.java:_
+run
+runMain
+compile
+assembly
+...
+
+*/
+//// SNIPPET:END
 //// SNIPPET:TEST
 
 /** See Also: FooTest.java */

example/javalib/basic/3-simple/build.mill

@@ -1,10 +1,10 @@
 //// SNIPPET:DEPENDENCIES
 //
-// This is a basic Mill build for a single `JavaModule`, with two
-// third-party dependencies and a test suite using the JUnit framework.
 // This example project uses two third-party dependencies - https://argparse4j.github.io/[ArgParse4J] for CLI
-// argument parsing, https://www.thymeleaf.org//[Thymeleaf] for HTML rendering - and uses them to wrap a
+// argument parsing, https://www.thymeleaf.org/[Thymeleaf] for HTML rendering - and uses them to wrap a
 // given input string in HTML templates with proper escaping.
+// The `test/` submodule contains its own `mvnDeps`
+// for dependencies that are only used in the test suite.
 //
 //// SNIPPET:TREE
 // ----
@@ -27,9 +27,9 @@
 //         ...
 // ----
 //
-// NOTE: The default Mill source folder layout `src/` differs from that of Maven/Gradle's
-// `src/main/java/`.
-// If you wish to use the Maven source folder layout, e.g. for migrating
+// NOTE: The default Mill source folder layout `src/` and `test/src/` differs from that of
+// Maven/Gradle's `src/main/java/` and `src/test/java/`.
+// If you wish to use the Maven source folder layout, e.g. for compatibility with
 // an existing codebase, you should use
 // xref:#_maven_compatible_modules[Maven-Compatible Modules]
 //
@@ -58,11 +58,12 @@ Test foo.FooTest.testEscaping finished...
 //// SNIPPET:END
 //// SNIPPET:REPL
 //
-// You can start a JShell REPL attached to your `foo` module via:
+// You can start a JShell REPL attached to your root module or the `test` submodule via:
 //
 // [source,console]
 // ----
 // > ./mill -i jshell
+// > ./mill -i test.jshell
 // ----
 //
 // You can also start a standalone JShell console

example/javalib/basic/5-compat-modules/build.mill

@@ -1,32 +1,20 @@
-//// SNIPPET:ALL
-// Mill's default folder layout of `foo/src/` and `foo/test/src` differs from that
-// of Maven or Gradle's `foo/src/main/java/` and `foo/src/test/java/`. If you are
-// migrating an existing codebase, you can use Mill's `MavenModule` and
-// `MavenTests` as shown below to preserve filesystem compatibility with an existing
-// Maven or Gradle build:
-
-/** See Also: build.mill.yaml */
+//// SNIPPET:FIRST
 
 // `MavenModule` is a variant of `JavaModule`
-// that uses the more verbose folder layout of Maven, `sbt`, and other tools:
+// that uses the more verbose folder layout of Maven, SBT, and other tools:
 //
-// - `foo/src/main/java/`
-// - `foo/src/test/java/`
+// - `src/main/java/`
+// - `src/test/java/`
 //
 // Rather than Mill's
 //
-// - `foo/src/`
-// - `foo/test/src/`
+// - `src/`
+// - `test/src/`
 //
 
-// This is especially useful if you are migrating to Mill, as during the migration a
-// particular module may be built using both Maven/Gradle and Mill at the
-// same time. That means that during migration, you can leave all your source files
-// in place while setting up your Mill build, and do not need to invasively move them
-// around to match the Mill default module layout.
-//
-// Although the source layout of these compatibility modules is different from the
-// default `JavaModule`, the command-line usage is the same:
+//// SNIPPET:END
+
+//// SNIPPET:SECOND
 
 /** Usage
 
@@ -46,5 +34,3 @@ compiling 1 Java source...
 ...foo.FooIntegrationTests.hello ...
 
 */
-
-// For more details on migrating from other build tools, see xref:migrating/migrating.adoc[]

example/javalib/config/3-linting/build.mill

@@ -35,7 +35,7 @@ public class Foo {
 // xref:javalib/linting.adoc#_auto_formatting_with_spotless[mill.javalib.spotless.SpotlessModule]
 // that can also be used
 
-// === Autofixing
+// === Linting
 
 // To lint your code with https://errorprone.info/index[ErrorProne], you can
 // make yor module extend `mill.javalib.errorprone.ErrorProneModule`, which will
@@ -56,5 +56,7 @@ public class Foo {
 
 // See xref:javalib/linting.adoc#_linting_with_errorprone[Linting with ErrorProne] for more
 // details on how ErrorProne can be configured. Apart from ErrorProne, Mill also comes with
-// xref:javalib/linting.adoc#_linting_with_checkstyle[mill.contrib.checkstyle.CheckstyleModule] and
-// xref:javalib/linting.adoc#_static_analysis_with_pmd[mill.javalib.pmd.PmdModule]
+// support for other linters via:
+//
+// - xref:javalib/linting.adoc#_linting_with_checkstyle[mill.contrib.checkstyle.CheckstyleModule]
+// - xref:javalib/linting.adoc#_static_analysis_with_pmd[mill.javalib.pmd.PmdModule]

example/javalib/config/4-native-image/build.mill

@@ -0,0 +1 @@
+

example/javalib/config/4-native-image/build.mill.yaml

@@ -0,0 +1,3 @@
+extends: [mill.javalib.JavaModule, mill.javalib.NativeImageModule]
+jvmId: "graalvm-community:24"
+nativeImageOptions: ["--no-fallback"]

example/javalib/config/4-publishing/src/Bar.java renamed to example/javalib/config/4-native-image/src/Bar.java

@@ -1,6 +1,4 @@
-extends: [mill.javalib.JavaModule, mill.javalib.PublishModule, mill.javalib.NativeImageModule]
-jvmId: "graalvm-community:24"
-nativeImageOptions: ["--no-fallback"]
+extends: [mill.javalib.JavaModule, mill.javalib.PublishModule]
 publishVersion: "0.0.1"
 artifactName: "example"
 pomSettings:

example/javalib/config/4-publishing/build.mill renamed to example/javalib/config/5-publishing/build.mill

@@ -0,0 +1,5 @@
+public class Bar {
+  public static void main(String[] args) {
+    System.out.println("Hello Graal Native: " + System.getProperty("java.version"));
+  }
+}