From 00ce32f102092d1586513270c64d8f570d28ae80 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Mon, 12 Mar 2018 17:21:22 +0000
Subject: [PATCH] Cleanup CommandChannel

---
 build.sbt                                      | 18 ++++++++----------
 .../scala/sbt/internal/CommandChannel.scala    |  2 +-
 .../scala/sbt/internal/ConsoleChannel.scala    |  2 --
 .../sbt/internal/server/NetworkChannel.scala   |  2 --
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/build.sbt b/build.sbt
index 87b10d702..c5e115e31 100644
--- a/build.sbt
+++ b/build.sbt
@@ -84,7 +84,14 @@ val mimaSettings = Def settings (
     ).map { v =>
       organization.value % moduleName.value % v cross (if (crossPaths.value) CrossVersion.binary else CrossVersion.disabled)
     }.toSet
-  }
+  },
+  mimaBinaryIssueFilters ++= Seq(
+    // Changes in the internal pacakge
+    exclude[DirectMissingMethodProblem]("sbt.internal.*"),
+    exclude[FinalClassProblem]("sbt.internal.*"),
+    exclude[FinalMethodProblem]("sbt.internal.*"),
+    exclude[IncompatibleResultTypeProblem]("sbt.internal.*"),
+  ),
 )
 
 lazy val sbtRoot: Project = (project in file("."))
@@ -182,9 +189,6 @@ val completeProj = (project in file("internal") / "util-complete")
     libraryDependencies += jline,
     mimaSettings,
     mimaBinaryIssueFilters ++= Seq(
-      // Changed signature or removed something in the internal pacakge
-      exclude[DirectMissingMethodProblem]("sbt.internal.*"),
-      exclude[IncompatibleResultTypeProblem]("sbt.internal.*"),
     ),
   )
   .configure(addSbtIO, addSbtUtilControl)
@@ -453,12 +457,6 @@ lazy val mainProj = (project in file("main"))
     sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala",
     mimaSettings,
     mimaBinaryIssueFilters ++= Vector(
-      // Changed signature or removed something in the internal package
-      exclude[DirectMissingMethodProblem]("sbt.internal.*"),
-
-      // Made something final in the internal package
-      exclude[FinalClassProblem]("sbt.internal.*"),
-
       // New and changed methods on KeyIndex. internal.
       exclude[ReversedMissingMethodProblem]("sbt.internal.KeyIndex.*"),
 
diff --git a/main-command/src/main/scala/sbt/internal/CommandChannel.scala b/main-command/src/main/scala/sbt/internal/CommandChannel.scala
index 6b1b8e391..54c65cfd3 100644
--- a/main-command/src/main/scala/sbt/internal/CommandChannel.scala
+++ b/main-command/src/main/scala/sbt/internal/CommandChannel.scala
@@ -23,7 +23,7 @@ abstract class CommandChannel {
   def poll: Option[Exec] = Option(commandQueue.poll)
 
   def publishEvent[A: JsonFormat](event: A, execId: Option[String]): Unit
-  def publishEvent[A: JsonFormat](event: A): Unit
+  final def publishEvent[A: JsonFormat](event: A): Unit = publishEvent(event, None)
   def publishEventMessage(event: EventMessage): Unit
   def publishBytes(bytes: Array[Byte]): Unit
   def shutdown(): Unit
diff --git a/main-command/src/main/scala/sbt/internal/ConsoleChannel.scala b/main-command/src/main/scala/sbt/internal/ConsoleChannel.scala
index a0356234e..3f039f270 100644
--- a/main-command/src/main/scala/sbt/internal/ConsoleChannel.scala
+++ b/main-command/src/main/scala/sbt/internal/ConsoleChannel.scala
@@ -40,8 +40,6 @@ private[sbt] final class ConsoleChannel(val name: String) extends CommandChannel
 
   def publishEvent[A: JsonFormat](event: A, execId: Option[String]): Unit = ()
 
-  def publishEvent[A: JsonFormat](event: A): Unit = ()
-
   def publishEventMessage(event: EventMessage): Unit =
     event match {
       case e: ConsolePromptEvent =>
diff --git a/main/src/main/scala/sbt/internal/server/NetworkChannel.scala b/main/src/main/scala/sbt/internal/server/NetworkChannel.scala
index 9e5d3e718..75c42f542 100644
--- a/main/src/main/scala/sbt/internal/server/NetworkChannel.scala
+++ b/main/src/main/scala/sbt/internal/server/NetworkChannel.scala
@@ -260,8 +260,6 @@ final class NetworkChannel(val name: String,
     }
   }
 
-  def publishEvent[A: JsonFormat](event: A): Unit = publishEvent(event, None)
-
   def publishEventMessage(event: EventMessage): Unit = {
     if (isLanguageServerProtocol) {
       event match {