From e58a236c9ea5f1fe00a9a4050535228d1f803c8e Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Tue, 30 Sep 2014 18:19:46 -0400
Subject: [PATCH] some more minor changes

---
 ivy/src/main/scala/sbt/Ivy.scala                            | 2 ++
 .../scala/sbt/ivyint/CachedResolutionResolveEngine.scala    | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ivy/src/main/scala/sbt/Ivy.scala b/ivy/src/main/scala/sbt/Ivy.scala
index 2ea187a23..4bf6ffad6 100644
--- a/ivy/src/main/scala/sbt/Ivy.scala
+++ b/ivy/src/main/scala/sbt/Ivy.scala
@@ -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 =
diff --git a/ivy/src/main/scala/sbt/ivyint/CachedResolutionResolveEngine.scala b/ivy/src/main/scala/sbt/ivyint/CachedResolutionResolveEngine.scala
index e2c71a877..4b6cd3e9e 100644
--- a/ivy/src/main/scala/sbt/ivyint/CachedResolutionResolveEngine.scala
+++ b/ivy/src/main/scala/sbt/ivyint/CachedResolutionResolveEngine.scala
@@ -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] =
     {