From 5f9e6e4aad975f4254444a643d19c019e32f22f2 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Wed, 11 May 2016 16:06:44 -0400
Subject: [PATCH 1/2] Don't use test artifacts from other projects

Fixes #2597
---
 build.sbt                               |  3 ++-
 project/Dependencies.scala              |  8 ++++----
 run/src/test/scala/sbt/ForkTest.scala   |  2 +-
 run/src/test/scala/sbt/TestLogger.scala | 14 ++++++++++++++
 4 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 run/src/test/scala/sbt/TestLogger.scala

diff --git a/build.sbt b/build.sbt
index 8b0c9ce2a..8816e810c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -47,6 +47,7 @@ def commonSettings: Seq[Setting[_]] = Seq[SettingsDefinition](
   bintrayPackage := (bintrayPackage in ThisBuild).value,
   bintrayRepository := (bintrayRepository in ThisBuild).value,
   mimaDefaultSettings,
+  publishArtifact in Test := false,
   previousArtifact := None, // Some(organization.value % moduleName.value % "1.0.0"),
   binaryIssueFilters ++= Seq(
   )
@@ -142,7 +143,7 @@ lazy val runProj = (project in file("run")).
     testedBaseSettings,
     name := "Run",
     libraryDependencies ++= Seq(sbtIO,
-      utilLogging, (utilLogging % Test).classifier("tests"), compilerClasspath)
+      utilLogging, compilerClasspath)
   )
 
 lazy val scriptedSbtProj = (project in scriptedPath / "sbt").
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index d48da4a9c..c7c2566b6 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -9,10 +9,10 @@ object Dependencies {
   lazy val scala211 = "2.11.8"
 
   // sbt modules
-  val ioVersion = "1.0.0-M5"
-  val utilVersion = "0.1.0-M12"
-  val librarymanagementVersion = "0.1.0-M10"
-  val zincVersion = "1.0.0-M1"
+  val ioVersion = "1.0.0-M6"
+  val utilVersion = "0.1.0-M13"
+  val librarymanagementVersion = "0.1.0-M11"
+  val zincVersion = "1.0.0-M2"
   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
diff --git a/run/src/test/scala/sbt/ForkTest.scala b/run/src/test/scala/sbt/ForkTest.scala
index 01e726ec9..12eb3cee7 100644
--- a/run/src/test/scala/sbt/ForkTest.scala
+++ b/run/src/test/scala/sbt/ForkTest.scala
@@ -5,7 +5,7 @@ import Prop.{ Exception => _, _ }
 import Gen.{ alphaNumChar, frequency, nonEmptyListOf }
 import java.io.File
 
-import sbt.internal.util.TestLogger
+import sbt.internal.TestLogger
 import sbt.io.{ IO, Path }
 
 object ForkTest extends Properties("Fork") {
diff --git a/run/src/test/scala/sbt/TestLogger.scala b/run/src/test/scala/sbt/TestLogger.scala
new file mode 100644
index 000000000..284bd70b6
--- /dev/null
+++ b/run/src/test/scala/sbt/TestLogger.scala
@@ -0,0 +1,14 @@
+package sbt
+package internal
+
+import sbt.internal.util._
+import sbt.util._
+
+object TestLogger {
+  def apply[T](f: Logger => T): T =
+    {
+      val log = new BufferedLogger(ConsoleLogger())
+      log.setLevel(Level.Debug)
+      log.bufferQuietly(f(log))
+    }
+}

From 1998fb921b4daf7e108657260f81b9b7da2ddb52 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Thu, 12 May 2016 03:45:42 -0400
Subject: [PATCH 2/2] Bumping to zinc 1.0.0-M3

---
 project/Dependencies.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index c7c2566b6..d7b5ccad0 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -12,7 +12,7 @@ object Dependencies {
   val ioVersion = "1.0.0-M6"
   val utilVersion = "0.1.0-M13"
   val librarymanagementVersion = "0.1.0-M11"
-  val zincVersion = "1.0.0-M2"
+  val zincVersion = "1.0.0-M3"
   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