Move to standard java package dirs in Java example projects, other cleanups

build.sc

@@ -1756,6 +1756,8 @@ object docs extends Module {
        |  title: Mill
        |  url: ${if (authorMode) s"${T.dest}/site" else Settings.docUrl}
        |  start_page: mill::Intro_to_Mill_for_Scala.adoc
+       |  keys:
+       |    google_analytics: 'G-1C582ZJR85'
        |
        |content:
        |  sources:
@@ -1783,7 +1785,7 @@ object docs extends Module {
        |    mill-github-url: ${Settings.projectUrl}
        |    mill-doc-url: ${if (authorMode) s"file://${T.dest}/site" else Settings.docUrl}
        |    mill-download-url: ${if (authorMode) s"file://${exampleZips().head.path / os.up}"
-      else s"${Settings.projectUrl}/releases/download/0.11.10"}
+      else s"${Settings.projectUrl}/releases/download/${millLastTag()}"}
        |    mill-example-url: ${if (authorMode) s"file://${T.workspace}"
       else s"${Settings.projectUrl}/blob/main/"}
        |    utest-github-url: https://github.com/com-lihaoyi/utest
@@ -1966,6 +1968,7 @@ def exampleZips: T[Seq[PathRef]] = T {
     val example = examplePath.subRelativeTo(T.workspace)
     val exampleStr = millVersion() + "-" + example.segments.mkString("-")
     os.copy(examplePath, T.dest / exampleStr, createFolders = true)
+    os.write(T.dest / exampleStr / ".mill-version", millLastTag())
     os.copy(bootstrapLauncher().path, T.dest / exampleStr / "mill")
     val zip = T.dest / s"$exampleStr.zip"
     os.proc("zip", "-r", zip, exampleStr).call(cwd = T.dest)

docs/modules/ROOT/pages/Intro_to_Mill_for_Scala.adoc

@@ -15,14 +15,6 @@
 
 :page-aliases: index.adoc, Intro_to_Mill.adoc
 
-
-{mill-github-url}[Mill] is your shiny new Scala build tool! Mill aims for
-simplicity by reusing concepts you are already familiar with, borrowing ideas
-from modern tools like https://maven.apache.org/[Maven], https://gradle.org/[Gradle],
-https://bazel.build/[Bazel] and https://www.scala-sbt.org/[SBT]. It lets you build
-your projects in a way that's simple, fast, and predictable.
-
-
 {mill-github-url}[Mill] is your shiny new Scala build tool! Mill aims for
 simplicity by reusing concepts you are already familiar with, borrowing ideas
 from modern tools like https://maven.apache.org/[Maven], https://gradle.org/[Gradle],
@@ -45,12 +37,6 @@ how Mill attempts to do better:
 - https://www.lihaoyi.com/post/SowhatswrongwithSBT.html[So, what's wrong with SBT?]
 - https://www.lihaoyi.com/post/MillBetterScalaBuilds.html[Mill: Better Scala Builds]
 
-If you are using Mill, you will find the following book by the Author useful in
-using Mill and its supporting libraries to the fullest:
-
-* https://handsonscala.com/[Hands-on Scala Programming]
-
-
 If you are using Mill, you will find the following book by the Author useful in
 using Mill and its supporting libraries to the fullest:
 

docs/modules/ROOT/pages/Java_Module_Config.adoc

@@ -5,7 +5,7 @@ for `JavaModule`.
 
 Many of the APIs covered here are listed in the API documentation:
 
-* {mill-doc-url}/api/latest/mill/scalalib/JavaModule.html[mill.scalalib.JavaModule]
+* {mill-doc-url}/api/latest/mill/scalalib/JavaModule.html[mill.javaalib.JavaModule]
 
 
 == Compilation & Execution Flags

docs/modules/ROOT/pages/Java_Web_Build_Examples.adoc

@@ -1,4 +1,4 @@
-= Web Build Examples
+= Java Web Build Examples
 
 This page contains examples of using Mill as a build tool for web-applications.
 It covers setting up a basic backend server with a variety of server frameworks

docs/modules/ROOT/pages/Web_Build_Examples.adoc

@@ -1,4 +1,4 @@
-= Web Build Examples
+= Scala Web Build Examples
 
 This page contains examples of using Mill as a build tool for web-applications.
 It covers setting up a basic backend server, Todo-MVC app, topics like cache

example/basic/2-custom-build-logic/build.sc

@@ -42,7 +42,9 @@ Inputs:
 
 // Above, `def lineCount` is a new build target we define, which makes use of
 // `allSourceFiles` (an existing target) and is in-turn used in our override of
-// `resources` (also an existing target). This generated file can then be
+// `resources` (also an existing target). `os.read.lines` and `os.write `come
+// from the https://github.com/com-lihaoyi/os-lib[OS-Lib] library, which is
+// bundled with Mill. This generated file can then be
 // loaded and used at runtime, as see in the output of `mill run`
 //
 // While this is a toy example, it shows how easy it is to customize your Mill

example/basic/4-builtin-commands/build.sc

@@ -115,7 +115,7 @@ Inputs:
 
 > mill show foo.allSourceFiles
 [
-  ".../foo/src/Foo..."
+  ".../foo/src.../Foo..."
 ]
 
 */

example/basicjava/3-multi-module/build.sc

@@ -25,12 +25,14 @@ object bar extends MyModule{
 // build.sc
 // foo/
 //     src/
-//         Foo.java
+//         foo/
+//             Foo.java
 //     resources/
 //         ...
 // bar/
 //     src/
-//         Bar.java
+//         bar/
+//             Bar.java
 //     resources/
 //         ...
 // out/

example/javabuilds/5-test-suite/bar/src/Bar.java → example/javabuilds/5-test-suite/bar/src/bar/Bar.java

@@ -2,10 +2,10 @@
 
 public class Bar {
   public static void main(String[] args) {
-    System.out.println(hello());
+    System.out.println(new Bar().hello());
   }
 
-  public static String hello() {
+  public String hello() {
     return "Hello World";
   }
 }

example/javabuilds/5-test-suite/bar/test/src/bar/BarTests.java

@@ -0,0 +1,32 @@
+package bar;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.*;
+import org.junit.Test;
+
+public class BarTests {
+
+  @Test
+  public void hello() {
+    String result = new Bar().hello();
+    assertTrue(result.startsWith("Hello"));
+  }
+
+  @Test
+  public void world() {
+    String result = new Bar().hello();
+    assertTrue(result.endsWith("World"));
+  }
+
+  @Test
+  public void testMockito() {
+    Bar mockBar = mock(Bar.class);
+
+    when(mockBar.hello()).thenReturn("Hello Mockito World");
+
+    String result = mockBar.hello();
+
+    assertTrue(result.equals("Hello Mockito World"));
+    verify(mockBar).hello();
+  }
+}

example/javabuilds/5-test-suite/build.sc

@@ -4,20 +4,30 @@ import mill._, javalib._
 object foo extends JavaModule {
   object test extends JavaTests {
     def testFramework = "com.novocode.junit.JUnitFramework"
-    def ivyDeps = T {
-      super.ivyDeps() ++ Agg(ivy"com.novocode:junit-interface:0.11")
-    }
+    def ivyDeps = Agg(
+      ivy"com.novocode:junit-interface:0.11",
+      ivy"org.mockito:mockito-core:4.6.1"
+    )
   }
 }
-
+// This build defines a single module with a test suite, configured to use
+// "JUnit" as the testing framework, along with Mockito. Test suites are themselves
+// ``JavaModule``s, nested within the enclosing module,
 //// SNIPPET:BUILD2
 
 object bar extends JavaModule {
-  object test extends JavaTests with TestModule.Junit4
+  object test extends JavaTests with TestModule.Junit4{
+    def ivyDeps = super.ivyDeps() ++ Agg(
+      ivy"org.mockito:mockito-core:4.6.1"
+    )
+  }
 }
 
 //// SNIPPET:BUILD3
 object qux extends JavaModule {
-  object test extends JavaTests with TestModule.Junit4
-  object integration extends JavaTests with TestModule.Junit4
+  object test extends JavaTests with TestModule.Junit5
+  object integration extends JavaTests with TestModule.Junit5
 }
+
+// This example also demonstrates using Junit 5 instead of Junit 4,
+// with

example/javabuilds/8-compat-modules/foo/src/main/java/Foo.java → example/javabuilds/5-test-suite/foo/src/foo/Foo.java

@@ -2,10 +2,10 @@
 
 public class Foo {
   public static void main(String[] args) {
-    System.out.println(hello());
+    System.out.println(new Foo().hello());
   }
 
-  public static String hello() {
+  public String hello() {
     return "Hello World";
   }
 }

example/javabuilds/5-test-suite/foo/test/src/foo/FooTests.java

@@ -0,0 +1,32 @@
+package foo;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.*;
+import org.junit.Test;
+
+public class FooTests {
+
+  @Test
+  public void hello() {
+    String result = new Foo().hello();
+    assertTrue(result.startsWith("Hello"));
+  }
+
+  @Test
+  public void world() {
+    String result = new Foo().hello();
+    assertTrue(result.endsWith("World"));
+  }
+
+  @Test
+  public void testMockito() {
+    Foo mockFoo = mock(Foo.class);
+
+    when(mockFoo.hello()).thenReturn("Hello Mockito World");
+
+    String result = mockFoo.hello();
+
+    assertTrue(result.equals("Hello Mockito World"));
+    verify(mockFoo).hello();
+  }
+}

example/javabuilds/5-test-suite/qux/integration/src/QuxIntegrationTests.java → example/javabuilds/5-test-suite/qux/integration/src/qux/QuxIntegrationTests.java

@@ -1,7 +1,7 @@
 package qux;
 
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
 
 public class QuxIntegrationTests {
 

example/javabuilds/5-test-suite/qux/test/src/QuxTests.java → example/javabuilds/5-test-suite/qux/test/src/qux/QuxTests.java

@@ -1,7 +1,7 @@
 package qux;
 
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
 
 public class QuxTests {
 

example/javamodule/4-test-deps/baz/test/src/BazTests.java → example/javamodule/4-test-deps/baz/test/src/baz/BazTests.java

@@ -1,12 +1,14 @@
 package baz;
 
 import org.junit.Test;
+import com.google.common.math.IntMath;
+
 import static org.junit.Assert.*;
 
 public class BazTests {
 
   @Test
   public void simple() {
-    BazTestUtils.bazAssertEquals(Baz.getValue(), 123);
+    BazTestUtils.bazAssertEquals(Baz.getValue(), IntMath.mean(122, 124));
   }
 }

example/javamodule/4-test-deps/build.sc

@@ -7,10 +7,13 @@ object qux extends JavaModule {
 
   object test extends JavaTests with TestModule.Junit4 {
     def moduleDeps = super.moduleDeps ++ Seq(baz.test)
+    def ivyDeps = super.ivyDeps() ++ Agg(ivy"com.google.guava:guava:33.2.1-jre")
   }
 }
 
 
 object baz extends JavaModule {
-  object test extends JavaTests with TestModule.Junit4
+  object test extends JavaTests with TestModule.Junit4{
+    def ivyDeps = super.ivyDeps() ++ Agg(ivy"com.google.guava:guava:33.2.1-jre")
+  }
 }

example/javamodule/4-test-deps/qux/test/src/qux/QuxTests.java

@@ -0,0 +1,12 @@
+package qux;
+
+import org.junit.Test;
+import com.google.common.base.Ascii;
+
+public class QuxTests {
+
+  @Test
+  public void simple() {
+    baz.BazTestUtils.bazAssertEquals(Ascii.toLowerCase("XYZ"), Qux.getValue());
+  }
+}

example/javaweb/1-hello-jetty/build.sc

@@ -6,7 +6,7 @@ object hello extends RootModule with JavaModule {
     ivy"javax.servlet:javax.servlet-api:4.0.1"
   )
 
-  object test extends JavaModuleTests with TestModule.Junit4
+  object test extends JavaTests with TestModule.Junit4
 }
 
 // This example demonstrates how to set up a simple Jetty webserver,

example/javaweb/1-hello-jetty/src/HelloJetty.java → example/javaweb/1-hello-jetty/src/com/example/HelloJetty.java

@@ -1,3 +1,4 @@
+package com.example;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.handler.AbstractHandler;

example/javaweb/1-hello-jetty/test/src/HelloJettyTest.java → example/javaweb/1-hello-jetty/test/src/com/example/HelloJettyTest.java

@@ -1,3 +1,4 @@
+package com.example;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.HandlerList;

example/javaweb/2-hello-spring-boot/build.sc

@@ -6,7 +6,7 @@ object hello extends RootModule with JavaModule {
     ivy"org.springframework.boot:spring-boot-starter-actuator:2.5.6"
   )
 
-  object test extends JavaModuleTests with TestModule.Junit5 {
+  object test extends JavaTests with TestModule.Junit5 {
     def ivyDeps = super.ivyDeps() ++ Agg(
       ivy"org.springframework.boot:spring-boot-starter-test:2.5.6"
     )