From ff711f4719fac61d20fedfa2705916393cc0824c Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Mon, 10 Aug 2020 23:41:55 -0400
Subject: [PATCH 1/3] Adjust to Zinc change

---
 main-actions/src/main/scala/sbt/Console.scala | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/main-actions/src/main/scala/sbt/Console.scala b/main-actions/src/main/scala/sbt/Console.scala
index 43ca79b2a..d8ed6d730 100644
--- a/main-actions/src/main/scala/sbt/Console.scala
+++ b/main-actions/src/main/scala/sbt/Console.scala
@@ -9,7 +9,7 @@ package sbt
 
 import java.io.File
 import java.nio.channels.ClosedChannelException
-import sbt.internal.inc.{ AnalyzingCompiler, PlainVirtualFile }
+import sbt.internal.inc.{ AnalyzingCompiler, MappedFileConverter, PlainVirtualFile }
 import sbt.internal.util.{ DeprecatedJLine, Terminal }
 import sbt.util.Logger
 import xsbti.compile.{ Compilers, Inputs }
@@ -56,13 +56,14 @@ final class Console(compiler: AnalyzingCompiler) {
       terminal: Terminal
   )(loader: Option[ClassLoader], bindings: Seq[(String, Any)])(implicit log: Logger): Try[Unit] = {
     def console0(): Unit =
-      try compiler.console(classpath map { x =>
-        PlainVirtualFile(x.toPath)
-      }, options, initialCommands, cleanupCommands, log)(
-        loader,
-        bindings
-      )
-      catch { case _: InterruptedException | _: ClosedChannelException => }
+      try {
+        compiler.console(classpath map { x =>
+          PlainVirtualFile(x.toPath)
+        }, MappedFileConverter.empty, options, initialCommands, cleanupCommands, log)(
+          loader,
+          bindings
+        )
+      } catch { case _: InterruptedException | _: ClosedChannelException => }
     val previous = sys.props.get("scala.color").getOrElse("auto")
     try {
       sys.props("scala.color") = if (terminal.isColorEnabled) "true" else "false"

From 54aeba160770a566e586a82ccd26a9f3d4190bae Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Fri, 14 Aug 2020 22:19:50 -0400
Subject: [PATCH 2/3] Contraband 0.5.0

---
 project/plugins.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/plugins.sbt b/project/plugins.sbt
index 7e1ad3456..04907f049 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -4,7 +4,7 @@ addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0")
 addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.6")
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.0")
-addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.4.6")
+addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.5.0")
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "3.0.2")
 addSbtPlugin("com.lightbend" % "sbt-whitesource" % "0.1.14")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9")

From d6fa4ccc93f721eee2325e5e372644a319f9d534 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Fri, 14 Aug 2020 22:20:03 -0400
Subject: [PATCH 3/3] Zinc 1.4.0-M9

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

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 956819acf..a8b56ed4c 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -14,7 +14,7 @@ object Dependencies {
   private val ioVersion = nightlyVersion.getOrElse("1.4.0-M6")
   private val lmVersion =
     sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.4.0-M2")
-  val zincVersion = nightlyVersion.getOrElse("1.4.0-M8")
+  val zincVersion = nightlyVersion.getOrElse("1.4.0-M9")
 
   private val sbtIO = "org.scala-sbt" %% "io" % ioVersion