Reapplying Martynas unidoc fix
This commit is contained in:
parent
a84a3bbd83
commit
c9904976b8
2 changed files with 8 additions and 9 deletions
|
|
@ -39,6 +39,7 @@ lazy val root = Project(
|
|||
base = file("."),
|
||||
aggregate = aggregatedProjects
|
||||
).settings(rootSettings: _*)
|
||||
.settings(unidocRootIgnoreProjects := Seq(remoteTests, benchJmh, protobuf, akkaScalaNightly, docs))
|
||||
|
||||
lazy val actor = akkaModule("akka-actor")
|
||||
|
||||
|
|
|
|||
|
|
@ -99,7 +99,6 @@ object UnidocRoot extends AutoPlugin {
|
|||
|
||||
object autoImport {
|
||||
val unidocRootIgnoreProjects = settingKey[Seq[Project]]("Projects to ignore when generating unidoc")
|
||||
val unidocRootProjectFilter = settingKey[ScopeFilter.ProjectFilter]("project filter for generating unidoc")
|
||||
}
|
||||
import autoImport._
|
||||
|
||||
|
|
@ -113,20 +112,19 @@ object UnidocRoot extends AutoPlugin {
|
|||
sources in(JavaUnidoc, unidoc) ~= (_.filterNot(_.getPath.contains("Access$minusControl$minusAllow$minusOrigin")))
|
||||
)).getOrElse(Nil)
|
||||
|
||||
def settings() = {
|
||||
inTask(unidoc)(Seq(
|
||||
unidocRootProjectFilter := {
|
||||
val ignoreProjects = unidocRootIgnoreProjects.value
|
||||
val settings = {
|
||||
def unidocRootProjectFilter(ignoreProjects: Seq[Project]) =
|
||||
ignoreProjects.foldLeft(inAnyProject) { _ -- inProjects(_) }
|
||||
},
|
||||
unidocProjectFilter in ScalaUnidoc := unidocRootProjectFilter.value,
|
||||
unidocProjectFilter in JavaUnidoc := unidocRootProjectFilter.value,
|
||||
|
||||
inTask(unidoc)(Seq(
|
||||
unidocProjectFilter in ScalaUnidoc := unidocRootProjectFilter(unidocRootIgnoreProjects.value),
|
||||
unidocProjectFilter in JavaUnidoc := unidocRootProjectFilter(unidocRootIgnoreProjects.value),
|
||||
apiMappings in ScalaUnidoc := (apiMappings in (Compile, doc)).value
|
||||
))
|
||||
}
|
||||
|
||||
override lazy val projectSettings =
|
||||
CliOptions.genjavadocEnabled.ifTrue(scalaJavaUnidocSettings).getOrElse(scalaUnidocSettings) ++ settings()
|
||||
CliOptions.genjavadocEnabled.ifTrue(scalaJavaUnidocSettings).getOrElse(scalaUnidocSettings) ++ settings
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue