WIP 42 - clean up classpath where plugins are unavailable, resolve scala-library

Author: bishabosha

main/api/src/mill/api/Result.scala

@@ -75,6 +75,8 @@ object Result {
     def map[V](f: T => V): Failure[V] = Result.Failure(msg, value.map(f(_)))
     def flatMap[V](f: T => Result[V]): Failure[V] =
       Failure(msg, value.flatMap(f(_).asSuccess.map(_.value)))
+
+    override def getMessage(): String = msg
   }
 
   /**

runner/src/mill/runner/MillBuildRootModule.scala

@@ -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 {
@@ -232,8 +232,9 @@ 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))
     )
   }
 
@@ -246,26 +247,27 @@ 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 {
     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 */

scalalib/src/mill/scalalib/CoursierModule.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
 
@@ -137,6 +138,15 @@ object CoursierModule {
         deps: IterableOnce[T],
         sources: Boolean = false
     ): Agg[PathRef] = {
+      // TODO: `getOrThrow` swallows error messages when Failure is returned.
+      // so I introduced resolveDeps0 where it makes sense to propagate the error message
+      resolveDeps0(deps, sources).getOrThrow
+    }
+
+    def resolveDeps0[T: CoursierModule.Resolvable](
+        deps: IterableOnce[T],
+        sources: Boolean = false
+    ): Result[Agg[PathRef]] = {
       Lib.resolveDependencies(
         repositories = repositories,
         deps = deps.map(implicitly[CoursierModule.Resolvable[T]].bind(_, bind)),
@@ -145,7 +155,7 @@ object CoursierModule {
         customizer = customizer,
         coursierCacheCustomizer = coursierCacheCustomizer,
         ctx = ctx
-      ).getOrThrow
+      )
     }
   }
 

scalalib/src/mill/scalalib/Dependency.scala

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

scalalib/src/mill/scalalib/JavaModule.scala

@@ -533,7 +533,7 @@ trait JavaModule
    * Resolved dependencies based on [[transitiveIvyDeps]] and [[transitiveCompileIvyDeps]].
    */
   def resolvedIvyDeps: T[Agg[PathRef]] = T {
-    defaultResolver().resolveDeps(transitiveCompileIvyDeps() ++ transitiveIvyDeps())
+    defaultResolver().resolveDeps0(transitiveCompileIvyDeps() ++ transitiveIvyDeps())
   }
 
   /**
@@ -545,7 +545,7 @@ trait JavaModule
   }
 
   def resolvedRunIvyDeps: T[Agg[PathRef]] = T {
-    defaultResolver().resolveDeps(runIvyDeps().map(bindDependency()) ++ transitiveIvyDeps())
+    defaultResolver().resolveDeps0(runIvyDeps().map(bindDependency()) ++ transitiveIvyDeps())
   }
 
   /**

scalalib/src/mill/scalalib/ScalaModule.scala

@@ -259,7 +259,7 @@ trait ScalaModule extends JavaModule with TestModule.ScalaModuleBase { outer =>
    * Classpath of the Scala Compiler & any compiler plugins
    */
   def scalaCompilerClasspath: T[Agg[PathRef]] = T {
-    defaultResolver().resolveDeps(
+    defaultResolver().resolveDeps0(
       Lib.scalaCompilerIvyDeps(scalaOrganization(), scalaVersion()) ++
         scalaLibraryIvyDeps()
     )

scalalib/src/mill/scalalib/ZincWorkerModule.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())
+    millProjectModule("mill-scalalib-worker", repositoriesTask(), artifactSuffix = "_3")
   }
 
   def scalalibClasspath: T[Agg[PathRef]] = T {