diff options
| author | Guillaume Grossetie <g.grossetie@gmail.com> | 2018-09-19 11:53:56 +0200 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-09-19 17:53:56 +0800 |
| commit | c8fd6bd9e1dc18c24e64147fcd221e0bf91c2d06 (patch) | |
| tree | 39861fdb2099cbd5f410f583cef1e0a06cc2e443 /scalalib/src | |
| parent | 7f54d7f64d20784945557433d182b831ce7ce00f (diff) | |
| download | mill-c8fd6bd9e1dc18c24e64147fcd221e0bf91c2d06.tar.gz mill-c8fd6bd9e1dc18c24e64147fcd221e0bf91c2d06.tar.bz2 mill-c8fd6bd9e1dc18c24e64147fcd221e0bf91c2d06.zip | |
Dedicated scalaDoc plugins and options (#433)
* Dedicated scalaDoc plugins and options
* Use T{} for consistency
Diffstat (limited to 'scalalib/src')
| -rw-r--r-- | scalalib/src/mill/scalalib/ScalaModule.scala | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala index 8c7d40fc..3a4a9d45 100644 --- a/scalalib/src/mill/scalalib/ScalaModule.scala +++ b/scalalib/src/mill/scalalib/ScalaModule.scala @@ -3,8 +3,7 @@ package scalalib import ammonite.ops._ import coursier.Repository -import mill.define.Task -import mill.define.TaskModule +import mill.define.{Target, Task, TaskModule} import mill.eval.{PathRef, Result} import mill.modules.Jvm import mill.modules.Jvm.{createJar, subprocess} @@ -62,8 +61,12 @@ trait ScalaModule extends JavaModule { outer => def scalacPluginIvyDeps = T{ Agg.empty[Dep] } + def scalaDocPluginIvyDeps = T{ scalacPluginIvyDeps() } + def scalacOptions = T{ Seq.empty[String] } + def scalaDocOptions = T{ scalacOptions() } + private val Milestone213 = raw"""2.13.(\d+)-M(\d+)""".r def scalaCompilerBridgeSources = T { @@ -99,6 +102,10 @@ trait ScalaModule extends JavaModule { outer => resolveDeps(scalacPluginIvyDeps)() } + def scalaDocPluginClasspath: T[Agg[PathRef]] = T { + resolveDeps(scalaDocPluginIvyDeps)() + } + def scalaLibraryIvyDeps = T{ scalaRuntimeIvyDeps(scalaOrganization(), scalaVersion()) } /** * Classpath of the Scala Compiler & any compiler plugins @@ -149,8 +156,8 @@ trait ScalaModule extends JavaModule { outer => if (p.isFile && ((p.ext == "scala") || (p.ext == "java"))) } yield p.toNIO.toString - val pluginOptions = scalacPluginClasspath().map(pluginPathRef => s"-Xplugin:${pluginPathRef.path}") - val options = Seq("-d", javadocDir.toNIO.toString, "-usejavacp") ++ pluginOptions ++ scalacOptions() + val pluginOptions = scalaDocPluginClasspath().map(pluginPathRef => s"-Xplugin:${pluginPathRef.path}") + val options = Seq("-d", javadocDir.toNIO.toString, "-usejavacp") ++ pluginOptions ++ scalaDocOptions() if (files.nonEmpty) subprocess( "scala.tools.nsc.ScalaDoc", |