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

Bump dependencies

This commit is contained in:
Eugene Yokota 2016-05-04 22:49:03 -04:00
parent 27bf18f7a3
commit d304a95b24
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
tmp/
target/

4
librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala
View File

@ -137,7 +137,7 @@ private[sbt] class CachedResolutionResolveCache() {
}
def getOrElseUpdateMiniGraph(md: ModuleDescriptor, changing0: Boolean, logicalClock: LogicalClock, miniGraphPath: File, cachedDescriptor: File, log: Logger)(f: => Either[ResolveException, UpdateReport]): Either[ResolveException, UpdateReport] =
{
import Path._
import sbt.io.syntax._
val mrid = md.getResolvedModuleRevisionId
val (pathOrg, pathName, pathRevision) = md match {
case x: ArtificialModuleDescriptor =>
@ -288,7 +288,7 @@ private[sbt] trait CachedResolutionResolveEngine extends ResolveEngine {
*/
def customResolve(md0: ModuleDescriptor, missingOk: Boolean, logicalClock: LogicalClock, options0: ResolveOptions, depDir: File, log: Logger): Either[ResolveException, UpdateReport] =
cachedResolutionResolveCache.getOrElseUpdateProjectReport(md0.getModuleRevisionId, logicalClock) {
import Path._
import sbt.io.syntax._
val start = System.currentTimeMillis
val miniGraphPath = depDir / "module"
val cachedDescriptor = getSettings.getResolutionCacheManager.getResolvedIvyFileInCache(md0.getModuleRevisionId)

2
librarymanagement/src/test/scala/BaseIvySpecification.scala
View File

@ -1,7 +1,7 @@
package sbt.internal.librarymanagement
import sbt.io.Path._
import sbt.io.IO
import sbt.io.syntax._
import java.io.File
import cross.CrossVersionUtil
import sbt.util.Logger

8
project/Dependencies.scala
View File

@ -3,17 +3,17 @@ import Keys._
object Dependencies {
lazy val scala210 = "2.10.6"
lazy val scala211 = "2.11.7"
lazy val scala211 = "2.11.8"
val ioVersion = "1.0.0-M3"
val utilVersion = "0.1.0-M8"
val ioVersion = "1.0.0-M5"
val utilVersion = "0.1.0-M12"
lazy val sbtIO = "org.scala-sbt" %% "io" % ioVersion
lazy val utilCollection = "org.scala-sbt" %% "util-collection" % utilVersion
lazy val utilLogging = "org.scala-sbt" %% "util-logging" % utilVersion
lazy val utilTesting = "org.scala-sbt" %% "util-testing" % utilVersion
lazy val utilCompletion = "org.scala-sbt" %% "util-completion" % utilVersion
lazy val launcherInterface = "org.scala-sbt" % "launcher-interface" % "1.0.0-M1"
lazy val launcherInterface = "org.scala-sbt" % "launcher-interface" % "1.0.0"
lazy val ivy = "org.scala-sbt.ivy" % "ivy" % "2.3.0-sbt-2cc8d2761242b072cedb0a04cb39435c4fa24f9a"
lazy val jsch = "com.jcraft" % "jsch" % "0.1.46" intransitive ()
lazy val sbtSerialization = "org.scala-sbt" %% "serialization" % "0.1.2"