Address Eugene's feedback

This commit is contained in:
jvican 2017-05-03 16:14:02 +02:00
parent e7b8cbfe01
commit 1252db6b4a
No known key found for this signature in database
GPG Key ID: 42DAFA0F112E8050
4 changed files with 13 additions and 14 deletions

View File

@ -2119,7 +2119,7 @@ object Classpaths {
else (evictionWarningOptions in update).value
}
DependencyResolver.cachedUpdate(
LibraryManagement.cachedUpdate(
s.cacheStoreFactory.sub(updateCacheName.value),
Reference.display(thisProjectRef.value),
ivyModule.value,

View File

@ -1,11 +1,12 @@
package sbt.internal.librarymanagement
package sbt.internal
import sbt.internal.util.{ HList, HNil }
import sbt.internal.librarymanagement._
import sbt.internal.util.Types._
import sbt.internal.util.{ HList, HNil }
import sbt.io.{ Hash, IO }
import sbt.librarymanagement._
import sbt.util._
import sbt.util.CacheImplicits._
import sbt.util._
import sjsonnew.JsonFormat
object AltLibraryManagementCodec extends LibraryManagementCodec {

View File

@ -1,15 +1,16 @@
package sbt.internal.librarymanagement
package sbt.internal
import java.io.File
import sbt.internal.util.Types._
import sbt.internal.librarymanagement._
import sbt.internal.util.HNil
import sbt.internal.util.Types._
import sbt.librarymanagement._
import sbt.util.{ CacheStore, CacheStoreFactory, Logger, Tracked }
import sbt.librarymanagement.syntax._
import sbt.util.CacheImplicits._
import sbt.util.{ CacheStore, CacheStoreFactory, Logger, Tracked }
object DependencyResolver {
object LibraryManagement {
private type UpdateInputs = IvyConfiguration :+: ModuleSettings :+: UpdateConfiguration :+: HNil
@ -90,16 +91,13 @@ object DependencyResolver {
val culprit = t.getClass.getSimpleName
log.warn(s"Update task caching failed due to $culprit.")
log.warn("Report the following output to sbt:")
resolvedAgain.toString.lines foreach {
log.warn(_)
}
resolvedAgain.toString.lines.foreach(log.warn(_))
log.trace(t)
resolvedAgain
}
.apply(cachedResolve(updateInputs))
}
import sbt.internal.librarymanagement.AltLibraryManagementCodec._
import AltLibraryManagementCodec._
Tracked.inputChanged(cacheStoreFactory.make("inputs"))(doCachedResolve)
}

View File

@ -22,7 +22,7 @@ TaskKey[Unit]("check") := {
type In = IvyConfiguration :+: ModuleSettings :+: UpdateConfiguration :+: HNil
import sbt.util.CacheImplicits._
import sbt.internal.librarymanagement.AltLibraryManagementCodec._
import sbt.internal.AltLibraryManagementCodec._
val f: In => Unit =
Tracked.inputChanged(cacheStoreFactory make "inputs") { (inChanged: Boolean, in: In) =>