Cleanup API docs setup (#5928)

Remove old TODO, unnecessary trait and obsolete special case.

Pull request: #5928

Author: lefou

libs/kotlinlib/package.mill

@@ -6,8 +6,6 @@ import mill.contrib.buildinfo.BuildInfo
 import mill.scalalib.*
 import millbuild.*
 
-// TODO change MillPublishScalaModule to MillStableScalaModule after mill version with kotlinlib is released,
-//  because currently there is no previous artifact version
 object `package` extends MillStableScalaModule with BuildInfo {
 
   def moduleDeps = Seq(build.libs.javalib, build.libs.javalib.testrunner, api, `ksp2-api`)
@@ -39,18 +37,16 @@ object `package` extends MillStableScalaModule with BuildInfo {
     )
   )
 
-  trait MillKotlinModule extends MillPublishScalaModule
-
   // shared between kotlinlib and kotlinlib.worker
-  object api extends MillKotlinModule {
+  object api extends MillPublishScalaModule {
     def moduleDeps = Seq(build.libs.javalib.testrunner)
 
     override def compileMvnDeps: T[Seq[Dep]] = Seq(
       Deps.osLib
     )
   }
 
-  object worker extends MillKotlinModule {
+  object worker extends MillPublishScalaModule {
     override def compileModuleDeps = Seq(api)
 
     def mandatoryMvnDeps = Seq.empty[Dep]
@@ -63,9 +59,9 @@ object `package` extends MillStableScalaModule with BuildInfo {
       )
   }
 
-  object `ksp2-api` extends MillKotlinModule
+  object `ksp2-api` extends MillPublishScalaModule
 
-  object ksp2 extends MillKotlinModule {
+  object ksp2 extends MillPublishScalaModule {
     def moduleDeps = Seq(`ksp2-api`)
     override def compileMvnDeps: T[Seq[Dep]] = super.compileMvnDeps() ++ Seq(
       mvn"com.google.devtools.ksp:symbol-processing-common-deps:${Deps.kotlinVersion}-${Deps.kspVersion}",

mill-build/src/millbuild/MillStableScalaModule.scala

@@ -1,5 +1,8 @@
 package millbuild
 import mill._, scalalib._
 
-/** Publishable module which contains strictly handled API. */
+/**
+ * Publishable module which contains strictly handled API.
+ * Those modules are also included in the generated API documentation.
+ */
 trait MillStableScalaModule extends MillPublishScalaModule with MillStableJavaModule

website/package.mill

@@ -11,6 +11,10 @@ import mill.api.BuildCtx
 
 /** Generates the mill documentation with Antora. */
 object `package` extends mill.Module {
+
+  /**
+   * API documentation generated with ScalaDoc.
+   */
   object apidocs extends UnidocModule {
     def unidocDocumentTitle = Task { "Mill" }
 
@@ -25,7 +29,6 @@ object `package` extends mill.Module {
     def scalaVersion = Deps.scalaVersion
     def moduleDeps = build.moduleInternal.modules.collect {
       case m: MillStableScalaModule => m
-      case m: JavaModule if m eq build.libs.kotlinlib => m
     }
     def unidocSourceUrl = Task {
       val sha = "main" // VcsVersion.vcsState().currentRevision