Fix https://github.com/lihaoyi/mill/issues/475

2 files changed, 14 insertions, 3 deletions

diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala
index 35dc67d7..3c058013 100644
--- a/scalalib/src/mill/scalalib/ScalaModule.scala
+++ b/scalalib/src/mill/scalalib/ScalaModule.scala
@@ -178,7 +178,7 @@ trait ScalaModule extends JavaModule { outer =>
     val pluginOptions = scalaDocPluginClasspath().map(pluginPathRef => s"-Xplugin:${pluginPathRef.path}")
     val compileCp = compileClasspath().filter(_.path.ext != "pom").map(_.path)
     val options = Seq(
-      "-d", javadocDir.toNIO.toString, "-usejavacp",
+      "-d", javadocDir.toNIO.toString,
       "-classpath", compileCp.mkString(":")
     ) ++
       pluginOptions ++
@@ -186,7 +186,13 @@ trait ScalaModule extends JavaModule { outer =>
 
     if (files.isEmpty) Result.Success(createJar(Agg(javadocDir))(outDir))
     else {
-      zincWorker.worker().docJar(files ++ options) match{
+      zincWorker.worker().docJar(
+        scalaVersion(),
+        scalaCompilerBridgeSources(),
+        scalaCompilerClasspath().map(_.path),
+        scalacPluginClasspath().map(_.path),
+        files ++ options
+      ) match{
         case true => Result.Success(createJar(Agg(javadocDir))(outDir))
         case false => Result.Failure("docJar generation failed")
       }
diff --git a/scalalib/src/mill/scalalib/ZincWorkerApi.scala b/scalalib/src/mill/scalalib/ZincWorkerApi.scala
index c05ac62f..8e95eb29 100644
--- a/scalalib/src/mill/scalalib/ZincWorkerApi.scala
+++ b/scalalib/src/mill/scalalib/ZincWorkerApi.scala
@@ -80,5 +80,10 @@ trait ZincWorkerApi {
   def discoverMainClasses(compilationResult: CompilationResult)
                          (implicit ctx: mill.util.Ctx): Seq[String]
 
-  def docJar(args: Seq[String]): Boolean
+  def docJar(scalaVersion: String,
+             compilerBridgeSources: Path,
+             compilerClasspath: Agg[Path],
+             scalacPluginClasspath: Agg[Path],
+             args: Seq[String])
+            (implicit ctx: mill.util.Ctx): Boolean
 }