From 246e92411c874ae8a33655dec7937af8c4041509 Mon Sep 17 00:00:00 2001 From: Nitay Date: Fri, 25 Feb 2022 21:58:11 -0500 Subject: [PATCH 1/4] cache customizer --- main/src/mill/modules/Jvm.scala | 8 +++++++- scalalib/src/CoursierModule.scala | 20 ++++++++++++++++++- scalalib/src/JavaModule.scala | 3 ++- scalalib/src/Lib.scala | 7 +++++++ .../dependency/versions/VersionsFinder.scala | 2 ++ 5 files changed, 37 insertions(+), 3 deletions(-) diff --git a/main/src/mill/modules/Jvm.scala b/main/src/mill/modules/Jvm.scala index b006f22f3eb..0055d6a21d4 100644 --- a/main/src/mill/modules/Jvm.scala +++ b/main/src/mill/modules/Jvm.scala @@ -534,6 +534,7 @@ object Jvm { sources: Boolean = false, mapDependencies: Option[Dependency => Dependency] = None, customizer: Option[coursier.core.Resolution => coursier.core.Resolution] = None, + cacheCustomizer: Option[coursier.cache.FileCache[Task] => coursier.cache.FileCache[Task]] = None, ctx: Option[mill.api.Ctx.Log] = None ): Result[Agg[PathRef]] = { @@ -543,6 +544,7 @@ object Jvm { force, mapDependencies, customizer, + cacheCustomizer, ctx ) val errs = resolution.errors @@ -611,6 +613,7 @@ object Jvm { force: IterableOnce[coursier.Dependency], mapDependencies: Option[Dependency => Dependency] = None, customizer: Option[coursier.core.Resolution => coursier.core.Resolution] = None, + cacheCustomizer: Option[coursier.cache.FileCache[Task] => coursier.cache.FileCache[Task]] = None, ctx: Option[mill.api.Ctx.Log] = None ): (Seq[Dependency], Resolution) = { @@ -631,13 +634,14 @@ object Jvm { val start = customizer.getOrElse(identity[Resolution](_)).apply(start0) val resolutionLogger = ctx.map(c => new TickerResolutionLogger(c)) - val cache = resolutionLogger match { + val cache0 = resolutionLogger match { case None => coursier.cache.FileCache[Task].withCachePolicies(cachePolicies) case Some(l) => coursier.cache.FileCache[Task] .withCachePolicies(cachePolicies) .withLogger(l) } + val cache = cacheCustomizer.getOrElse(identity[coursier.cache.FileCache[Task]](_)).apply(cache0) val fetches = cache.fetchs @@ -781,6 +785,7 @@ object Jvm { sources = sources, mapDependencies = mapDependencies, customizer = None, + cacheCustomizer = None, ctx = ctx ) @@ -801,6 +806,7 @@ object Jvm { force = force, mapDependencies = mapDependencies, customizer = None, + cacheCustomizer = None, ctx = ctx ) diff --git a/scalalib/src/CoursierModule.scala b/scalalib/src/CoursierModule.scala index d69e6ca8bb1..f96256bf2d4 100644 --- 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(), + cacheCustomizer = cacheCustomizer(), 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 cacheCustomizer = T.task { + * Some( (fc: coursier.cache.FileCache[Task]) => + * fc.withClassLoaders(Seq(classOf[coursier.cache.protocol.S3Handler].getClassLoader)) + * ) + * } + * }}} + * @return + */ + def cacheCustomizer: 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/JavaModule.scala b/scalalib/src/JavaModule.scala index 05e4c3aab5d..5287515a7b7 100644 --- 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(), + cacheCustomizer = cacheCustomizer(), ) println( diff --git a/scalalib/src/Lib.scala b/scalalib/src/Lib.scala index 0ed59c2ec63..1f575745a71 100644 --- 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,6 +30,7 @@ object Lib { deps: IterableOnce[Dep], mapDependencies: Option[Dependency => Dependency] = None, customizer: Option[coursier.core.Resolution => coursier.core.Resolution] = None, + cacheCustomizer: Option[coursier.cache.FileCache[Task] => coursier.cache.FileCache[Task]] = None, ctx: Option[Ctx.Log] = None ): (Seq[Dependency], Resolution) = { val depSeq = deps.iterator.toSeq @@ -38,6 +40,7 @@ object Lib { force = depSeq.filter(_.force).map(depToDependency), mapDependencies = mapDependencies, customizer = customizer, + cacheCustomizer = cacheCustomizer, ctx = ctx ) } @@ -56,6 +59,7 @@ object Lib { sources: Boolean = false, mapDependencies: Option[Dependency => Dependency] = None, customizer: Option[coursier.core.Resolution => coursier.core.Resolution] = None, + cacheCustomizer: Option[coursier.cache.FileCache[Task] => coursier.cache.FileCache[Task]] = None, ctx: Option[Ctx.Log] = None ): Result[Agg[PathRef]] = { val depSeq = deps.iterator.toSeq @@ -66,6 +70,7 @@ object Lib { sources = sources, mapDependencies = mapDependencies, customizer = customizer, + cacheCustomizer = cacheCustomizer, ctx = ctx ) } @@ -137,6 +142,7 @@ object Lib { deps = deps, mapDependencies = mapDependencies, customizer = None, + cacheCustomizer = None, ctx = ctx ) @@ -159,6 +165,7 @@ object Lib { sources = sources, mapDependencies = mapDependencies, customizer = None, + cacheCustomizer = None, ctx = ctx ) diff --git a/scalalib/src/dependency/versions/VersionsFinder.scala b/scalalib/src/dependency/versions/VersionsFinder.scala index 6d682b3bf69..63d971499ef 100644 --- 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.cacheCustomizer() val (dependencies, _) = Lib.resolveDependenciesMetadata( @@ -47,6 +48,7 @@ private[dependency] object VersionsFinder { deps = deps ++ compileIvyDeps ++ runIvyDeps, mapDependencies = Some(mapDeps), customizer = custom, + cacheCustomizer = cacheCustom, ctx = Some(T.log) ) From 11e0ac1c4e74b217629cdaae726cb5510dddbfeb Mon Sep 17 00:00:00 2001 From: Nitay Date: Wed, 2 Mar 2022 21:28:17 -0500 Subject: [PATCH 2/4] more cache customizer --- main/src/mill/modules/Jvm.scala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/main/src/mill/modules/Jvm.scala b/main/src/mill/modules/Jvm.scala index 0055d6a21d4..8fc9cb719b6 100644 --- a/main/src/mill/modules/Jvm.scala +++ b/main/src/mill/modules/Jvm.scala @@ -563,12 +563,15 @@ object Jvm { Result.Failure(msg) } else { + val cache0 = coursier.cache.FileCache[Task].noCredentials + val cache = cacheCustomizer.getOrElse(identity[coursier.cache.FileCache[Task]](_)).apply(cache0) + 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 cache.file(a).run.map(a.optional -> _) ).unsafeRun val errors = loadedArtifacts.collect { From 9c1e5e56c353bab1eebd90212f25f607dfaa317a Mon Sep 17 00:00:00 2001 From: Nitay Date: Thu, 3 Mar 2022 21:41:18 -0500 Subject: [PATCH 3/4] pr cmnts --- main/src/mill/modules/Jvm.scala | 68 ++++++++++++++++--- scalalib/src/CoursierModule.scala | 6 +- scalalib/src/GenIdeaImpl.scala | 2 + scalalib/src/JavaModule.scala | 2 +- scalalib/src/Lib.scala | 58 ++++++++++++++-- .../dependency/versions/VersionsFinder.scala | 4 +- 6 files changed, 117 insertions(+), 23 deletions(-) diff --git a/main/src/mill/modules/Jvm.scala b/main/src/mill/modules/Jvm.scala index 8fc9cb719b6..e5b8fdfa8c8 100644 --- a/main/src/mill/modules/Jvm.scala +++ b/main/src/mill/modules/Jvm.scala @@ -534,7 +534,7 @@ object Jvm { sources: Boolean = false, mapDependencies: Option[Dependency => Dependency] = None, customizer: Option[coursier.core.Resolution => coursier.core.Resolution] = None, - cacheCustomizer: Option[coursier.cache.FileCache[Task] => coursier.cache.FileCache[Task]] = None, + coursierCacheCustomizer: Option[coursier.cache.FileCache[Task] => coursier.cache.FileCache[Task]] = None, ctx: Option[mill.api.Ctx.Log] = None ): Result[Agg[PathRef]] = { @@ -544,7 +544,7 @@ object Jvm { force, mapDependencies, customizer, - cacheCustomizer, + coursierCacheCustomizer, ctx ) val errs = resolution.errors @@ -563,15 +563,15 @@ object Jvm { Result.Failure(msg) } else { - val cache0 = coursier.cache.FileCache[Task].noCredentials - val cache = cacheCustomizer.getOrElse(identity[coursier.cache.FileCache[Task]](_)).apply(cache0) + 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 cache.file(a).run.map(a.optional -> _) + yield coursierCache.file(a).run.map(a.optional -> _) ).unsafeRun val errors = loadedArtifacts.collect { @@ -616,7 +616,7 @@ object Jvm { force: IterableOnce[coursier.Dependency], mapDependencies: Option[Dependency => Dependency] = None, customizer: Option[coursier.core.Resolution => coursier.core.Resolution] = None, - cacheCustomizer: Option[coursier.cache.FileCache[Task] => coursier.cache.FileCache[Task]] = None, + coursierCacheCustomizer: Option[coursier.cache.FileCache[Task] => coursier.cache.FileCache[Task]] = None, ctx: Option[mill.api.Ctx.Log] = None ): (Seq[Dependency], Resolution) = { @@ -637,16 +637,16 @@ object Jvm { val start = customizer.getOrElse(identity[Resolution](_)).apply(start0) val resolutionLogger = ctx.map(c => new TickerResolutionLogger(c)) - val cache0 = 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 cache = cacheCustomizer.getOrElse(identity[coursier.cache.FileCache[Task]](_)).apply(cache0) + 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) @@ -769,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, + coursierCacheCustomizer = None, + ctx = ctx + ) + + @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, + coursierCacheCustomizer = None, + ctx = ctx + ) + @deprecated( "Use alternative overload. This one is only for binary backwards compatibility.", "mill after 0.9.6" @@ -788,7 +834,7 @@ object Jvm { sources = sources, mapDependencies = mapDependencies, customizer = None, - cacheCustomizer = None, + coursierCacheCustomizer = None, ctx = ctx ) @@ -809,7 +855,7 @@ object Jvm { force = force, mapDependencies = mapDependencies, customizer = None, - cacheCustomizer = None, + coursierCacheCustomizer = None, ctx = ctx ) diff --git a/scalalib/src/CoursierModule.scala b/scalalib/src/CoursierModule.scala index f96256bf2d4..9bac1e5bba5 100644 --- a/scalalib/src/CoursierModule.scala +++ b/scalalib/src/CoursierModule.scala @@ -36,7 +36,7 @@ trait CoursierModule extends mill.Module { sources = sources, mapDependencies = Some(mapDependencies()), customizer = resolutionCustomizer(), - cacheCustomizer = cacheCustomizer(), + coursierCacheCustomizer = coursierCacheCustomizer(), ctx = Some(implicitly[mill.api.Ctx.Log]) ) } @@ -79,7 +79,7 @@ trait CoursierModule extends mill.Module { * 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 cacheCustomizer = T.task { + * override def coursierCacheCustomizer = T.task { * Some( (fc: coursier.cache.FileCache[Task]) => * fc.withClassLoaders(Seq(classOf[coursier.cache.protocol.S3Handler].getClassLoader)) * ) @@ -87,7 +87,7 @@ trait CoursierModule extends mill.Module { * }}} * @return */ - def cacheCustomizer: Task[Option[FileCache[coursier.util.Task] => FileCache[coursier.util.Task]]] = T.task { None } + 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 index ff35dc41539..ddf3a573b72 100755 --- 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 index 5287515a7b7..c32da6decca 100644 --- a/scalalib/src/JavaModule.scala +++ b/scalalib/src/JavaModule.scala @@ -537,7 +537,7 @@ trait JavaModule additionalDeps() ++ transitiveIvyDeps(), Some(mapDependencies()), customizer = resolutionCustomizer(), - cacheCustomizer = cacheCustomizer(), + coursierCacheCustomizer = coursierCacheCustomizer(), ) println( diff --git a/scalalib/src/Lib.scala b/scalalib/src/Lib.scala index 1f575745a71..4ce49604e8e 100644 --- a/scalalib/src/Lib.scala +++ b/scalalib/src/Lib.scala @@ -30,7 +30,7 @@ object Lib { deps: IterableOnce[Dep], mapDependencies: Option[Dependency => Dependency] = None, customizer: Option[coursier.core.Resolution => coursier.core.Resolution] = None, - cacheCustomizer: Option[coursier.cache.FileCache[Task] => coursier.cache.FileCache[Task]] = None, + coursierCacheCustomizer: Option[coursier.cache.FileCache[Task] => coursier.cache.FileCache[Task]] = None, ctx: Option[Ctx.Log] = None ): (Seq[Dependency], Resolution) = { val depSeq = deps.iterator.toSeq @@ -40,7 +40,7 @@ object Lib { force = depSeq.filter(_.force).map(depToDependency), mapDependencies = mapDependencies, customizer = customizer, - cacheCustomizer = cacheCustomizer, + coursierCacheCustomizer = coursierCacheCustomizer, ctx = ctx ) } @@ -59,7 +59,7 @@ object Lib { sources: Boolean = false, mapDependencies: Option[Dependency => Dependency] = None, customizer: Option[coursier.core.Resolution => coursier.core.Resolution] = None, - cacheCustomizer: Option[coursier.cache.FileCache[Task] => coursier.cache.FileCache[Task]] = None, + coursierCacheCustomizer: Option[coursier.cache.FileCache[Task] => coursier.cache.FileCache[Task]] = None, ctx: Option[Ctx.Log] = None ): Result[Agg[PathRef]] = { val depSeq = deps.iterator.toSeq @@ -70,7 +70,7 @@ object Lib { sources = sources, mapDependencies = mapDependencies, customizer = customizer, - cacheCustomizer = cacheCustomizer, + coursierCacheCustomizer = coursierCacheCustomizer, ctx = ctx ) } @@ -125,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, + coursierCacheCustomizer = None, + ctx = ctx + ) + + @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, + coursierCacheCustomizer = None, + ctx = ctx + ) + @deprecated( "User other overload instead. Only for binary backward compatibility.", "mill after 0.9.6" @@ -142,7 +188,7 @@ object Lib { deps = deps, mapDependencies = mapDependencies, customizer = None, - cacheCustomizer = None, + coursierCacheCustomizer = None, ctx = ctx ) @@ -165,7 +211,7 @@ object Lib { sources = sources, mapDependencies = mapDependencies, customizer = None, - cacheCustomizer = None, + coursierCacheCustomizer = None, ctx = ctx ) diff --git a/scalalib/src/dependency/versions/VersionsFinder.scala b/scalalib/src/dependency/versions/VersionsFinder.scala index 63d971499ef..b2a07362f94 100644 --- a/scalalib/src/dependency/versions/VersionsFinder.scala +++ b/scalalib/src/dependency/versions/VersionsFinder.scala @@ -39,7 +39,7 @@ private[dependency] object VersionsFinder { val repos = javaModule.repositoriesTask() val mapDeps = javaModule.mapDependencies() val custom = javaModule.resolutionCustomizer() - val cacheCustom = javaModule.cacheCustomizer() + val cacheCustom = javaModule.coursierCacheCustomizer() val (dependencies, _) = Lib.resolveDependenciesMetadata( @@ -48,7 +48,7 @@ private[dependency] object VersionsFinder { deps = deps ++ compileIvyDeps ++ runIvyDeps, mapDependencies = Some(mapDeps), customizer = custom, - cacheCustomizer = cacheCustom, + coursierCacheCustomizer = cacheCustom, ctx = Some(T.log) ) From d541c03827a9914c52574ef47536cf25ba9ba66f Mon Sep 17 00:00:00 2001 From: Nitay Date: Fri, 4 Mar 2022 07:36:01 -0500 Subject: [PATCH 4/4] binary compat --- main/src/mill/modules/Jvm.scala | 28 ++++++++++++++-------------- scalalib/src/Lib.scala | 30 +++++++++++++++--------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/main/src/mill/modules/Jvm.scala b/main/src/mill/modules/Jvm.scala index e5b8fdfa8c8..59f16df27a9 100644 --- a/main/src/mill/modules/Jvm.scala +++ b/main/src/mill/modules/Jvm.scala @@ -534,8 +534,8 @@ object Jvm { sources: Boolean = false, mapDependencies: Option[Dependency => Dependency] = None, customizer: Option[coursier.core.Resolution => coursier.core.Resolution] = None, - coursierCacheCustomizer: Option[coursier.cache.FileCache[Task] => coursier.cache.FileCache[Task]] = 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( @@ -544,8 +544,8 @@ object Jvm { force, mapDependencies, customizer, - coursierCacheCustomizer, - ctx + ctx, + coursierCacheCustomizer ) val errs = resolution.errors @@ -616,8 +616,8 @@ object Jvm { force: IterableOnce[coursier.Dependency], mapDependencies: Option[Dependency => Dependency] = None, customizer: Option[coursier.core.Resolution => coursier.core.Resolution] = None, - coursierCacheCustomizer: Option[coursier.cache.FileCache[Task] => coursier.cache.FileCache[Task]] = 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 @@ -789,8 +789,8 @@ object Jvm { sources = sources, mapDependencies = mapDependencies, customizer = customizer, - coursierCacheCustomizer = None, - ctx = ctx + ctx = ctx, + coursierCacheCustomizer = None ) @deprecated( @@ -811,8 +811,8 @@ object Jvm { force = force, mapDependencies = mapDependencies, customizer = customizer, - coursierCacheCustomizer = None, - ctx = ctx + ctx = ctx, + coursierCacheCustomizer = None ) @deprecated( @@ -834,8 +834,8 @@ object Jvm { sources = sources, mapDependencies = mapDependencies, customizer = None, - coursierCacheCustomizer = None, - ctx = ctx + ctx = ctx, + coursierCacheCustomizer = None ) @deprecated( @@ -855,8 +855,8 @@ object Jvm { force = force, mapDependencies = mapDependencies, customizer = None, - coursierCacheCustomizer = None, - ctx = ctx + ctx = ctx, + coursierCacheCustomizer = None ) } diff --git a/scalalib/src/Lib.scala b/scalalib/src/Lib.scala index 4ce49604e8e..739638b6b49 100644 --- a/scalalib/src/Lib.scala +++ b/scalalib/src/Lib.scala @@ -30,8 +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, coursierCacheCustomizer: Option[coursier.cache.FileCache[Task] => coursier.cache.FileCache[Task]] = None, - ctx: Option[Ctx.Log] = None ): (Seq[Dependency], Resolution) = { val depSeq = deps.iterator.toSeq mill.modules.Jvm.resolveDependenciesMetadata( @@ -40,8 +40,8 @@ object Lib { force = depSeq.filter(_.force).map(depToDependency), mapDependencies = mapDependencies, customizer = customizer, - coursierCacheCustomizer = coursierCacheCustomizer, - ctx = ctx + ctx = ctx, + coursierCacheCustomizer = coursierCacheCustomizer ) } @@ -59,8 +59,8 @@ object Lib { sources: Boolean = false, mapDependencies: Option[Dependency => Dependency] = None, customizer: Option[coursier.core.Resolution => coursier.core.Resolution] = None, - coursierCacheCustomizer: Option[coursier.cache.FileCache[Task] => coursier.cache.FileCache[Task]] = 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( @@ -70,8 +70,8 @@ object Lib { sources = sources, mapDependencies = mapDependencies, customizer = customizer, - coursierCacheCustomizer = coursierCacheCustomizer, - ctx = ctx + ctx = ctx, + coursierCacheCustomizer = coursierCacheCustomizer ) } @@ -143,8 +143,8 @@ object Lib { deps = deps, mapDependencies = mapDependencies, customizer = customizer, - coursierCacheCustomizer = None, - ctx = ctx + ctx = ctx, + coursierCacheCustomizer = None ) @deprecated( @@ -167,8 +167,8 @@ object Lib { sources = sources, mapDependencies = mapDependencies, customizer = customizer, - coursierCacheCustomizer = None, - ctx = ctx + ctx = ctx, + coursierCacheCustomizer = None ) @deprecated( @@ -188,8 +188,8 @@ object Lib { deps = deps, mapDependencies = mapDependencies, customizer = None, - coursierCacheCustomizer = None, - ctx = ctx + ctx = ctx, + coursierCacheCustomizer = None ) @deprecated( @@ -211,8 +211,8 @@ object Lib { sources = sources, mapDependencies = mapDependencies, customizer = None, - coursierCacheCustomizer = None, - ctx = ctx + ctx = ctx, + coursierCacheCustomizer = None ) def findSourceFiles(sources: Seq[PathRef], extensions: Seq[String]): Seq[os.Path] = {