Enable doc publishing for Scala 3

This commit is contained in:
Matthew de Detrich 2023-06-13 19:43:50 +02:00 committed by kerr
parent 97cf472aff
commit a2b2208caf
2 changed files with 1 additions and 10 deletions

View file

@ -260,8 +260,6 @@ lazy val docs = pekkoModule("docs")
Jdk9) Jdk9)
.disablePlugins(MimaPlugin) .disablePlugins(MimaPlugin)
.disablePlugins((if (ScalafixSupport.fixTestScope) Nil else Seq(ScalafixPlugin)): _*) .disablePlugins((if (ScalafixSupport.fixTestScope) Nil else Seq(ScalafixPlugin)): _*)
// TODO https://github.com/akka/akka/issues/30243
.settings(crossScalaVersions -= Dependencies.scala3Version)
lazy val jackson = pekkoModule("serialization-jackson") lazy val jackson = pekkoModule("serialization-jackson")
.dependsOn( .dependsOn(

View file

@ -43,14 +43,7 @@ object Scaladoc extends AutoPlugin {
// -release caused build failures when generating javadoc: // -release caused build failures when generating javadoc:
Compile / scalacOptions --= Seq("-release", "8"), Compile / scalacOptions --= Seq("-release", "8"),
autoAPIMappings := CliOptions.scaladocAutoAPI.get)) ++ autoAPIMappings := CliOptions.scaladocAutoAPI.get)) ++
Seq( Seq(Compile / validateDiagrams := true) ++
// Publishing scala3 docs is broken (https://github.com/akka/akka/issues/30788),
// for now we just skip it:
Compile / doc / sources := (
if (scalaVersion.value.startsWith("3.")) Seq()
else (Compile / doc / sources).value
),
Compile / validateDiagrams := true) ++
CliOptions.scaladocDiagramsEnabled.ifTrue(Compile / doc := { CliOptions.scaladocDiagramsEnabled.ifTrue(Compile / doc := {
val docs = (Compile / doc).value val docs = (Compile / doc).value
if ((Compile / validateDiagrams).value) if ((Compile / validateDiagrams).value)