[incubator-pekko] branch main updated: Enable doc publishing for Scala 3

[he...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hepin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko.git


The following commit(s) were added to refs/heads/main by this push:
     new a2b2208caf Enable doc publishing for Scala 3
a2b2208caf is described below

commit a2b2208caf0a444e477f79a38c04ffa65d2c77ec
Author: Matthew de Detrich <ma...@aiven.io>
AuthorDate: Tue Jun 13 19:43:50 2023 +0200

    Enable doc publishing for Scala 3
---
 build.sbt         | 2 --
 project/Doc.scala | 9 +--------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/build.sbt b/build.sbt
index 6bed071f7a..633d42cf81 100644
--- a/build.sbt
+++ b/build.sbt
@@ -260,8 +260,6 @@ lazy val docs = pekkoModule("docs")
     Jdk9)
   .disablePlugins(MimaPlugin)
   .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")
   .dependsOn(
diff --git a/project/Doc.scala b/project/Doc.scala
index 252b6d3180..49b22660a0 100644
--- a/project/Doc.scala
+++ b/project/Doc.scala
@@ -43,14 +43,7 @@ object Scaladoc extends AutoPlugin {
         // -release caused build failures when generating javadoc:
         Compile / scalacOptions --= Seq("-release", "8"),
         autoAPIMappings := CliOptions.scaladocAutoAPI.get)) ++
-    Seq(
-      // 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) ++
+    Seq(Compile / validateDiagrams := true) ++
     CliOptions.scaladocDiagramsEnabled.ifTrue(Compile / doc := {
       val docs = (Compile / doc).value
       if ((Compile / validateDiagrams).value)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org