Fix review issues

4 files changed, 9 insertions, 5 deletions

diff --git a/build.sc b/build.sc
index e1405d30..bd06c10f 100755
--- a/build.sc
+++ b/build.sc
@@ -126,7 +126,6 @@ object main extends MillModule {
     }
   }
   object api extends MillApiModule{
-    //def moduleDeps = Seq(core)
     def ivyDeps = Agg(
       Deps.osLib,
       Deps.upickle
diff --git a/contrib/bsp/src/mill/contrib/BSP.scala b/contrib/bsp/src/mill/contrib/BSP.scala
index e3166f25..f214ed9a 100644
--- a/contrib/bsp/src/mill/contrib/BSP.scala
+++ b/contrib/bsp/src/mill/contrib/BSP.scala
@@ -32,7 +32,7 @@ object BSP extends ExternalModule {
 
   lazy val millDiscover: Discover[BSP.this.type] = Discover[this.type]
   val version = "1.0.0"
-  val bspVersion = "2.0.0"
+  val bspProtocolVersion = "2.0.0"
   val languages = List("scala", "java")
 
   /**
@@ -81,7 +81,7 @@ object BSP extends ExternalModule {
                              "mill.MillMain",
                              "mill.contrib.BSP/start"),
                         version,
-                        bspVersion,
+                        bspProtocolVersion,
                         languages))
   }
 
@@ -103,7 +103,7 @@ object BSP extends ExternalModule {
   def start(ev: Evaluator): Command[Unit] = T.command {
     val eval = new Evaluator(ev.home, ev.outPath, ev.externalOutPath, ev.rootModule, ev.log, ev.classLoaderSig,
                              ev.workerCache, ev.env, false)
-    val millServer = new mill.contrib.bsp.MillBuildServer(eval, bspVersion, version, languages)
+    val millServer = new mill.contrib.bsp.MillBuildServer(eval, bspProtocolVersion, version, languages)
     val executor = Executors.newCachedThreadPool()
 
     val stdin = System.in
diff --git a/main/api/src/mill/api/BuildReporter.scala b/main/api/src/mill/api/BuildReporter.scala
index f8405984..2b360a45 100644
--- a/main/api/src/mill/api/BuildReporter.scala
+++ b/main/api/src/mill/api/BuildReporter.scala
@@ -2,7 +2,7 @@ package mill.api
 
 import java.io.File
 
-import sbt.testing._
+import sbt.testing.Event
 
 /**
   * Test reporter class that can be
diff --git a/main/core/src/eval/Evaluator.scala b/main/core/src/eval/Evaluator.scala
index 37de69b3..1b58660b 100644
--- a/main/core/src/eval/Evaluator.scala
+++ b/main/core/src/eval/Evaluator.scala
@@ -41,6 +41,11 @@ case class Evaluator(home: os.Path,
 
   val classLoaderSignHash = classLoaderSig.hashCode()
 
+  /**
+    * @param goals The tasks that need to be evaluated
+    * @param reporter A function that will accept a module id and provide a listener for build problems in that module
+    * @param testReporter Listener for test events like start, finish with success/error
+    */
   def evaluate(goals: Agg[Task[_]],
                reporter: Int => Option[BuildProblemReporter] = (int: Int) => Option.empty[BuildProblemReporter],
                testReporter: TestReporter = DummyTestReporter,