From 81642138e18a4f045440545adc06e41f8edfc7c5 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Thu, 13 Apr 2017 00:22:12 -0400
Subject: [PATCH] Bump to ZInc 1.0.0-X12

---
 main/src/main/scala/sbt/Defaults.scala | 4 +---
 project/Dependencies.scala             | 8 ++++----
 sbt/src/main/scala/package.scala       | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index d262342ca..0f7bcc27f 100755
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -15,8 +15,6 @@ import sbt.internal.CommandStrings.ExportStream
 import sbt.internal.io.WatchState
 import sbt.internal.librarymanagement._
 import sbt.internal.librarymanagement.mavenint.{ PomExtraDependencyAttributes, SbtPomExtraProperties }
-import sbt.internal.librarymanagement.syntax._
-import sbt.internal.librarymanagement.{ CustomPomParser, DependencyFilter }
 import sbt.internal.testing.TestLogger
 import sbt.internal.util._
 import sbt.internal.util.Attributed.data
@@ -29,7 +27,7 @@ import sbt.librarymanagement.Artifact.{ DocClassifier, SourceClassifier }
 import sbt.librarymanagement.Configurations.{ Compile, CompilerPlugin, IntegrationTest, names, Provided, Runtime, Test }
 import sbt.librarymanagement.CrossVersion.{ binarySbtVersion, binaryScalaVersion, partialVersion }
 import sbt.librarymanagement.{ `package` => _, _ }
-import sbt.librarymanagement.{ Configuration, Configurations, ConflictManager, CrossVersion, MavenRepository, Resolver, ScalaArtifacts, UpdateOptions }
+import sbt.librarymanagement.syntax._
 import sbt.util.InterfaceUtil.{ f1, o2m }
 import sbt.util.{ Level, Logger, ShowLines }
 import scala.concurrent.duration.FiniteDuration
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 36a961ec7..ff96df9fc 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -11,10 +11,10 @@ object Dependencies {
   val baseScalaVersion = scala212
 
   // sbt modules
-  private val ioVersion = "1.0.0-M9"
-  private val utilVersion = "1.0.0-M21"
-  private val lmVersion = "1.0.0-X7"
-  private val zincVersion = "1.0.0-X11"
+  private val ioVersion = "1.0.0-M11"
+  private val utilVersion = "1.0.0-M22"
+  private val lmVersion = "1.0.0-X8"
+  private val zincVersion = "1.0.0-X12"
 
   private val sbtIO = "org.scala-sbt" %% "io" % ioVersion
 
diff --git a/sbt/src/main/scala/package.scala b/sbt/src/main/scala/package.scala
index 976bcbae9..c01d390e5 100644
--- a/sbt/src/main/scala/package.scala
+++ b/sbt/src/main/scala/package.scala
@@ -6,7 +6,7 @@ package object sbt extends sbt.IOSyntax0
     with sbt.internal.util.Types
     with sbt.internal.librarymanagement.impl.DependencyBuilders
     with sbt.ProjectExtra
-    with sbt.internal.librarymanagement.DependencyFilterExtra
+    with sbt.librarymanagement.DependencyFilterExtra
     with sbt.BuildExtra
     with sbt.TaskMacroExtra
     with sbt.ScopeFilter.Make