From d1f1b6bf137ea0e6b8a8d1dd030443ba5d2fb002 Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Tue, 26 Feb 2019 10:02:09 +0100 Subject: Renamed JavaModule.docOptions to javadocOptions --- scalalib/src/JavaModule.scala | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scalalib/src/JavaModule.scala b/scalalib/src/JavaModule.scala index fb128f3c..82776b8a 100644 --- a/scalalib/src/JavaModule.scala +++ b/scalalib/src/JavaModule.scala @@ -298,9 +298,11 @@ trait JavaModule extends mill.Module with TaskModule { outer => } /** - * Additional options for the used doc tool (e.g. javadoc). + * Additional options to be used by the javadoc tool. + * You should not set the `-d` setting for specifying the target directory, + * as that is done in the [[docJar]] target. */ - def docOptions: T[Seq[String]] = T { Seq[String]() } + def javadocOptions: T[Seq[String]] = T { Seq[String]() } /** * The documentation jar, containing all the Javadoc/Scaladoc HTML files, for @@ -319,7 +321,7 @@ trait JavaModule extends mill.Module with TaskModule { outer => if os.isFile(p) && (p.ext == "java") } yield p.toNIO.toString - val options = docOptions() ++ Seq("-d", javadocDir.toNIO.toString) + val options = javadocOptions() ++ Seq("-d", javadocDir.toNIO.toString) if (files.nonEmpty) Jvm.runSubprocess( commandArgs = Seq( -- cgit v1.2.3