raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Reapplying Martynas unidoc fix

Browse source
This commit is contained in:
Johan Andrén 2017-05-26 14:09:07 +02:00
parent a84a3bbd83
commit c9904976b8
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
build.sbt
View file

@ -39,6 +39,7 @@ lazy val root = Project(
base = file("."), base = file("."),
aggregate = aggregatedProjects aggregate = aggregatedProjects
).settings(rootSettings: _*) ).settings(rootSettings: _*)
.settings(unidocRootIgnoreProjects := Seq(remoteTests, benchJmh, protobuf, akkaScalaNightly, docs))
lazy val actor = akkaModule("akka-actor") lazy val actor = akkaModule("akka-actor")

16
project/Doc.scala
View file

@ -99,7 +99,6 @@ object UnidocRoot extends AutoPlugin {
object autoImport { object autoImport {
val unidocRootIgnoreProjects = settingKey[Seq[Project]]("Projects to ignore when generating unidoc") val unidocRootIgnoreProjects = settingKey[Seq[Project]]("Projects to ignore when generating unidoc")
val unidocRootProjectFilter = settingKey[ScopeFilter.ProjectFilter]("project filter for generating unidoc")
} }
import autoImport._ import autoImport._
@ -113,20 +112,19 @@ object UnidocRoot extends AutoPlugin {
sources in(JavaUnidoc, unidoc) ~= (_.filterNot(_.getPath.contains("Access$minusControl$minusAllow$minusOrigin"))) sources in(JavaUnidoc, unidoc) ~= (_.filterNot(_.getPath.contains("Access$minusControl$minusAllow$minusOrigin")))
)).getOrElse(Nil) )).getOrElse(Nil)
def settings() = { val settings = {
def unidocRootProjectFilter(ignoreProjects: Seq[Project]) =
ignoreProjects.foldLeft(inAnyProject) { _ -- inProjects(_) }
inTask(unidoc)(Seq( inTask(unidoc)(Seq(
unidocRootProjectFilter := { unidocProjectFilter in ScalaUnidoc := unidocRootProjectFilter(unidocRootIgnoreProjects.value),
val ignoreProjects = unidocRootIgnoreProjects.value unidocProjectFilter in JavaUnidoc := unidocRootProjectFilter(unidocRootIgnoreProjects.value),
ignoreProjects.foldLeft(inAnyProject) { _ -- inProjects(_) }
},
unidocProjectFilter in ScalaUnidoc := unidocRootProjectFilter.value,
unidocProjectFilter in JavaUnidoc := unidocRootProjectFilter.value,
apiMappings in ScalaUnidoc := (apiMappings in (Compile, doc)).value apiMappings in ScalaUnidoc := (apiMappings in (Compile, doc)).value
)) ))
} }
override lazy val projectSettings = override lazy val projectSettings =
CliOptions.genjavadocEnabled.ifTrue(scalaJavaUnidocSettings).getOrElse(scalaUnidocSettings) ++ settings() CliOptions.genjavadocEnabled.ifTrue(scalaJavaUnidocSettings).getOrElse(scalaUnidocSettings) ++ settings
} }
/** /**