diff --git a/core/shared/src/main/scala/coursier/package.scala b/core/shared/src/main/scala/coursier/package.scala index c8d5ee792..20a477f03 100644 --- a/core/shared/src/main/scala/coursier/package.scala +++ b/core/shared/src/main/scala/coursier/package.scala @@ -54,6 +54,7 @@ package object coursier { type ModuleVersion = (core.Module, String) + type ProjectCache = Map[ModuleVersion, (Artifact.Source, Project)] type Repository = core.Repository val Repository = core.Repository @@ -69,7 +70,7 @@ package object coursier { dependencies: Set[Dependency] = Set.empty, forceVersions: Map[Module, String] = Map.empty, conflicts: Set[Dependency] = Set.empty, - projectCache: Map[ModuleVersion, (Artifact.Source, Project)] = Map.empty, + projectCache: ProjectCache = Map.empty, errorCache: Map[ModuleVersion, Seq[String]] = Map.empty, finalDependencies: Map[Dependency, Seq[Dependency]] = Map.empty, filter: Option[Dependency => Boolean] = None, diff --git a/sbt-coursier/src/main/scala-2.10/coursier/CoursierPlugin.scala b/sbt-coursier/src/main/scala-2.10/coursier/CoursierPlugin.scala index fe47affd9..6a53a3428 100644 --- a/sbt-coursier/src/main/scala-2.10/coursier/CoursierPlugin.scala +++ b/sbt-coursier/src/main/scala-2.10/coursier/CoursierPlugin.scala @@ -32,6 +32,7 @@ object CoursierPlugin extends AutoPlugin { val coursierConfigurations = Keys.coursierConfigurations + val coursierParentProjectCache = Keys.coursierParentProjectCache val coursierResolution = Keys.coursierResolution val coursierSbtClassifiersResolution = Keys.coursierSbtClassifiersResolution @@ -118,6 +119,7 @@ object CoursierPlugin extends AutoPlugin { coursierPublications <<= Tasks.coursierPublicationsTask(packageConfigs: _*), coursierSbtClassifiersModule <<= classifiersModule in updateSbtClassifiers, coursierConfigurations <<= Tasks.coursierConfigurationsTask(None), + coursierParentProjectCache <<= Tasks.parentProjectCacheTask, coursierResolution <<= Tasks.resolutionTask(), coursierSbtClassifiersResolution <<= Tasks.resolutionTask( sbtClassifiers = true diff --git a/sbt-coursier/src/main/scala-2.10/coursier/Keys.scala b/sbt-coursier/src/main/scala-2.10/coursier/Keys.scala index 155ff3b1f..27a4ecb1d 100644 --- a/sbt-coursier/src/main/scala-2.10/coursier/Keys.scala +++ b/sbt-coursier/src/main/scala-2.10/coursier/Keys.scala @@ -40,6 +40,8 @@ object Keys { val coursierConfigurations = TaskKey[Map[String, Set[String]]]("coursier-configurations") + + val coursierParentProjectCache = TaskKey[Map[Seq[Resolver], Seq[ProjectCache]]]("coursier-parent-project-cache") val coursierResolution = TaskKey[Resolution]("coursier-resolution") val coursierSbtClassifiersResolution = TaskKey[Resolution]("coursier-sbt-classifiers-resolution") diff --git a/sbt-coursier/src/main/scala-2.10/coursier/Tasks.scala b/sbt-coursier/src/main/scala-2.10/coursier/Tasks.scala index 8c6d7ea0c..2bcc8f694 100644 --- a/sbt-coursier/src/main/scala-2.10/coursier/Tasks.scala +++ b/sbt-coursier/src/main/scala-2.10/coursier/Tasks.scala @@ -1,27 +1,25 @@ package coursier -import java.io.{ File, InputStream, OutputStreamWriter } +import java.io.{File, InputStream, OutputStreamWriter} import java.net.URL -import java.util.concurrent.{ ExecutorService, Executors } +import java.util.concurrent.{ExecutorService, Executors} -import coursier.core.{ Authentication, Publication } -import coursier.ivy.{ IvyRepository, PropertiesPattern } +import coursier.core.{Authentication, Publication} +import coursier.ivy.{IvyRepository, PropertiesPattern} import coursier.Keys._ import coursier.Structure._ import coursier.internal.FileUtil -import coursier.util.{ Config, Print } +import coursier.util.{Config, Print} import org.apache.ivy.core.module.id.ModuleRevisionId - -import sbt.{ UpdateReport, Classpaths, Resolver, Def } +import sbt.{ClasspathDep, Classpaths, Def, ProjectRef, Resolver, UpdateReport} import sbt.Keys._ import scala.collection.mutable import scala.collection.JavaConverters._ import scala.collection.mutable.ArrayBuffer import scala.util.Try - -import scalaz.{ \/-, -\/ } -import scalaz.concurrent.{ Task, Strategy } +import scalaz.{-\/, \/-} +import scalaz.concurrent.{Strategy, Task} object Tasks { @@ -317,6 +315,28 @@ object Tasks { } } + def parentProjectCacheTask: Def.Initialize[sbt.Task[Map[Seq[sbt.Resolver],Seq[coursier.ProjectCache]]]] = + (sbt.Keys.state, + sbt.Keys.thisProjectRef).flatMap{ (state, projectRef) => + + val projectDeps = structure(state).allProjects + .find(_.id == projectRef.project) + .map(_.dependencies.map(_.project.project).toSet) + .getOrElse(Set.empty) + + val projects = structure(state).allProjectRefs.filter(p => projectDeps(p.project)) + + coursierRecursiveResolvers.forAllProjects(state, projects).flatMap{ m => + coursierResolution.forAllProjects(state, m.keys.toSeq).map{ n => + n.foldLeft(Map.empty[Seq[Resolver], Seq[ProjectCache]]){ case (caches, (ref, resolution)) => + m.get(ref).fold(caches)(resolvers => + caches.updated(resolvers, resolution.projectCache +: caches.getOrElse(resolvers, Seq.empty))) + } + } + } + } + + def resolutionTask( sbtClassifiers: Boolean = false ) = Def.task { @@ -400,6 +420,11 @@ object Tasks { else coursierRecursiveResolvers.value.distinct + val parentProjectCache: ProjectCache = coursierParentProjectCache.value + .get(resolvers) + .map(_.foldLeft[ProjectCache](Map.empty)(_ ++ _)) + .getOrElse(Map.empty) + // TODO Warn about possible duplicated modules from source repositories? val verbosityLevel = coursierVerbosity.value @@ -421,7 +446,8 @@ object Tasks { // order matters here userForceVersions ++ forcedScalaModules(so, sv) ++ - interProjectDependencies.map(_.moduleVersion) + interProjectDependencies.map(_.moduleVersion), + projectCache = parentProjectCache ) if (verbosityLevel >= 2) {