luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added comments

This commit is contained in:
Eugene Yokota 2014-10-28 22:31:20 -04:00
parent 55fc4a29c1
commit 6052cd65b4
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ivy/src/main/scala/sbt/ivyint/CachedResolutionResolveEngine.scala
View File

@ -330,6 +330,17 @@ private[sbt] trait CachedResolutionResolveEngine extends ResolveEngine {
survivor ++ evicted ++ (merged filter { m => m.evicted || m.problem.isDefined }) survivor ++ evicted ++ (merged filter { m => m.evicted || m.problem.isDefined })
} }
} }
/**
* resolves dependency resolution conflicts in which multiple candidates are found for organization+name combos.
* The main input is conflicts, which is a Vector of ModuleReport, which contains full info on the modulerevision, including its callers.
* Conflict resolution could be expensive, so this is first cached to `cachedResolutionResolveCache` if the conflict is between 2 modules.
* Otherwise, the default "latest" resolution takes the following precedence:
* 1. overrides passed in to `os`.
* 2. diretly forced dependency within the artificial module.
* 3. latest revision.
* Note transitively forced dependencies are not respected. This seems to be the case for stock Ivy's behavior as well,
* which may be because Ivy makes all Maven dependencies as forced="true".
*/
def resolveConflict(rootModuleConf: String, conflicts: Vector[ModuleReport], os: Vector[IvyOverride], log: Logger): (Vector[ModuleReport], Vector[ModuleReport]) = def resolveConflict(rootModuleConf: String, conflicts: Vector[ModuleReport], os: Vector[IvyOverride], log: Logger): (Vector[ModuleReport], Vector[ModuleReport]) =
{ {
import org.apache.ivy.plugins.conflict.{ NoConflictManager, StrictConflictManager, LatestConflictManager } import org.apache.ivy.plugins.conflict.{ NoConflictManager, StrictConflictManager, LatestConflictManager }