Merge pull request scala#872 from eed3si9n/wip/service

Make xsbt.CompilerInterface class name configurable Rewritten from sbt/zinc@951c722
lrytz · Aug 13, 2020 · 9386d78 · 9386d78
2 parents eaec4dd + 8742abc
commit 9386d78
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 19 deletions.
diff --git a/src/main/resources/META-INF/services/xsbti.InteractiveConsoleFactory b/src/main/resources/META-INF/services/xsbti.InteractiveConsoleFactory
@@ -0,0 +1 @@
+xsbt.InteractiveConsoleBridgeFactory
diff --git a/src/main/resources/META-INF/services/xsbti.compile.CompilerInterface2 b/src/main/resources/META-INF/services/xsbti.compile.CompilerInterface2
@@ -0,0 +1 @@
+xsbt.CompilerBridge
diff --git a/src/main/resources/META-INF/services/xsbti.compile.ConsoleInterface1 b/src/main/resources/META-INF/services/xsbti.compile.ConsoleInterface1
@@ -0,0 +1 @@
+xsbt.ConsoleBridge
diff --git a/src/main/resources/META-INF/services/xsbti.compile.ScaladocInterface2 b/src/main/resources/META-INF/services/xsbti.compile.ScaladocInterface2
@@ -0,0 +1 @@
+xsbt.ScaladocBridge
diff --git a/src/main/scala/xsbt/CompilerInterface.scala → src/main/scala/xsbt/CompilerBridge.scala b/src/main/scala/xsbt/CompilerInterface.scala → src/main/scala/xsbt/CompilerBridge.scala
@@ -22,7 +22,7 @@ import java.io.File
 /**
  * This is the entry point for the compiler bridge (implementation of CompilerInterface)
  */
-final class CompilerInterface extends CompilerInterface2 {
+final class CompilerBridge extends xsbti.compile.CompilerInterface2 {
   override def run(
       sources: Array[VirtualFile],
       changes: DependencyChanges,

diff --git a/...cala/xsbt/InteractiveConsoleFactory.scala → ...sbt/InteractiveConsoleFactoryBridge.scala b/...cala/xsbt/InteractiveConsoleFactory.scala → ...sbt/InteractiveConsoleFactoryBridge.scala
@@ -11,21 +11,22 @@
 
 package xsbt
 
+import java.util.Optional
 import xsbti.Logger
 
-class InteractiveConsoleFactory extends xsbti.InteractiveConsoleFactory {
+class InteractiveConsoleBridgeFactory extends xsbti.InteractiveConsoleFactory {
   def createConsole(
       args: Array[String],
       bootClasspathString: String,
       classpathString: String,
       initialCommands: String,
       cleanupCommands: String,
-      loader: ClassLoader,
+      loader: Optional[ClassLoader],
       bindNames: Array[String],
       bindValues: Array[AnyRef],
       log: Logger
   ): xsbti.InteractiveConsoleInterface =
-    new InteractiveConsoleInterface(
+    new InteractiveConsoleBridge(
       args,
       bootClasspathString,
       classpathString,

diff --git a/src/main/scala/xsbt/InteractiveConsoleInterface.scala b/src/main/scala/xsbt/InteractiveConsoleInterface.scala
@@ -12,6 +12,7 @@
 package xsbt
 
 import java.io.{ PrintWriter, StringWriter }
+import java.util.Optional
 
 import scala.tools.nsc.interpreter.IMain
 import scala.tools.nsc.{ GenericRunnerCommand, Settings }
@@ -21,13 +22,14 @@ import xsbti.Logger
 import Compat._
 import InteractiveConsoleHelper._
 
-class InteractiveConsoleInterface(
+// See InteractiveConsoleBridgeFactory
+class InteractiveConsoleBridge(
     args: Array[String],
     bootClasspathString: String,
     classpathString: String,
     initialCommands: String,
     cleanupCommands: String,
-    loader: ClassLoader,
+    loader: Optional[ClassLoader],
     bindNames: Array[String],
     bindValues: Array[AnyRef],
     log: Logger

diff --git a/src/main/scala/xsbt/ScaladocInterface.scala → src/main/scala/xsbt/ScaladocBridge.scala b/src/main/scala/xsbt/ScaladocInterface.scala → src/main/scala/xsbt/ScaladocBridge.scala
@@ -15,7 +15,7 @@ import xsbti.{ Logger, VirtualFile }
 import scala.reflect.io.AbstractFile
 import Log.debug
 
-class ScaladocInterface extends xsbti.compile.ScaladocInterface2 {
+class ScaladocBridge extends xsbti.compile.ScaladocInterface2 {
   def run(sources: Array[VirtualFile], args: Array[String], log: Logger, delegate: xsbti.Reporter) =
     (new Runner(sources, args, log, delegate)).run
 }

diff --git a/...in/scala_2.10/xsbt/ConsoleInterface.scala → src/main/scala_2.10/xsbt/ConsoleBridge.scala b/...in/scala_2.10/xsbt/ConsoleInterface.scala → src/main/scala_2.10/xsbt/ConsoleBridge.scala
@@ -16,24 +16,24 @@ import scala.tools.nsc.interpreter.{ ILoop, IMain, InteractiveReader, NamedParam
 import scala.tools.nsc.reporters.Reporter
 import scala.tools.nsc.{ GenericRunnerCommand, Settings }
 
-class ConsoleInterface {
-  def commandArguments(
+class ConsoleBridge extends xsbti.compile.ConsoleInterface1 {
+  override def commandArguments(
       args: Array[String],
       bootClasspathString: String,
       classpathString: String,
       log: Logger
   ): Array[String] =
     MakeSettings.sync(args, bootClasspathString, classpathString, log).recreateArgs.toArray[String]
 
-  def run(
+  override def run(
       args: Array[String],
       bootClasspathString: String,
       classpathString: String,
       initialCommands: String,
       cleanupCommands: String,
       loader: ClassLoader,
       bindNames: Array[String],
-      bindValues: Array[Any],
+      bindValues: Array[AnyRef],
       log: Logger
   ): Unit = {
     lazy val interpreterSettings = MakeSettings.sync(args.toList, log)

diff --git a/...scala_2.11-12/xsbt/ConsoleInterface.scala → ...in/scala_2.11-12/xsbt/ConsoleBridge.scala b/...scala_2.11-12/xsbt/ConsoleInterface.scala → ...in/scala_2.11-12/xsbt/ConsoleBridge.scala
@@ -16,24 +16,24 @@ import scala.tools.nsc.interpreter.{ ILoop, IMain, InteractiveReader, NamedParam
 import scala.tools.nsc.reporters.Reporter
 import scala.tools.nsc.{ GenericRunnerCommand, Settings }
 
-class ConsoleInterface {
-  def commandArguments(
+class ConsoleBridge extends xsbti.compile.ConsoleInterface1 {
+  override def commandArguments(
       args: Array[String],
       bootClasspathString: String,
       classpathString: String,
       log: Logger
   ): Array[String] =
     MakeSettings.sync(args, bootClasspathString, classpathString, log).recreateArgs.toArray[String]
 
-  def run(
+  override def run(
       args: Array[String],
       bootClasspathString: String,
       classpathString: String,
       initialCommands: String,
       cleanupCommands: String,
       loader: ClassLoader,
       bindNames: Array[String],
-      bindValues: Array[Any],
+      bindValues: Array[AnyRef],
       log: Logger
   ): Unit = {
     lazy val interpreterSettings = MakeSettings.sync(args.toList, log)

diff --git a/...in/scala_2.13/xsbt/ConsoleInterface.scala → src/main/scala_2.13/xsbt/ConsoleBridge.scala b/...in/scala_2.13/xsbt/ConsoleInterface.scala → src/main/scala_2.13/xsbt/ConsoleBridge.scala
@@ -16,24 +16,24 @@ import scala.tools.nsc.interpreter.IMain
 import scala.tools.nsc.interpreter.shell.{ ILoop, ShellConfig, ReplReporterImpl }
 import scala.tools.nsc.{ GenericRunnerCommand, Settings }
 
-class ConsoleInterface {
-  def commandArguments(
+class ConsoleBridge extends xsbti.compile.ConsoleInterface1 {
+  override def commandArguments(
       args: Array[String],
       bootClasspathString: String,
       classpathString: String,
       log: Logger
   ): Array[String] =
     MakeSettings.sync(args, bootClasspathString, classpathString, log).recreateArgs.toArray[String]
 
-  def run(
+  override def run(
       args: Array[String],
       bootClasspathString: String,
       classpathString: String,
       initialCommands: String,
       cleanupCommands: String,
       loader: ClassLoader,
       bindNames: Array[String],
-      bindValues: Array[Any],
+      bindValues: Array[AnyRef],
       log: Logger
   ): Unit = {
     lazy val interpreterSettings = MakeSettings.sync(args.toList, log)