From d304a95b241a323c14a5111fbd46c9ac7f642e2f Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Wed, 4 May 2016 22:49:03 -0400
Subject: [PATCH] Bump dependencies

---
 .gitignore                                                | 2 ++
 .../ivyint/CachedResolutionResolveEngine.scala            | 4 ++--
 .../src/test/scala/BaseIvySpecification.scala             | 2 +-
 project/Dependencies.scala                                | 8 ++++----
 4 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..3cedeeb25
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+tmp/
+target/
diff --git a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala
index c566fea30..6f4a69065 100644
--- a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala
+++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala
@@ -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)
diff --git a/librarymanagement/src/test/scala/BaseIvySpecification.scala b/librarymanagement/src/test/scala/BaseIvySpecification.scala
index 260ac3517..4a1f4e6ab 100644
--- a/librarymanagement/src/test/scala/BaseIvySpecification.scala
+++ b/librarymanagement/src/test/scala/BaseIvySpecification.scala
@@ -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
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 12d73358b..9d523d920 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -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"