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

move dependency mapping to IvySbt#Module

This commit is contained in:
Mark Harrah 2011-07-06 07:30:47 -04:00
parent 179a2a31c8
commit aebde6b3e6
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ivy/Ivy.scala
View File

@ -108,6 +108,11 @@ final class IvySbt(val configuration: IvyConfiguration)
withIvy[T](log) { ivy => f(ivy, moduleDescriptor0, defaultConfig0) } withIvy[T](log) { ivy => f(ivy, moduleDescriptor0, defaultConfig0) }
def moduleDescriptor(log: Logger): DefaultModuleDescriptor = withModule(log)((_,md,_) => md) def moduleDescriptor(log: Logger): DefaultModuleDescriptor = withModule(log)((_,md,_) => md)
def dependencyMapping(log: Logger): (ModuleRevisionId, ModuleDescriptor) =
{
val md = moduleDescriptor(log)
(md.getModuleRevisionId, md)
}
def defaultConfig(log: Logger): String = withModule(log)( (_,_,dc) => dc) def defaultConfig(log: Logger): String = withModule(log)( (_,_,dc) => dc)
// these should only be referenced by withModule because lazy vals synchronize on this object // these should only be referenced by withModule because lazy vals synchronize on this object
// withIvy explicitly locks the IvySbt object, so they have to be done in the right order to avoid deadlock // withIvy explicitly locks the IvySbt object, so they have to be done in the right order to avoid deadlock

5
main/Defaults.scala
View File

@ -747,10 +747,7 @@ object Classpaths
def depMap(projects: Seq[(ProjectRef,ResolvedProject)], data: Settings[Scope], log: Logger): Task[Map[ModuleRevisionId, ModuleDescriptor]] = def depMap(projects: Seq[(ProjectRef,ResolvedProject)], data: Settings[Scope], log: Logger): Task[Map[ModuleRevisionId, ModuleDescriptor]] =
projects.flatMap { case (p,_) => ivyModule in p get data }.join.map { mods => projects.flatMap { case (p,_) => ivyModule in p get data }.join.map { mods =>
(mods.map{ mod => mods map { _.dependencyMapping(log) } toMap ;
val md = mod.moduleDescriptor(log)
(md.getModuleRevisionId, md)
}).toMap
} }
def projectResolverTask: Initialize[Task[Resolver]] = def projectResolverTask: Initialize[Task[Resolver]] =