Merge pull request #425 from eed3si9n/wip/repl

Move REPL related xsbti Java classes to the correct module
sbt · Oct 10, 2017 · 291cefa · 291cefa
2 parents 30c9bb4 + f2e2bf2
commit 291cefa
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 1 deletion.
diff --git a/build.sbt b/build.sbt
@@ -1,7 +1,6 @@
 import Util._
 import Dependencies._
 import Scripted._
-//import com.typesafe.tools.mima.core._, ProblemFilters._
 
 def baseVersion = "1.1.0-SNAPSHOT"
 def internalPath = file("internal")

diff --git a/internal/compiler-bridge/src/main/mima-filters/1.0.0.backwards.excludes b/internal/compiler-bridge/src/main/mima-filters/1.0.0.backwards.excludes
@@ -0,0 +1,6 @@
+# xsbti Java interfaces must be defined in the compiler interface, not the bridge.
+# Bridge implementations are compiled per Zinc, so these are safe to change.
+ProblemFilters.exclude[MissingClassProblem]("xsbti.InteractiveConsoleFactory")
+ProblemFilters.exclude[MissingClassProblem]("xsbti.InteractiveConsoleResult")
+ProblemFilters.exclude[MissingClassProblem]("xsbti.InteractiveConsoleInterface")
+ProblemFilters.exclude[MissingClassProblem]("xsbti.InteractiveConsoleResponse")
diff --git a/...java/xsbti/InteractiveConsoleFactory.java → ...java/xsbti/InteractiveConsoleFactory.java b/...java/xsbti/InteractiveConsoleFactory.java → ...java/xsbti/InteractiveConsoleFactory.java
diff --git a/...va/xsbti/InteractiveConsoleInterface.java → ...va/xsbti/InteractiveConsoleInterface.java b/...va/xsbti/InteractiveConsoleInterface.java → ...va/xsbti/InteractiveConsoleInterface.java
diff --git a/...ava/xsbti/InteractiveConsoleResponse.java → ...ava/xsbti/InteractiveConsoleResponse.java b/...ava/xsbti/InteractiveConsoleResponse.java → ...ava/xsbti/InteractiveConsoleResponse.java
diff --git a/.../java/xsbti/InteractiveConsoleResult.java → .../java/xsbti/InteractiveConsoleResult.java b/.../java/xsbti/InteractiveConsoleResult.java → .../java/xsbti/InteractiveConsoleResult.java