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

some more minor changes

This commit is contained in:
Eugene Yokota 2014-09-30 18:19:46 -04:00
parent 024a99ed07
commit e58a236c9e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ivy/src/main/scala/sbt/Ivy.scala
View File

@ -273,6 +273,8 @@ private[sbt] object IvySbt {
val mainChain = makeChain("Default", "sbt-chain", resolvers)
settings.setDefaultResolver(mainChain.getName)
}
private[sbt] def isChanging(dd: DependencyDescriptor): Boolean =
dd.isChanging || isChanging(dd.getDependencyRevisionId)
private[sbt] def isChanging(module: ModuleID): Boolean =
module.revision endsWith "-SNAPSHOT"
private[sbt] def isChanging(mrid: ModuleRevisionId): Boolean =

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

@ -22,7 +22,7 @@ private[sbt] object CachedResolutionResolveCache {
def sbtOrgTemp = "org.scala-sbt.temp"
}
class CachedResolutionResolveCache() {
private[sbt] class CachedResolutionResolveCache() {
import CachedResolutionResolveCache._
val updateReportCache: concurrent.Map[ModuleRevisionId, Either[ResolveException, UpdateReport]] = concurrent.TrieMap()
val resolveReportCache: concurrent.Map[ModuleRevisionId, ResolveReport] = concurrent.TrieMap()
@ -57,8 +57,6 @@ class CachedResolutionResolveCache() {
val rootModuleConfigs = md0.getConfigurations.toVector
expanded map { buildArtificialModuleDescriptor(_, rootModuleConfigs, prOpt) }
}
def isDependencyChanging(dd: DependencyDescriptor): Boolean =
dd.isChanging || IvySbt.isChanging(dd.getDependencyRevisionId)
def buildArtificialModuleDescriptor(dd: DependencyDescriptor, rootModuleConfigs: Vector[IvyConfiguration], prOpt: Option[ProjectResolver]): (DefaultModuleDescriptor, Boolean) =
{
val mrid = dd.getDependencyRevisionId
@ -74,7 +72,7 @@ class CachedResolutionResolveCache() {
conf <- rootModuleConfigs
} yield md1.addConfiguration(conf)
md1.addDependency(dd)
(md1, isDependencyChanging(dd))
(md1, IvySbt.isChanging(dd))
}
def getOrElseUpdateMiniGraph(md: ModuleDescriptor, changing0: Boolean, logicalClock: LogicalClock, miniGraphPath: File, cachedDescriptor: File, log: Logger)(f: => Either[ResolveException, UpdateReport]): Either[ResolveException, UpdateReport] =
{