Merge pull request #32 from eed3si9n/wip/moveapi

Move interface to scala.tools.sci package

Author: eed3si9n

build.sbt

@@ -29,7 +29,7 @@ def commonSettings: Seq[Setting[_]] = Seq(
 )
 
 lazy val compilerInterfaceRoot = (project in file("."))
-  .aggregate(compilerInterface, dummyBridge)
+  .aggregate(compilerInterface, dummyApiInfo, dummyBridge)
   .settings(
     publish / skip := true,
     crossScalaVersions := Vector(),
@@ -55,7 +55,7 @@ lazy val compilerInterfaceRoot = (project in file("."))
 //   the analysis compiler phases and passed back to sbt.  The API structures are defined in a simple
 //   format from which Java sources are generated by the sbt-contraband plugin.
 lazy val compilerInterface = (project in file("compiler-interface"))
-  .enablePlugins(ContrabandPlugin)
+// .enablePlugins(ContrabandPlugin)
   .settings(
     commonSettings,
     name := "Compiler Interface",
@@ -99,8 +99,22 @@ lazy val compilerInterface = (project in file("compiler-interface"))
     },
   )
 
-lazy val dummyBridge = (project in file("dummy-bridge"))
+lazy val dummyApiInfo = (project in file("dummy-apiinfo"))
+  .enablePlugins(ContrabandPlugin)
   .dependsOn(compilerInterface)
+  .settings(
+    scalaVersion := scala212,
+    managedSourceDirectories in Compile +=
+      baseDirectory.value / "src" / "main" / "contraband-java",
+    sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-java",
+    crossPaths := false,
+    autoScalaLibrary := false,
+    publish / skip := true,
+    exportJars := true,
+  )
+
+lazy val dummyBridge = (project in file("dummy-bridge"))
+  .dependsOn(compilerInterface, dummyApiInfo)
   .settings(
     name := "Dummy Compiler Bridge",
     scalaVersion := "2.13.1",

compiler-interface/src/main/java/xsbti/APICallback.java renamed to compiler-interface/src/main/java/scala/tools/sci/APICallback.java

@@ -10,7 +10,7 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti;
+package scala.tools.sci;
 
 import java.nio.file.Path;
 
@@ -23,7 +23,9 @@ interface DefinitionType {
     int PACKAGE_MODULE = 3;
   }
 
-  default void startSource(Path src) {}
+  default void startSource(VirtualFile src) {
+    // startSource needs to be VirtualFile because it needs to read the stamp.
+  }
 
   default void endSource() {}
 

compiler-interface/src/main/java/xsbti/BasicVirtualFileRef.java renamed to compiler-interface/src/main/java/scala/tools/sci/BasicVirtualFileRef.java

@@ -10,7 +10,7 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti;
+package scala.tools.sci;
 
 import java.util.Arrays;
 import java.util.ArrayList;

compiler-interface/src/main/java/xsbti/CompileCancelled.java renamed to compiler-interface/src/main/java/scala/tools/sci/CompileCancelled.java

@@ -10,7 +10,7 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti;
+package scala.tools.sci;
 
 /**
  * Represent the cancellation of a compilation run. This failure extends {@link RuntimeException}

compiler-interface/src/main/java/xsbti/CompileFailed.java renamed to compiler-interface/src/main/java/scala/tools/sci/CompileFailed.java

@@ -10,7 +10,7 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti;
+package scala.tools.sci;
 
 /**
  * Represent a failure occurred during compilation of Java or Scala sources. This failure extends

compiler-interface/src/main/java/xsbti/CompilerInterface1.java renamed to compiler-interface/src/main/java/scala/tools/sci/CompilerInterface1.java

@@ -10,9 +10,9 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti;
+package scala.tools.sci;
 
-import xsbti.compile.*;
+import scala.tools.sci.compile.*;
 import java.io.File;
 
 /** Compiler Interface as of Zinc 1.2.0. */
@@ -24,7 +24,8 @@ CachedCompiler newCompiler(
   void run(
       VirtualFile[] sources,
       DependencyChanges changes,
-      AnalysisCallback callback,
+      APICallback callback,
+      OldCallback oldCallback,
       Logger log,
       Reporter delegate,
       CompileProgress progress,

compiler-interface/src/main/java/xsbti/ConsoleInterface1.java renamed to compiler-interface/src/main/java/scala/tools/sci/ConsoleInterface1.java

@@ -10,7 +10,7 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti;
+package scala.tools.sci;
 
 /** Console Interface as of Zinc 1.2.0. */
 public interface ConsoleInterface1 {

compiler-interface/src/main/java/xsbti/FileConverter.java renamed to compiler-interface/src/main/java/scala/tools/sci/FileConverter.java

@@ -10,7 +10,7 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti;
+package scala.tools.sci;
 
 import java.nio.file.Path;
 

compiler-interface/src/main/java/xsbti/InteractiveConsoleFactory.java renamed to compiler-interface/src/main/java/scala/tools/sci/InteractiveConsoleFactory.java

@@ -10,7 +10,7 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti;
+package scala.tools.sci;
 
 public interface InteractiveConsoleFactory {
   InteractiveConsoleInterface createConsole(

compiler-interface/src/main/java/xsbti/InteractiveConsoleInterface.java renamed to compiler-interface/src/main/java/scala/tools/sci/InteractiveConsoleInterface.java

@@ -10,7 +10,7 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti;
+package scala.tools.sci;
 
 public interface InteractiveConsoleInterface {
   void reset();

compiler-interface/src/main/java/xsbti/InteractiveConsoleResponse.java renamed to compiler-interface/src/main/java/scala/tools/sci/InteractiveConsoleResponse.java

@@ -10,7 +10,7 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti;
+package scala.tools.sci;
 
 /** Public interface for repl responses. */
 public interface InteractiveConsoleResponse {

compiler-interface/src/main/java/xsbti/InteractiveConsoleResult.java renamed to compiler-interface/src/main/java/scala/tools/sci/InteractiveConsoleResult.java

@@ -10,7 +10,7 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti;
+package scala.tools.sci;
 
 public enum InteractiveConsoleResult {
   Success,

compiler-interface/src/main/java/xsbti/Logger.java renamed to compiler-interface/src/main/java/scala/tools/sci/Logger.java

@@ -10,7 +10,7 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti;
+package scala.tools.sci;
 
 import java.util.function.Supplier;
 

compiler-interface/src/main/java/scala/tools/sci/OldCallback.java

@@ -0,0 +1,16 @@
+/*
+ * Scala compiler interface
+ *
+ * Copyright Lightbend, Inc. and Mark Harrah
+ *
+ * Licensed under Apache License 2.0
+ * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
+package scala.tools.sci;
+
+/** Place holder for AnalysisCallback */
+public interface OldCallback {}

compiler-interface/src/main/java/xsbti/PathBasedFile.java renamed to compiler-interface/src/main/java/scala/tools/sci/PathBasedFile.java

@@ -10,7 +10,7 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti;
+package scala.tools.sci;
 
 import java.nio.file.Path;
 

compiler-interface/src/main/java/xsbti/Position.java renamed to compiler-interface/src/main/java/scala/tools/sci/Position.java

@@ -10,7 +10,7 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti;
+package scala.tools.sci;
 
 import java.io.File;
 import java.util.Optional;

compiler-interface/src/main/java/xsbti/Problem.java renamed to compiler-interface/src/main/java/scala/tools/sci/Problem.java

@@ -10,7 +10,7 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti;
+package scala.tools.sci;
 
 import java.util.Optional;
 

compiler-interface/src/main/java/xsbti/Reporter.java renamed to compiler-interface/src/main/java/scala/tools/sci/Reporter.java

@@ -10,7 +10,7 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti;
+package scala.tools.sci;
 
 /**
  * Define an interface for a reporter of the compiler.

compiler-interface/src/main/java/xsbti/ScaladocInterface1.java renamed to compiler-interface/src/main/java/scala/tools/sci/ScaladocInterface1.java

@@ -10,7 +10,7 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti;
+package scala.tools.sci;
 
 /** Scaladoc Interface as of Zinc 1.2.0. */
 public interface ScaladocInterface1 {

compiler-interface/src/main/java/xsbti/Severity.java renamed to compiler-interface/src/main/java/scala/tools/sci/Severity.java

@@ -10,7 +10,7 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti;
+package scala.tools.sci;
 
 public enum Severity {
   Info,

compiler-interface/src/main/java/xsbti/UseScope.java renamed to compiler-interface/src/main/java/scala/tools/sci/UseScope.java

@@ -10,7 +10,7 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti;
+package scala.tools.sci;
 
 /**
  * Defines the scope in which a name hash was captured.

compiler-interface/src/main/java/xsbti/VirtualDirectory.java renamed to compiler-interface/src/main/java/scala/tools/sci/VirtualDirectory.java

@@ -10,7 +10,7 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti;
+package scala.tools.sci;
 
 public interface VirtualDirectory extends VirtualFileRef {
   public VirtualFileWrite fileNamed(String name);

compiler-interface/src/main/java/xsbti/VirtualFile.java renamed to compiler-interface/src/main/java/scala/tools/sci/VirtualFile.java

@@ -10,7 +10,7 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti;
+package scala.tools.sci;
 
 import java.io.InputStream;
 

compiler-interface/src/main/java/xsbti/VirtualFileRef.java renamed to compiler-interface/src/main/java/scala/tools/sci/VirtualFileRef.java

@@ -10,7 +10,7 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti;
+package scala.tools.sci;
 
 /*
  * Represents a reference to a file-like object.

compiler-interface/src/main/java/xsbti/VirtualFileWrite.java renamed to compiler-interface/src/main/java/scala/tools/sci/VirtualFileWrite.java

@@ -10,7 +10,7 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti;
+package scala.tools.sci;
 
 import java.io.OutputStream;
 

compiler-interface/src/main/java/xsbti/compile/CachedCompiler.java renamed to compiler-interface/src/main/java/scala/tools/sci/compile/CachedCompiler.java

@@ -10,12 +10,13 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti.compile;
+package scala.tools.sci.compile;
 
-import xsbti.AnalysisCallback;
-import xsbti.Logger;
-import xsbti.Reporter;
-import xsbti.VirtualFile;
+import scala.tools.sci.APICallback;
+import scala.tools.sci.Logger;
+import scala.tools.sci.OldCallback;
+import scala.tools.sci.Reporter;
+import scala.tools.sci.VirtualFile;
 import java.io.File;
 
 /**
@@ -47,7 +48,8 @@ public interface CachedCompiler {
   void run(
       VirtualFile[] sources,
       DependencyChanges changes,
-      AnalysisCallback callback,
+      APICallback callback,
+      OldCallback oldCallback,
       Logger logger,
       Reporter delegate,
       CompileProgress progress);

compiler-interface/src/main/java/xsbti/compile/CachedCompilerProvider.java renamed to compiler-interface/src/main/java/scala/tools/sci/compile/CachedCompilerProvider.java

@@ -10,10 +10,10 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti.compile;
+package scala.tools.sci.compile;
 
-import xsbti.Logger;
-import xsbti.Reporter;
+import scala.tools.sci.Logger;
+import scala.tools.sci.Reporter;
 
 /** Represent a provider that creates cached Scala compilers from a Scala instance. */
 public interface CachedCompilerProvider {

compiler-interface/src/main/java/xsbti/compile/CompileProgress.java renamed to compiler-interface/src/main/java/scala/tools/sci/compile/CompileProgress.java

@@ -10,7 +10,7 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti.compile;
+package scala.tools.sci.compile;
 
 /**
  * An API for reporting when files are being compiled.

compiler-interface/src/main/java/xsbti/compile/CompilerBridgeProvider.java renamed to compiler-interface/src/main/java/scala/tools/sci/compile/CompilerBridgeProvider.java

@@ -10,9 +10,9 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti.compile;
+package scala.tools.sci.compile;
 
-import xsbti.Logger;
+import scala.tools.sci.Logger;
 import java.io.File;
 
 /**

compiler-interface/src/main/java/xsbti/compile/DependencyChanges.java renamed to compiler-interface/src/main/java/scala/tools/sci/compile/DependencyChanges.java

@@ -10,9 +10,9 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti.compile;
+package scala.tools.sci.compile;
 
-import xsbti.VirtualFileRef;
+import scala.tools.sci.VirtualFileRef;
 
 /** Define the changes that can occur to the dependencies of a given compilation run. */
 public interface DependencyChanges {

compiler-interface/src/main/java/xsbti/compile/GlobalsCache.java renamed to compiler-interface/src/main/java/scala/tools/sci/compile/GlobalsCache.java

@@ -10,10 +10,10 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti.compile;
+package scala.tools.sci.compile;
 
-import xsbti.Logger;
-import xsbti.Reporter;
+import scala.tools.sci.Logger;
+import scala.tools.sci.Reporter;
 
 /**
  * Define operations that let us retrieve cached compiler instances for the current Java Virtual

compiler-interface/src/main/java/xsbti/compile/MultipleOutput.java renamed to compiler-interface/src/main/java/scala/tools/sci/compile/MultipleOutput.java

@@ -10,7 +10,7 @@
  * additional information regarding copyright ownership.
  */
 
-package xsbti.compile;
+package scala.tools.sci.compile;
 
 import java.nio.file.Path;
 import java.util.Optional;