diff --git a/build.sbt b/build.sbt
index 9e211758b..f2d68877a 100644
--- a/build.sbt
+++ b/build.sbt
@@ -14,6 +14,7 @@ def commonSettings: Seq[Setting[_]] = Seq(
   testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-w", "1"),
   javacOptions in compile ++= Seq("-target", "6", "-source", "6", "-Xlint", "-Xlint:-serial"),
   crossScalaVersions := Seq(scala210, scala211),
+  scalacOptions -= "-Yinline-warnings",
   scalacOptions ++= Seq(
     "-encoding", "utf8",
     "-deprecation",
@@ -23,7 +24,7 @@ def commonSettings: Seq[Setting[_]] = Seq(
     "-language:higherKinds",
     "-language:implicitConversions",
     // "-Xfuture",
-    "-Yinline-warnings",
+    // "-Yinline-warnings",
     // "-Yfatal-warnings",
     "-Yno-adapted-args",
     "-Ywarn-dead-code",
diff --git a/internal/util-cache/src/main/scala/sbt/internal/util/SeparatedCache.scala b/internal/util-cache/src/main/scala/sbt/internal/util/SeparatedCache.scala
index a68e46083..379cdbff7 100644
--- a/internal/util-cache/src/main/scala/sbt/internal/util/SeparatedCache.scala
+++ b/internal/util-cache/src/main/scala/sbt/internal/util/SeparatedCache.scala
@@ -7,7 +7,7 @@ import Types.:+:
 import sbinary.{ DefaultProtocol, Format, Input, Output => Out }
 import DefaultProtocol.ByteFormat
 import java.io.{ File, InputStream, OutputStream }
-import sbt.internal.io.Using
+import sbt.io.Using
 
 trait InputCache[I] {
   type Internal
diff --git a/internal/util-collection/src/test/scala/DagSpecification.scala b/internal/util-collection/src/test/scala/DagSpecification.scala
index 9e5025488..3b3614e39 100644
--- a/internal/util-collection/src/test/scala/DagSpecification.scala
+++ b/internal/util-collection/src/test/scala/DagSpecification.scala
@@ -19,8 +19,11 @@ object DagSpecification extends Properties("Dag") {
       val nodes = new HashSet[TestDag]
       def nonterminalGen(p: Gen.Parameters): Gen[TestDag] =
         {
-          for (i <- 0 until nodeCount; nextDeps <- Gen.someOf(nodes).apply(p))
-            nodes += new TestDag(i, nextDeps)
+          val seed = rng.Seed.random()
+          for {
+            i <- 0 until nodeCount
+            nextDeps <- Gen.someOf(nodes).apply(p, seed)
+          } nodes += new TestDag(i, nextDeps)
           for (nextDeps <- Gen.someOf(nodes)) yield new TestDag(nodeCount, nextDeps)
         }
       Gen.parameterized(nonterminalGen)
@@ -47,4 +50,4 @@ object DagSpecification extends Properties("Dag") {
 }
 class TestDag(id: Int, val dependencies: Iterable[TestDag]) extends Dag[TestDag] {
   override def toString = id + "->" + dependencies.mkString("[", ",", "]")
-}
\ No newline at end of file
+}
diff --git a/internal/util-scripted/src/main/scala/sbt/internal/scripted/FileCommands.scala b/internal/util-scripted/src/main/scala/sbt/internal/scripted/FileCommands.scala
index ea5fc7559..65b5af423 100644
--- a/internal/util-scripted/src/main/scala/sbt/internal/scripted/FileCommands.scala
+++ b/internal/util-scripted/src/main/scala/sbt/internal/scripted/FileCommands.scala
@@ -7,6 +7,7 @@ package scripted
 
 import java.io.File
 import sbt.io.{ IO, Path }
+import sbt.io.syntax._
 import Path._
 
 class FileCommands(baseDirectory: File) extends BasicStatementHandler {
diff --git a/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptedTests.scala b/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptedTests.scala
index c008f92ba..9575f2f6c 100644
--- a/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptedTests.scala
+++ b/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptedTests.scala
@@ -7,6 +7,7 @@ import sbt.util.Logger
 import sbt.internal.util.{ ConsoleLogger, BufferedLogger, FullLogger }
 import sbt.io.IO.wrapNull
 import sbt.io.{ DirectoryFilter, HiddenFileFilter, Path, GlobFilter }
+import sbt.io.syntax._
 import sbt.internal.io.Resources
 
 object ScriptedRunnerImpl {
diff --git a/internal/util-tracking/src/main/scala/sbt/internal/util/Tracked.scala b/internal/util-tracking/src/main/scala/sbt/internal/util/Tracked.scala
index e8d3be591..28ee9c21e 100644
--- a/internal/util-tracking/src/main/scala/sbt/internal/util/Tracked.scala
+++ b/internal/util-tracking/src/main/scala/sbt/internal/util/Tracked.scala
@@ -11,7 +11,8 @@ import scala.reflect.Manifest
 import scala.collection.mutable
 import sbt.io.IO.{ delete, read, write }
 import sbt.io.{ IO, Path }
-import sbt.internal.io.Using
+import sbt.io.Using
+import sbt.io.syntax._
 import sbt.serialization._
 
 object Tracked {
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 71ae6af5f..05e9584db 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -3,9 +3,10 @@ import Keys._
 
 object Dependencies {
   lazy val scala210 = "2.10.6"
-  lazy val scala211 = "2.11.7"
+  lazy val scala211 = "2.11.8"
+  lazy val scala212 = "2.12.0-M4"
 
-  lazy val sbtIO = "org.scala-sbt" %% "io" % "1.0.0-M3"
+  lazy val sbtIO = "org.scala-sbt" %% "io" % "1.0.0-M5"
   lazy val jline = "jline" % "jline" % "2.13"
   lazy val sbtSerialization = "org.scala-sbt" %% "serialization" % "0.1.2"
   lazy val sbinary = "org.scala-sbt" %% "sbinary" % "0.4.3"
@@ -21,10 +22,10 @@ object Dependencies {
       }
     }
 
-  lazy val scalaXml = scala211Module("scala-xml", "1.0.1")
+  lazy val scalaXml = scala211Module("scala-xml", "1.0.5")
 
-  lazy val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.12.4"
-  lazy val scalatest = "org.scalatest" %% "scalatest" % "2.2.4"
+  val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.13.1"
+  val scalatest = "org.scalatest" %% "scalatest" % "2.2.6"
 
   lazy val parserCombinator211 = "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.4"
 }