From afd5ff03f8646bc6f8e2f2450a0118af521f1843 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Mon, 28 Aug 2017 00:42:26 -0400
Subject: [PATCH] WatchSource = sbt.internal.io.Source

Ref #3438
---
 build.sbt                       | 10 ++++++++++
 project/Dependencies.scala      |  2 +-
 sbt/src/main/scala/Import.scala |  2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index 5687441d1..2affa420a 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,6 +1,7 @@
 import Util._
 import Dependencies._
 import Sxr.sxr
+import com.typesafe.tools.mima.core._, ProblemFilters._
 
 // ThisBuild settings take lower precedence,
 // but can be shared across the multi projects.
@@ -382,9 +383,18 @@ lazy val sbtProj = (project in file("sbt"))
     crossScalaVersions := Seq(baseScalaVersion),
     crossPaths := false,
     mimaSettings,
+    mimaBinaryIssueFilters ++= sbtIgnoredProblems,
   )
   .configure(addSbtCompilerBridge)
 
+lazy val sbtIgnoredProblems = {
+  Seq(
+    // Added more items to Import trait.
+    exclude[ReversedMissingMethodProblem]("sbt.Import.sbt$Import$_setter_$WatchSource_="),
+    exclude[ReversedMissingMethodProblem]("sbt.Import.WatchSource")
+  )
+}
+
 def scriptedTask: Def.Initialize[InputTask[Unit]] = Def.inputTask {
   val result = scriptedSource(dir => (s: State) => Scripted.scriptedParser(dir)).parsed
   // publishLocalBinAll.value // TODO: Restore scripted needing only binary jars.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index eb4eacbd2..571b6b9be 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -12,7 +12,7 @@ object Dependencies {
   val baseScalaVersion = scala212
 
   // sbt modules
-  private val ioVersion = "1.0.0"
+  private val ioVersion = "1.0.1"
   private val utilVersion = "1.0.1"
   private val lmVersion = "1.0.0"
   private val zincVersion = "1.0.0"
diff --git a/sbt/src/main/scala/Import.scala b/sbt/src/main/scala/Import.scala
index 896271f17..b3ab3b9e1 100644
--- a/sbt/src/main/scala/Import.scala
+++ b/sbt/src/main/scala/Import.scala
@@ -50,6 +50,8 @@ trait Import {
   type RichFile = sbt.io.RichFile
   type SimpleFileFilter = sbt.io.SimpleFileFilter
   type SimpleFilter = sbt.io.SimpleFilter
+  type WatchSource = sbt.internal.io.Source
+  val WatchSource = sbt.internal.io.Source
 
   // sbt.util
   type AbstractLogger = sbt.util.AbstractLogger