.

Author: gamlerhart

contrib/sbom/src/mill/contrib/sbom/CycloneDXJavaModule.scala

@@ -1,9 +1,8 @@
 package mill.contrib.sbom
 
-import coursier.{Artifacts, Resolution, VersionConstraint, core as cs}
+import coursier.{Fetch, Resolution, VersionConstraint, core as cs}
 import mill.Task
 import mill.javalib.{BoundDep, JavaModule}
-import mill.util.ArtifactResolution
 
 /**
  * Report the Java/Scala/Kotlin dependencies in a SBOM.
@@ -21,30 +20,27 @@ trait CycloneDXJavaModule extends JavaModule with CycloneDXModule {
    */
   def sbomComponents: Task[Seq[Component]] = Task {
     val resolved = resolvedRunIvyDepsDetails()()
-    resolvedSbomComponents(resolved.resolution, resolved.artifactResult)
+    resolvedSbomComponents(resolved)
   }
 
-  protected def resolvedSbomComponents(
-      resolution: Resolution,
-      artifacts: Artifacts.Result
-  ): Seq[Component] = {
-    val distinctDeps = artifacts.fullDetailedArtifacts
+  protected def resolvedSbomComponents(resolved: Fetch.Result): Seq[Component] = {
+    val distinctDeps = resolved.fullDetailedArtifacts0
       .flatMap {
         case (dep, _, _, Some(path)) => Some(dep -> path)
         case _ => None
       }
       // Artifacts.Result.files does eliminate duplicates path: Do the same
       .distinctBy(_._2)
       .map { case (dep, path) =>
-        val license = findLicenses(resolution, dep.module, dep.versionConstraint)
+        val license = findLicenses(resolved.resolution, dep.module, dep.versionConstraint)
         Component.fromDeps(os.Path(path), dep, license)
       }
     distinctDeps
   }
 
   /** Copied from [[resolvedRunIvyDeps]], but getting the raw artifacts */
-  private def resolvedRunIvyDepsDetails(): Task[ArtifactResolution] = Task.Anon {
-    millResolver().artifacts(Seq(
+  private def resolvedRunIvyDepsDetails(): Task[Fetch.Result] = Task.Anon {
+    millResolver().fetch(Seq(
       BoundDep(
         coursierDependency.withConfiguration(cs.Configuration.runtime),
         force = false

main/util/src/mill/util/ArtifactResolution.scala

@@ -1,7 +1,6 @@
 package mill.util
 
 import mill.api.*
-
 import os.ProcessOutput
 
 import java.io.*
@@ -18,10 +17,9 @@ import coursier.error.FetchError.DownloadingArtifacts
 import coursier.error.ResolutionError.CantDownloadModule
 import coursier.params.ResolutionParams
 import coursier.parse.RepositoryParser
-import coursier.jvm.{JvmCache, JvmChannel, JvmIndex, JavaHome}
+import coursier.jvm.{JavaHome, JvmCache, JvmChannel, JvmIndex}
 import coursier.util.Task
-import coursier.{Artifacts, Classifier, Dependency, Repository, Resolution, Resolve, Type}
-
+import coursier.{Artifacts, Classifier, Dependency, Fetch, Repository, Resolution, Resolve, Type}
 import mill.api.{Ctx, PathRef, Result}
 
 import scala.collection.mutable
@@ -494,7 +492,7 @@ object Jvm {
   /**
    * Resolve dependencies using Coursier, and return very detailed info about their artifacts.
    */
-  def getArtifacts(
+  def fetchArtifacts(
       repositories: Seq[Repository],
       deps: IterableOnce[Dependency],
       force: IterableOnce[Dependency] = Nil,
@@ -505,7 +503,7 @@ object Jvm {
       coursierCacheCustomizer: Option[FileCache[Task] => FileCache[Task]] = None,
       artifactTypes: Option[Set[Type]] = None,
       resolutionParams: ResolutionParams = ResolutionParams()
-  ): Result[ArtifactResolution] = {
+  ): Result[Fetch.Result] = {
     val resolutionRes = resolveDependenciesMetadataSafe(
       repositories,
       deps,
@@ -539,7 +537,11 @@ object Jvm {
             s"Failed to load ${if (sources) "source " else ""}dependencies" + errorDetails
           )
         case Right(artifacts) =>
-          Result.Success(ArtifactResolution(resolution, artifacts))
+          Result.Success(Fetch.Result(
+            resolution,
+            artifacts.fullDetailedArtifacts0,
+            artifacts.fullExtraArtifacts
+          ))
       }
     }
   }
@@ -563,7 +565,7 @@ object Jvm {
       artifactTypes: Option[Set[Type]] = None,
       resolutionParams: ResolutionParams = ResolutionParams()
   ): Result[Seq[PathRef]] =
-    getArtifacts(
+    fetchArtifacts(
       repositories,
       deps,
       force,

main/util/src/mill/util/Jvm.scala

@@ -3,10 +3,10 @@ package mill.scalalib
 import coursier.cache.FileCache
 import coursier.core.Resolution
 import coursier.params.ResolutionParams
-import coursier.{Dependency, Repository, Resolve, Type}
+import coursier.{Dependency, Fetch, Repository, Resolve, Type}
 import mill.define.Task
 import mill.api.{PathRef, Result}
-import mill.util.{ArtifactResolution, Jvm}
+import mill.util.Jvm
 
 import scala.concurrent.Await
 import scala.concurrent.duration.Duration
@@ -239,15 +239,15 @@ object CoursierModule {
     /**
      * Raw artifact results for the passed dependencies
      */
-    def artifacts[T: CoursierModule.Resolvable](
+    def fetch[T: CoursierModule.Resolvable](
         deps: IterableOnce[T],
         sources: Boolean = false
-    )(implicit ctx: mill.api.Ctx): (ArtifactResolution) = {
+    )(implicit ctx: mill.api.Ctx): (Fetch.Result) = {
       val deps0 = deps
         .iterator
         .map(implicitly[CoursierModule.Resolvable[T]].bind(_, bind))
         .toSeq
-      Jvm.getArtifacts(
+      Jvm.fetchArtifacts(
         repositories,
         deps0.map(_.dep),
         sources = sources,