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

Author: bishabosha

build.sc

@@ -174,7 +174,7 @@ object Deps {
   val osLib = ivy"com.lihaoyi::os-lib:0.10.3"
   val pprint = ivy"com.lihaoyi::pprint:0.9.0"
   val mainargs = ivy"com.lihaoyi::mainargs:0.7.2"
-  val millModuledefsVersion = "0.10.9"
+  val millModuledefsVersion = "0.11.0-M1"
   val millModuledefsString = s"com.lihaoyi::mill-moduledefs:${millModuledefsVersion}"
   val millModuledefs = ivy"${millModuledefsString}"
   val millModuledefsPlugin =
@@ -422,11 +422,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 {}
@@ -761,7 +761,7 @@ object main extends MillStableScalaModule with BuildInfo {
       if (scalaVersion().startsWith("3.")) Agg.empty else Agg(Deps.scalaReflect(scalaVersion()))
     }
     def ivyDeps = Agg(
-      // Deps.millModuledefs, // TODO: port moduledefs to Scala 3
+      Deps.millModuledefs,
       // Necessary so we can share the JNA classes throughout the build process
       Deps.jna,
       Deps.jnaPlatform,

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

@@ -96,8 +96,8 @@ class MillBuildRootModule()(implicit
     Agg.from(
       MillIvy.processMillIvyDepSignature(parseBuildFiles().ivyDeps)
         .map(mill.scalalib.Dep.parse)
-    ) /*++
-      Agg(ivy"com.lihaoyi::mill-moduledefs:${Versions.millModuledefsVersion}")*/
+    ) ++
+      Agg(ivy"com.lihaoyi::mill-moduledefs:${Versions.millModuledefsVersion}")
   }
 
   override def runIvyDeps = T {
@@ -247,7 +247,7 @@ class MillBuildRootModule()(implicit
   }
 
   override def scalacPluginIvyDeps: T[Agg[Dep]] = Agg(
-    // ivy"com.lihaoyi:::scalac-mill-moduledefs-plugin:${Versions.millModuledefsVersion}"
+    ivy"com.lihaoyi:::scalac-mill-moduledefs-plugin:${Versions.millModuledefsVersion}"
   )
 
   override def scalacOptions: T[Seq[String]] = T {

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

@@ -35,7 +35,7 @@ trait JavaModule
     with BspModule
     with SemanticDbJavaModule { outer =>
 
-  override def zincWorker: ModuleRef[ZincWorkerModule] = super.zincWorker // TODO: remove override with mill-moduledefs
+  def zincWorker: ModuleRef[ZincWorkerModule] = super.zincWorker
   type JavaTests = JavaModuleTests
   @deprecated("Use JavaTests instead", since = "Mill 0.11.10")
   trait JavaModuleTests extends JavaModule with TestModule {
@@ -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 =>
@@ -114,7 +114,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)
@@ -132,7 +132,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.
@@ -362,8 +362,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.

runner/src/mill/runner/MillBuildRootModule.scala

@@ -175,10 +175,10 @@ trait ScalaModule extends JavaModule with TestModule.ScalaModuleBase { outer =>
    */
   private def enablePluginScalacOptions: Target[Seq[String]] = T {
 
-    val resolvedJars = defaultResolver().resolveDeps(
+    val resolvedJars = defaultResolver().resolveDeps0(
       scalacPluginIvyDeps().map(_.exclude("*" -> "*"))
     )
-    resolvedJars.iterator.map(jar => s"-Xplugin:${jar.path}").toSeq
+    resolvedJars.map(_.iterator.map(jar => s"-Xplugin:${jar.path}").toSeq)
   }
 
   /**

scalalib/src/mill/scalalib/JavaModule.scala

@@ -24,7 +24,7 @@ object ZincWorkerModule extends ExternalModule with ZincWorkerModule with Coursi
 trait ZincWorkerModule extends mill.Module with OfflineSupportModule { self: CoursierModule =>
 
   def classpath: T[Agg[PathRef]] = T {
-    millProjectModule("mill-scalalib-worker", repositoriesTask(), artifactSuffix = "_3")
+    millProjectModule("mill-scalalib-worker", repositoriesTask())
   }
 
   def scalalibClasspath: T[Agg[PathRef]] = T {