com-lihaoyi · lefou · Mar 4, 2022 · Feb 26, 2022 · Mar 3, 2022 · Mar 4, 2022
diff --git a/main/src/mill/modules/Jvm.scala b/main/src/mill/modules/Jvm.scala
@@ -534,7 +534,8 @@ object Jvm {
       sources: Boolean = false,
       mapDependencies: Option[Dependency => Dependency] = None,
       customizer: Option[coursier.core.Resolution => coursier.core.Resolution] = None,
-      ctx: Option[mill.api.Ctx.Log] = None
+      ctx: Option[mill.api.Ctx.Log] = None,
+      coursierCacheCustomizer: Option[coursier.cache.FileCache[Task] => coursier.cache.FileCache[Task]] = None
   ): Result[Agg[PathRef]] = {
 
     val (_, resolution) = resolveDependenciesMetadata(
@@ -543,7 +544,8 @@ object Jvm {
       force,
       mapDependencies,
       customizer,
-      ctx
+      ctx,
+      coursierCacheCustomizer
     )
     val errs = resolution.errors
 
@@ -561,12 +563,15 @@ object Jvm {
       Result.Failure(msg)
     } else {
 
+      val coursierCache0 = coursier.cache.FileCache[Task].noCredentials
+      val coursierCache = coursierCacheCustomizer.getOrElse(identity[coursier.cache.FileCache[Task]](_)).apply(coursierCache0)
+
       def load(artifacts: Seq[coursier.util.Artifact]) = {
 
         import scala.concurrent.ExecutionContext.Implicits.global
         val loadedArtifacts = Gather[Task].gather(
           for (a <- artifacts)
-            yield coursier.cache.Cache.default.file(a).run.map(a.optional -> _)
+            yield coursierCache.file(a).run.map(a.optional -> _)
         ).unsafeRun
 
         val errors = loadedArtifacts.collect {
@@ -611,7 +616,8 @@ object Jvm {
       force: IterableOnce[coursier.Dependency],
       mapDependencies: Option[Dependency => Dependency] = None,
       customizer: Option[coursier.core.Resolution => coursier.core.Resolution] = None,
-      ctx: Option[mill.api.Ctx.Log] = None
+      ctx: Option[mill.api.Ctx.Log] = None,
+      coursierCacheCustomizer: Option[coursier.cache.FileCache[Task] => coursier.cache.FileCache[Task]] = None
   ): (Seq[Dependency], Resolution) = {
 
     val cachePolicies = coursier.cache.CacheDefaults.cachePolicies
@@ -631,15 +637,16 @@ object Jvm {
     val start = customizer.getOrElse(identity[Resolution](_)).apply(start0)
 
     val resolutionLogger = ctx.map(c => new TickerResolutionLogger(c))
-    val cache = resolutionLogger match {
+    val coursierCache0 = resolutionLogger match {
       case None => coursier.cache.FileCache[Task].withCachePolicies(cachePolicies)
       case Some(l) =>
         coursier.cache.FileCache[Task]
           .withCachePolicies(cachePolicies)
           .withLogger(l)
     }
+    val coursierCache = coursierCacheCustomizer.getOrElse(identity[coursier.cache.FileCache[Task]](_)).apply(coursierCache0)
 
-    val fetches = cache.fetchs
+    val fetches = coursierCache.fetchs
 
     val fetch = coursier.core.ResolutionProcess.fetch(repositories, fetches.head, fetches.tail)
 
@@ -762,6 +769,52 @@ object Jvm {
     }
   }
 
+  @deprecated(
+    "Use alternative overload. This one is only for binary backwards compatibility.",
+    "mill after 0.10.0"
+  )
+  def resolveDependencies(
+       repositories: Seq[Repository],
+       deps: IterableOnce[coursier.Dependency],
+       force: IterableOnce[coursier.Dependency],
+       sources: Boolean,
+       mapDependencies: Option[Dependency => Dependency],
+       customizer: Option[coursier.core.Resolution => coursier.core.Resolution],
+       ctx: Option[mill.api.Ctx.Log]
+   ): Result[Agg[PathRef]] =
+    resolveDependencies(
+      repositories = repositories,
+      deps = deps,
+      force = force,
+      sources = sources,
+      mapDependencies = mapDependencies,
+      customizer = customizer,
+      ctx = ctx,
+      coursierCacheCustomizer = None
+    )
+
+  @deprecated(
+    "Use alternative overload. This one is only for binary backwards compatibility.",
+    "mill after 0.10.0"
+  )
+  def resolveDependenciesMetadata(
+       repositories: Seq[Repository],
+       deps: IterableOnce[coursier.Dependency],
+       force: IterableOnce[coursier.Dependency],
+       mapDependencies: Option[Dependency => Dependency],
+       customizer: Option[coursier.core.Resolution => coursier.core.Resolution],
+       ctx: Option[mill.api.Ctx.Log]
+  ): (Seq[Dependency], Resolution) =
+    resolveDependenciesMetadata(
+      repositories = repositories,
+      deps = deps,
+      force = force,
+      mapDependencies = mapDependencies,
+      customizer = customizer,
+      ctx = ctx,
+      coursierCacheCustomizer = None
+    )
+
   @deprecated(
     "Use alternative overload. This one is only for binary backwards compatibility.",
     "mill after 0.9.6"
@@ -781,7 +834,8 @@ object Jvm {
       sources = sources,
       mapDependencies = mapDependencies,
       customizer = None,
-      ctx = ctx
+      ctx = ctx,
+      coursierCacheCustomizer = None
     )
 
   @deprecated(
@@ -801,7 +855,8 @@ object Jvm {
       force = force,
       mapDependencies = mapDependencies,
       customizer = None,
-      ctx = ctx
+      ctx = ctx,
+      coursierCacheCustomizer = None
     )
 
 }
diff --git a/scalalib/src/CoursierModule.scala b/scalalib/src/CoursierModule.scala
@@ -1,7 +1,8 @@
 package mill.scalalib
 
-import scala.annotation.nowarn
+import coursier.cache.FileCache
 
+import scala.annotation.nowarn
 import coursier.{Dependency, Repository, Resolve}
 import coursier.core.Resolution
 import mill.{Agg, T}
@@ -35,6 +36,7 @@ trait CoursierModule extends mill.Module {
       sources = sources,
       mapDependencies = Some(mapDependencies()),
       customizer = resolutionCustomizer(),
+      coursierCacheCustomizer = coursierCacheCustomizer(),
       ctx = Some(implicitly[mill.api.Ctx.Log])
     )
   }
@@ -71,6 +73,22 @@ trait CoursierModule extends mill.Module {
    */
   def resolutionCustomizer: Task[Option[Resolution => Resolution]] = T.task { None }
 
+  /**
+   * Customize the coursier file cache.
+   *
+   * This is rarely needed to be changed, but sometimes e.g you want to load a coursier plugin.
+   * Doing so requires adding to coursier's classpath. To do this you could use the following:
+   * {{{
+   *   override def coursierCacheCustomizer = T.task {
+   *      Some( (fc: coursier.cache.FileCache[Task]) =>
+   *        fc.withClassLoaders(Seq(classOf[coursier.cache.protocol.S3Handler].getClassLoader))
+   *      )
+   *   }
+   * }}}
+   * @return
+   */
+  def coursierCacheCustomizer: Task[Option[FileCache[coursier.util.Task] => FileCache[coursier.util.Task]]] = T.task { None }
+
   /**
    * The repositories used to resolved dependencies with [[resolveDeps()]].
    */

diff --git a/scalalib/src/GenIdeaImpl.scala b/scalalib/src/GenIdeaImpl.scala
@@ -110,6 +110,7 @@ case class GenIdeaImpl(
               sources = false,
               mapDependencies = None,
               customizer = None,
+              coursierCacheCustomizer = None,
               ctx = ctx
             )
 
@@ -122,6 +123,7 @@ case class GenIdeaImpl(
                 sources = true,
                 mapDependencies = None,
                 customizer = None,
+                coursierCacheCustomizer = None,
                 ctx = ctx
               )
             }

diff --git a/scalalib/src/JavaModule.scala b/scalalib/src/JavaModule.scala
@@ -536,7 +536,8 @@ trait JavaModule
         resolveCoursierDependency().apply(_),
         additionalDeps() ++ transitiveIvyDeps(),
         Some(mapDependencies()),
-        customizer = resolutionCustomizer()
+        customizer = resolutionCustomizer(),
+        coursierCacheCustomizer = coursierCacheCustomizer(),
       )
 
       println(

diff --git a/scalalib/src/Lib.scala b/scalalib/src/Lib.scala
@@ -6,6 +6,7 @@ import java.lang.annotation.Annotation
 import java.lang.reflect.Modifier
 import java.util.zip.ZipInputStream
 
+import coursier.util.Task
 import coursier.{Dependency, Fetch, Repository, Resolution}
 import mill.api.{Ctx, Loose, PathRef, Result}
 import sbt.testing._
@@ -29,7 +30,8 @@ object Lib {
       deps: IterableOnce[Dep],
       mapDependencies: Option[Dependency => Dependency] = None,
       customizer: Option[coursier.core.Resolution => coursier.core.Resolution] = None,
-      ctx: Option[Ctx.Log] = None
+      ctx: Option[Ctx.Log] = None,
+      coursierCacheCustomizer: Option[coursier.cache.FileCache[Task] => coursier.cache.FileCache[Task]] = None,
   ): (Seq[Dependency], Resolution) = {
     val depSeq = deps.iterator.toSeq
     mill.modules.Jvm.resolveDependenciesMetadata(
@@ -38,7 +40,8 @@ object Lib {
       force = depSeq.filter(_.force).map(depToDependency),
       mapDependencies = mapDependencies,
       customizer = customizer,
-      ctx = ctx
+      ctx = ctx,
+      coursierCacheCustomizer = coursierCacheCustomizer
     )
   }
 
@@ -56,7 +59,8 @@ object Lib {
       sources: Boolean = false,
       mapDependencies: Option[Dependency => Dependency] = None,
       customizer: Option[coursier.core.Resolution => coursier.core.Resolution] = None,
-      ctx: Option[Ctx.Log] = None
+      ctx: Option[Ctx.Log] = None,
+      coursierCacheCustomizer: Option[coursier.cache.FileCache[Task] => coursier.cache.FileCache[Task]] = None
   ): Result[Agg[PathRef]] = {
     val depSeq = deps.iterator.toSeq
     mill.modules.Jvm.resolveDependencies(
@@ -66,7 +70,8 @@ object Lib {
       sources = sources,
       mapDependencies = mapDependencies,
       customizer = customizer,
-      ctx = ctx
+      ctx = ctx,
+      coursierCacheCustomizer = coursierCacheCustomizer
     )
   }
 
@@ -120,6 +125,52 @@ object Lib {
         ivy"$scalaOrganization:scala-library:$scalaVersion".forceVersion()
       )
 
+  @deprecated(
+    "User other overload instead. Only for binary backward compatibility.",
+    "mill after 0.10.0"
+  )
+  def resolveDependenciesMetadata(
+       repositories: Seq[Repository],
+       depToDependency: Dep => coursier.Dependency,
+       deps: IterableOnce[Dep],
+       mapDependencies: Option[Dependency => Dependency],
+       customizer: Option[coursier.core.Resolution => coursier.core.Resolution],
+       ctx: Option[Ctx.Log]
+   ): (Seq[Dependency], Resolution) =
+    resolveDependenciesMetadata(
+      repositories = repositories,
+      depToDependency = depToDependency,
+      deps = deps,
+      mapDependencies = mapDependencies,
+      customizer = customizer,
+      ctx = ctx,
+      coursierCacheCustomizer = None
+    )
+
+  @deprecated(
+    "User other overload instead. Only for binary backward compatibility.",
+    "mill after 0.10.0"
+  )
+  def resolveDependencies(
+       repositories: Seq[Repository],
+       depToDependency: Dep => coursier.Dependency,
+       deps: IterableOnce[Dep],
+       sources: Boolean,
+       mapDependencies: Option[Dependency => Dependency],
+       customizer: Option[coursier.core.Resolution => coursier.core.Resolution],
+       ctx: Option[Ctx.Log]
+   ): Result[Agg[PathRef]] =
+    resolveDependencies(
+      repositories = repositories,
+      depToDependency = depToDependency,
+      deps = deps,
+      sources = sources,
+      mapDependencies = mapDependencies,
+      customizer = customizer,
+      ctx = ctx,
+      coursierCacheCustomizer = None
+    )
+
   @deprecated(
     "User other overload instead. Only for binary backward compatibility.",
     "mill after 0.9.6"
@@ -137,7 +188,8 @@ object Lib {
       deps = deps,
       mapDependencies = mapDependencies,
       customizer = None,
-      ctx = ctx
+      ctx = ctx,
+      coursierCacheCustomizer = None
     )
 
   @deprecated(
@@ -159,7 +211,8 @@ object Lib {
       sources = sources,
       mapDependencies = mapDependencies,
       customizer = None,
-      ctx = ctx
+      ctx = ctx,
+      coursierCacheCustomizer = None
     )
 
   def findSourceFiles(sources: Seq[PathRef], extensions: Seq[String]): Seq[os.Path] = {

diff --git a/scalalib/src/dependency/versions/VersionsFinder.scala b/scalalib/src/dependency/versions/VersionsFinder.scala
@@ -39,6 +39,7 @@ private[dependency] object VersionsFinder {
         val repos = javaModule.repositoriesTask()
         val mapDeps = javaModule.mapDependencies()
         val custom = javaModule.resolutionCustomizer()
+        val cacheCustom = javaModule.coursierCacheCustomizer()
 
         val (dependencies, _) =
           Lib.resolveDependenciesMetadata(
@@ -47,6 +48,7 @@ private[dependency] object VersionsFinder {
             deps = deps ++ compileIvyDeps ++ runIvyDeps,
             mapDependencies = Some(mapDeps),
             customizer = custom,
+            coursierCacheCustomizer = cacheCustom,
             ctx = Some(T.log)
           )