diff options
| -rw-r--r-- | scalalib/src/Dependency.scala | 10 | ||||
| -rw-r--r-- | scalalib/src/dependency/DependencyUpdatesImpl.scala | 15 | ||||
| -rw-r--r-- | scalalib/src/dependency/versions/VersionsFinder.scala | 8 |
3 files changed, 17 insertions, 16 deletions
diff --git a/scalalib/src/Dependency.scala b/scalalib/src/Dependency.scala index 0c589663..4fc512ff 100644 --- a/scalalib/src/Dependency.scala +++ b/scalalib/src/Dependency.scala @@ -10,10 +10,12 @@ object Dependency extends ExternalModule { def updates(ev: Evaluator, allowPreRelease: Boolean = false) = T.command { - DependencyUpdatesImpl(implicitly, - ev.rootModule, - ev.rootModule.millDiscover, - allowPreRelease) + DependencyUpdatesImpl( + ev, + implicitly, + ev.rootModule, + ev.rootModule.millDiscover, + allowPreRelease) } implicit def millScoptEvaluatorReads[T]: EvaluatorScopt[T] = diff --git a/scalalib/src/dependency/DependencyUpdatesImpl.scala b/scalalib/src/dependency/DependencyUpdatesImpl.scala index 3bb94202..c75ea583 100644 --- a/scalalib/src/dependency/DependencyUpdatesImpl.scala +++ b/scalalib/src/dependency/DependencyUpdatesImpl.scala @@ -1,23 +1,22 @@ package mill.scalalib.dependency import mill.define._ -import mill.scalalib.dependency.updates.{ - DependencyUpdates, - ModuleDependenciesUpdates, - UpdatesFinder -} -import mill.scalalib.dependency.versions.VersionsFinder +import mill.eval.Evaluator +import mill.scalalib.dependency.updates.{DependencyUpdates, ModuleDependenciesUpdates, UpdatesFinder} +import mill.scalalib.dependency.versions.{ModuleDependenciesVersions, VersionsFinder} import mill.api.Ctx.{Home, Log} object DependencyUpdatesImpl { - def apply(ctx: Log with Home, + def apply(evaluator: Evaluator, + ctx: Log with Home, rootModule: BaseModule, discover: Discover[_], allowPreRelease: Boolean): Unit = { // 1. Find all available versions for each dependency - val allDependencyVersions = VersionsFinder.findVersions(ctx, rootModule) + val allDependencyVersions: Seq[ModuleDependenciesVersions] = + VersionsFinder.findVersions(evaluator, ctx, rootModule) // 2. Extract updated versions from all available versions val allUpdates = allDependencyVersions.map { dependencyVersions => diff --git a/scalalib/src/dependency/versions/VersionsFinder.scala b/scalalib/src/dependency/versions/VersionsFinder.scala index a9ecc763..00bff7ac 100644 --- a/scalalib/src/dependency/versions/VersionsFinder.scala +++ b/scalalib/src/dependency/versions/VersionsFinder.scala @@ -9,10 +9,10 @@ import mill.api.{Loose, Strict} private[dependency] object VersionsFinder { - def findVersions(ctx: Log with Home, - rootModule: BaseModule): Seq[ModuleDependenciesVersions] = { - val evaluator = - new Evaluator(ctx.home, os.pwd / 'out, os.pwd / 'out, rootModule, ctx.log) + def findVersions( + evaluator: Evaluator, + ctx: Log with Home, + rootModule: BaseModule): Seq[ModuleDependenciesVersions] = { val javaModules = rootModule.millInternal.modules.collect { case javaModule: JavaModule => javaModule |