Move android docs and examples to their own section (#3969)

.github/workflows/run-tests.yml

@@ -71,14 +71,18 @@ jobs:
 
           - java-version: 17
             millargs: "'example.javalib.__.local.testCached'"
-            install-android-sdk: true
+            install-android-sdk: false
 
           - java-version: 17
             millargs: "'example.scalalib.__.local.testCached'"
             install-android-sdk: false
 
           - java-version: 17
             millargs: "'example.kotlinlib.__.local.testCached'"
+            install-android-sdk: false
+
+          - java-version: 17
+            millargs: "'example.android.__.local.testCached'"
             install-android-sdk: true
 
           - java-version: '11'

docs/modules/ROOT/nav.adoc

@@ -11,7 +11,6 @@
 ** xref:javalib/publishing.adoc[]
 ** xref:javalib/build-examples.adoc[]
 ** xref:javalib/web-examples.adoc[]
-** xref:javalib/android-examples.adoc[]
 * xref:scalalib/intro.adoc[]
 ** xref:scalalib/module-config.adoc[]
 ** xref:scalalib/dependencies.adoc[]
@@ -29,7 +28,9 @@
 ** xref:kotlinlib/publishing.adoc[]
 // ** xref:kotlinlib/build-examples.adoc[]
 ** xref:kotlinlib/web-examples.adoc[]
-** xref:kotlinlib/android-examples.adoc[]
+* (Experimental) Android with Mill
+** xref:android/java.adoc[]
+** xref:android/kotlin.adoc[]
 * xref:comparisons/why-mill.adoc[]
 ** xref:comparisons/maven.adoc[]
 ** xref:comparisons/gradle.adoc[]

docs/modules/ROOT/pages/javalib/android-examples.adoc → docs/modules/ROOT/pages/android/java.adoc

@@ -1,4 +1,4 @@
-= (Experimental) Android Builds
+= Android Java Projects
 :page-aliases: android_app_examples.adoc
 
 include::partial$gtag-config.adoc[]
@@ -17,7 +17,7 @@ These are the main Mill Modules that are relevant for building Android apps:
 
 == Simple Android Hello World Application
 
-include::partial$example/javalib/android/1-hello-world.adoc[]
+include::partial$example/android/javalib/1-hello-world.adoc[]
 
 This example demonstrates how to create a basic "Hello World" Android application
 using the Mill build tool. It outlines the minimum setup required to compile Java code,
@@ -49,7 +49,7 @@ After creating Simple Android Application now let's focus on how to create Andro
 
 == Android App Bundle
 
-include::partial$example/javalib/android/2-app-bundle.adoc[]
+include::partial$example/android/javalib/2-app-bundle.adoc[]
 
 ==  Understanding `AndroidAppBundle`
 

docs/modules/ROOT/pages/kotlinlib/android-examples.adoc → docs/modules/ROOT/pages/android/kotlin.adoc

@@ -1,4 +1,4 @@
-= (Experimental) Android Builds
+= Android Kotlin Projects
 :page-aliases: android_app_kotlin_examples.adoc
 
 include::partial$gtag-config.adoc[]
@@ -17,7 +17,7 @@ These are the main Mill Modules that are relevant for building Android apps:
 
 == Simple Android Hello World Application
 
-include::partial$example/kotlinlib/android/1-hello-world.adoc[]
+include::partial$example/android/kotlinlib/1-hello-kotlin.adoc[]
 
 This example demonstrates how to create a basic "Hello World" Android application
 using the Mill build tool. It outlines the minimum setup required to compile Kotlin code,

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

@@ -42,7 +42,7 @@ change any other files in the repository:
 
 The Mill build for Mockito is not 100% complete, but it covers most of the major parts of Mockito:
 compiling Java, running JUnit tests. For now, the Android, Kotlin, and OSGI tests are skipped,
-as support for xref:javalib/android-examples.adoc[Building Android apps in Mill]
+as support for xref:android/java.adoc[Building Android apps in Mill]
 and xref:kotlinlib/intro.adoc[Kotlin with Mill] is still experimental.
 
 The goal of this exercise is not to be 100% feature complete enough to replace the Gradle build

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

@@ -81,7 +81,7 @@ It recently grew first-class Java support, demonstrating
 xref:comparisons/why-mill.adoc[2-10x speedups] over existing Java build tools
 like Maven or Gradle. Mill also has gained experimental support for Java-adjacent platforms
 like xref:kotlinlib/intro.adoc[Kotlin] and
-xref:javalib/android-examples.adoc[Android], and has demonstrated the ability to branch out into supporting
+xref:android/java.adoc[Android], and has demonstrated the ability to branch out into supporting
 more distant toolchains like xref:extending/example-typescript-support.adoc[Typescript]
 and xref:extending/example-python-support.adoc[Python].
 

example/package.mill

@@ -27,8 +27,12 @@ object `package` extends RootModule with Module {
     .modules
     .collect { case m: ExampleCrossModule => m }
 
+  object android extends Module {
+    object javalib extends Cross[ExampleCrossModuleJava](build.listIn(millSourcePath / "javalib"))
+    object kotlinlib extends Cross[ExampleCrossModuleJava](build.listIn(millSourcePath / "kotlinlib"))
+  }
   object javalib extends Module {
-    object android extends Cross[ExampleCrossModuleJava](build.listIn(millSourcePath / "android"))
+
     object basic extends Cross[ExampleCrossModuleJava](build.listIn(millSourcePath / "basic"))
     object module extends Cross[ExampleCrossModuleJava](build.listIn(millSourcePath / "module"))
     object dependencies extends Cross[ExampleCrossModuleJava](build.listIn(millSourcePath / "dependencies"))
@@ -39,7 +43,6 @@ object `package` extends RootModule with Module {
     object web extends Cross[ExampleCrossModule](build.listIn(millSourcePath / "web"))
   }
   object kotlinlib extends Module {
-    object android extends Cross[ExampleCrossModuleJava](build.listIn(millSourcePath / "android"))
     object basic extends Cross[ExampleCrossModuleKotlin](build.listIn(millSourcePath / "basic"))
     object module extends Cross[ExampleCrossModuleKotlin](build.listIn(millSourcePath / "module"))
     object dependencies extends Cross[ExampleCrossModuleKotlin](build.listIn(millSourcePath / "dependencies"))

readme.adoc

@@ -426,7 +426,7 @@ Major changes:
 
 5. Mill now supports other JVM langauges: https://mill-build.org/mill/javalib/intro.html[Java],
    experimental support for https://mill-build.org/mill/kotlinlib/intro.html[Kotlin/KotlinJs],
-   and https://mill-build.org/mill/kotlinlib/android-examples.html[even-more-experimental support for Android].
+   and https://mill-build.org/mill/android/kotlin.html[even-more-experimental support for Android].
    This includes IDE integrations, tooling integrations (docs, autoformatters, linters, testing
    frameworks, etc.)