Part 6 - use mill-moduledefs 0.11.0-M1 (with scala 3 port)

- clean up classpath, resolve scala-library

Author: bishabosha

build.mill

@@ -403,11 +403,11 @@ trait MillScalaModule extends ScalaModule with MillJavaModule with ScalafixModul
   def scalacPluginIvyDeps =
     super.scalacPluginIvyDeps() ++
       Agg.when(!scalaVersion().startsWith("3."))(Deps.acyclic) ++
-      Agg.when(scalaVersion().startsWith("2.13."))(Deps.millModuledefsPlugin)
+      Agg(Deps.millModuledefsPlugin)
 
   def mandatoryIvyDeps =
     super.mandatoryIvyDeps() ++
-      Agg.when(scalaVersion().startsWith("2.13."))(Deps.millModuledefs)
+      Agg(Deps.millModuledefs)
 
   /** Default tests module. */
   lazy val test: MillScalaTests = new MillScalaTests {}

contrib/buildinfo/src/mill/contrib/buildinfo/BuildInfo.scala

@@ -35,8 +35,7 @@ trait BuildInfo extends JavaModule {
    */
   def buildInfoMembers: T[Seq[BuildInfo.Value]] = Seq.empty[BuildInfo.Value]
 
-  // TODO: remove override when mill-moduledefs is ported to Scala 3
-  override def resources: T[Seq[PathRef]] =
+  def resources: T[Seq[PathRef]] =
     if (buildInfoStaticCompiled) super.resources
     else T.sources { super.resources() ++ Seq(buildInfoResources()) }
 

main/define/src/mill/moduledefs/Cacher.scala

@@ -79,7 +79,7 @@ object Util {
       repositories: Seq[Repository],
       resolveFilter: os.Path => Boolean = _ => true,
       // this should correspond to the mill runtime Scala version
-      artifactSuffix: String = "_2.13"
+      artifactSuffix: String = "_3"
   ): Result[Agg[PathRef]] = {
 
     mill.util.Jvm.resolveDependencies(

main/define/src/mill/moduledefs/Scaladoc.java

@@ -219,8 +219,9 @@ abstract class MillBuildRootModule()(implicit
    * We exclude them to avoid incompatible or duplicate artifacts on the classpath.
    */
   protected def resolveDepsExclusions: T[Seq[(String, String)]] = T {
-    Lib.millAssemblyEmbeddedDeps.toSeq.map(d =>
-      (d.dep.module.organization.value, d.dep.module.name.value)
+    Lib.millAssemblyEmbeddedDeps.toSeq.flatMap(d =>
+      if d.dep.module.name.value == "scala-library" && scalaVersion().startsWith("3.") then None
+      else Some((d.dep.module.organization.value, d.dep.module.name.value))
     )
   }
 
@@ -239,20 +240,21 @@ abstract class MillBuildRootModule()(implicit
   override def scalacOptions: T[Seq[String]] = T {
     super.scalacOptions() ++
       Seq(
-        "-Xplugin:" + lineNumberPluginClasspath().map(_.path).mkString(","),
+        // "-Xplugin:" + lineNumberPluginClasspath().map(_.path).mkString(","),
         "-deprecation",
         // Make sure we abort of the plugin is not found, to ensure any
         // classpath/plugin-discovery issues are surfaced early rather than
         // after hours of debugging
-        "-Xplugin-require:mill-linenumber-plugin"
+        // "-Xplugin-require:mill-linenumber-plugin"
       )
   }
 
   override def scalacPluginClasspath: T[Agg[PathRef]] =
     super.scalacPluginClasspath() ++ lineNumberPluginClasspath()
 
   def lineNumberPluginClasspath: T[Agg[PathRef]] = T {
-    millProjectModule("mill-runner-linenumbers", repositoriesTask())
+    // millProjectModule("mill-runner-linenumbers", repositoriesTask())
+    Agg.empty
   }
 
   /** Used in BSP IntelliJ, which can only work with directories */

main/util/src/mill/util/Util.scala

@@ -4,6 +4,7 @@ import coursier.cache.FileCache
 import coursier.{Dependency, Repository, Resolve}
 import coursier.core.Resolution
 import mill.T
+import mill.api.Result
 import mill.define.Task
 import mill.api.PathRef
 

runner/src/mill/runner/MillBuildRootModule.scala

@@ -16,7 +16,7 @@ object Dependency extends ExternalModule {
     T.command {
       DependencyUpdatesImpl(
         ev,
-        ???,// implicitly,
+        implicitly,
         ev.rootModule,
         ev.rootModule.millDiscover,
         allowPreRelease

scalalib/src/mill/scalalib/CoursierModule.scala

@@ -96,9 +96,9 @@ trait JavaModule
    * If none is specified, the classpath is searched for an appropriate main
    * class to use if one exists
    */
-  override def mainClass: T[Option[String]] = None // TODO: remove override with mill-moduledefs
+  def mainClass: T[Option[String]] = None
 
-  override def finalMainClassOpt: T[Either[String, String]] = T {  // TODO: remove override with mill-moduledefs
+  def finalMainClassOpt: T[Either[String, String]] = T {
     mainClass() match {
       case Some(m) => Right(m)
       case None =>
@@ -115,7 +115,7 @@ trait JavaModule
     }
   }
 
-  override def finalMainClass: T[String] = T {  // TODO: remove override with mill-moduledefs
+  def finalMainClass: T[String] = T {
     finalMainClassOpt() match {
       case Right(main) => Result.Success(main)
       case Left(msg) => Result.Failure(msg)
@@ -133,7 +133,7 @@ trait JavaModule
    * ivy"org::name:version" for Scala dependencies or ivy"org:name:version"
    * for Java dependencies
    */
-  override def ivyDeps: T[Agg[Dep]] = T { Agg.empty[Dep] }  // TODO: remove override with mill-moduledefs
+  def ivyDeps: T[Agg[Dep]] = T { Agg.empty[Dep] }
 
   /**
    * Aggregation of mandatoryIvyDeps and ivyDeps.
@@ -369,8 +369,7 @@ trait JavaModule
    * The folders where the resource files for this module live.
    * If you need resources to be seen by the compiler, use [[compileResources]].
    */
-  // TODO: remove override when mill-moduledefs is ported to scala 3
-  override def resources: T[Seq[PathRef]] = T.sources { millSourcePath / "resources" }
+  def resources: T[Seq[PathRef]] = T.sources { millSourcePath / "resources" }
 
   /**
    * The folders where the compile time resource files for this module live.