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

Merge pull request #26050 from akka/wip-25985-unidoc-patriknw

Browse source 
only unidoc for Scala 2.12, #25985
This commit is contained in:
Patrik Nordwall 2018-12-06 15:38:11 +01:00 • committed by GitHub
commit 918843d54e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
build.sbt
View file

@ -54,7 +54,12 @@ lazy val root = Project(
base = file(".") base = file(".")
).aggregate(aggregatedProjects: _*) ).aggregate(aggregatedProjects: _*)
.settings(rootSettings: _*) .settings(rootSettings: _*)
.settings(unidocRootIgnoreProjects := Seq(remoteTests, benchJmh, protobuf, akkaScalaNightly, docs)) .settings(unidocRootIgnoreProjects :=
(CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, n)) if n == 11 ⇒ aggregatedProjects // ignore all, don't unidoc when scalaVersion is 2.11
case _ ⇒ Seq(remoteTests, benchJmh, protobuf, akkaScalaNightly, docs)
})
)
.settings( .settings(
unmanagedSources in(Compile, headerCreate) := (baseDirectory.value / "project").**("*.scala").get unmanagedSources in(Compile, headerCreate) := (baseDirectory.value / "project").**("*.scala").get
) )

8
project/Doc.scala
View file

@ -5,7 +5,7 @@
package akka package akka
import sbt._ import sbt._
import sbtunidoc.BaseUnidocPlugin.autoImport.{ unidoc, unidocProjectFilter } import sbtunidoc.BaseUnidocPlugin.autoImport.{unidoc, unidocProjectFilter}
import sbtunidoc.JavaUnidocPlugin.autoImport.JavaUnidoc import sbtunidoc.JavaUnidocPlugin.autoImport.JavaUnidoc
import sbtunidoc.ScalaUnidocPlugin.autoImport.ScalaUnidoc import sbtunidoc.ScalaUnidocPlugin.autoImport.ScalaUnidoc
import sbtunidoc.GenJavadocPlugin.autoImport._ import sbtunidoc.GenJavadocPlugin.autoImport._
@ -13,6 +13,8 @@ import sbt.Keys._
import sbt.File import sbt.File
import scala.annotation.tailrec import scala.annotation.tailrec
import sbt.ScopeFilter.ProjectFilter
object Scaladoc extends AutoPlugin { object Scaladoc extends AutoPlugin {
object CliOptions { object CliOptions {
@ -100,7 +102,7 @@ object UnidocRoot extends AutoPlugin {
} }
object autoImport { object autoImport {
val unidocRootIgnoreProjects = settingKey[Seq[Project]]("Projects to ignore when generating unidoc") val unidocRootIgnoreProjects = settingKey[Seq[ProjectReference]]("Projects to ignore when generating unidoc")
} }
import autoImport._ import autoImport._
@ -113,7 +115,7 @@ object UnidocRoot extends AutoPlugin {
Seq(javacOptions in (JavaUnidoc, unidoc) := Seq("-Xdoclint:none"))).getOrElse(Nil) Seq(javacOptions in (JavaUnidoc, unidoc) := Seq("-Xdoclint:none"))).getOrElse(Nil)
override lazy val projectSettings = { override lazy val projectSettings = {
def unidocRootProjectFilter(ignoreProjects: Seq[Project]) = def unidocRootProjectFilter(ignoreProjects: Seq[ProjectReference]): ProjectFilter =
ignoreProjects.foldLeft(inAnyProject) { _ -- inProjects(_) } ignoreProjects.foldLeft(inAnyProject) { _ -- inProjects(_) }
inTask(unidoc)(Seq( inTask(unidoc)(Seq(

2
project/build.properties
View file

@ -1 +1 @@
sbt.version=1.2.7 sbt.version=1.2.6