Add callbacks at the end of Dependecy and API phases (in AnalysisCall…

…back).

Remove async calls in Dependecy phase.

internal/compiler-bridge/src/main/scala/xsbt/API.scala

@@ -21,7 +21,8 @@ final class API(val global: CallbackGlobal) {
     override def run(): Unit =
       {
         val start = System.currentTimeMillis
-        super.run
+        super.run()
+        callback.apiPhaseCompleted()
         val stop = System.currentTimeMillis
         debuglog("API phase took : " + ((stop - start) / 1000.0) + " s")
       }

internal/compiler-bridge/src/main/scala/xsbt/Dependency.scala

@@ -4,9 +4,7 @@
 package xsbt
 
 import java.io.File
-import java.util.concurrent.{ TimeUnit, Executors }
 
-import xsbti.AnalysisCallback
 import xsbti.api.DependencyContext
 import DependencyContext._
 
@@ -39,23 +37,12 @@ final class Dependency(val global: CallbackGlobal) extends LocateClassFile with
     override def description = "Extracts dependency information"
     def name = Dependency.name
 
-    val executor = Executors.newFixedThreadPool(1)
-
     override def run(): Unit = {
+      val start = System.currentTimeMillis
       super.run()
-      // Wait on all callback calls to finish
-      executor.shutdown()
-      executor.awaitTermination(20L, TimeUnit.MINUTES)
-      ()
-    }
-
-    private def withCallback(op: AnalysisCallback => Unit): Unit = {
-      executor.submit(new Runnable {
-        override def run(): Unit = {
-          op(callback)
-        }
-      })
-      ()
+      callback.dependencyPhaseCompleted()
+      val stop = System.currentTimeMillis
+      debuglog("Dependency phase took : " + ((stop - start) / 1000.0) + " s")
     }
 
     def apply(unit: CompilationUnit): Unit = {
@@ -105,7 +92,7 @@ final class Dependency(val global: CallbackGlobal) extends LocateClassFile with
         def processDependency(context: DependencyContext)(dep: ClassDependency): Unit = {
           val fromClassName = className(dep.from)
           def binaryDependency(file: File, onBinaryClassName: String) =
-            withCallback(_.binaryDependency(file, onBinaryClassName, fromClassName, sourceFile, context))
+            callback.binaryDependency(file, onBinaryClassName, fromClassName, sourceFile, context)
           val onSource = dep.to.sourceFile
           if (onSource == null) {
             classFile(dep.to) match {
@@ -120,7 +107,7 @@ final class Dependency(val global: CallbackGlobal) extends LocateClassFile with
             }
           } else if (onSource.file != sourceFile) {
             val onClassName = className(dep.to)
-            withCallback(_.classDependency(onClassName, fromClassName, context))
+            callback.classDependency(onClassName, fromClassName, context)
           }
         }
       }

internal/compiler-interface/src/main/java/xsbti/AnalysisCallback.java

@@ -47,4 +47,10 @@ public interface AnalysisCallback {
      *       Do not depend on it, please.
      */
     boolean nameHashing();
+
+    /** Called at the end of dependency phase. Can be used e.g. to wait on asynchronous tasks. */
+    void dependencyPhaseCompleted();
+
+    /** Called at the end of dependency phase. Can be used e.g. to wait on asynchronous tasks. */
+    void apiPhaseCompleted();
 }

internal/compiler-interface/src/test/scala/xsbti/TestCallback.scala

@@ -45,6 +45,10 @@ class TestCallback(override val nameHashing: Boolean = false) extends AnalysisCa
     ()
   }
   def problem(category: String, pos: xsbti.Position, message: String, severity: xsbti.Severity, reported: Boolean): Unit = ()
+
+  override def dependencyPhaseCompleted(): Unit = {}
+
+  override def apiPhaseCompleted(): Unit = {}
 }
 
 object TestCallback {

internal/zinc-classfile/src/main/scala/sbt/internal/inc/classfile/Analyze.scala

@@ -27,7 +27,7 @@ private[sbt] object Analyze {
       try { Some(Class.forName(tpe, false, loader)) }
       catch { case e: Throwable => errMsg.foreach(msg => log.warn(msg + " : " + e.toString)); None }
 
-    val productToClassName = mutable.Set.empty[String]
+    val classNames = mutable.Set.empty[String]
     val sourceToClassFiles = mutable.HashMap[File, Buffer[ClassFile]](
       sources zip Seq.fill(sources.size)(new ArrayBuffer[ClassFile]): _*
     )
@@ -53,7 +53,7 @@ private[sbt] object Analyze {
       srcClassName match {
         case Some(srcClassName) =>
           analysis.generatedNonLocalClass(source, newClass, binaryClassName, srcClassName)
-          productToClassName += srcClassName
+          classNames += srcClassName
         case None => analysis.generatedLocalClass(source, newClass)
       }
 
@@ -93,7 +93,7 @@ private[sbt] object Analyze {
         trapAndLog(log) {
           val scalaLikeTypeName = onBinaryName.replace('$', '.')
 
-          if (productToClassName.contains(scalaLikeTypeName))
+          if (classNames.contains(scalaLikeTypeName))
             analysis.classDependency(scalaLikeTypeName, fromClassName, context)
           else
             for (file <- classfilesCache.get(onBinaryName).orElse(loadFromClassloader()))

internal/zinc-core/src/main/scala/sbt/internal/inc/Compile.scala

@@ -304,4 +304,8 @@ private final class AnalysisCallback(
 
         a.addSource(src, analyzedApis, stamp, info, nonLocalProds, localProds, internalDeps, externalDeps, binDeps)
     }
+
+  override def dependencyPhaseCompleted(): Unit = {}
+
+  override def apiPhaseCompleted(): Unit = {}
 }

internal/zinc-core/src/test/scala/sbt/inc/TestAnalysisCallback.scala

@@ -176,4 +176,8 @@ class TestAnalysisCallback(
   }
 
   def problem(category: String, pos: xsbti.Position, message: String, severity: xsbti.Severity, reported: Boolean): Unit = ()
+
+  override def dependencyPhaseCompleted(): Unit = {}
+
+  override def apiPhaseCompleted(): Unit = {}
 }