You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by md...@apache.org on 2023/02/16 13:14:24 UTC
[incubator-pekko-http] branch main updated: Use incubator-pekko-sbt-paradox
This is an automated email from the ASF dual-hosted git repository.
mdedetrich pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-http.git
The following commit(s) were added to refs/heads/main by this push:
new 7a4779144 Use incubator-pekko-sbt-paradox
7a4779144 is described below
commit 7a4779144d8da2acb305dfe1c776c1f26ea437ea
Author: Matthew de Detrich <ma...@aiven.io>
AuthorDate: Thu Feb 16 12:41:13 2023 +0100
Use incubator-pekko-sbt-paradox
---
build.sbt | 2 +-
project/ParadoxSupport.scala | 5 ++++-
project/plugins.sbt | 14 +++++++++++---
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/build.sbt b/build.sbt
index a5f61f759..bdf694927 100644
--- a/build.sbt
+++ b/build.sbt
@@ -384,7 +384,7 @@ lazy val httpScalafixTests =
.enablePlugins(ScalafixTestkitPlugin)
lazy val docs = project("docs")
- .enablePlugins(ParadoxPlugin, NoPublish, PublishRsyncPlugin)
+ .enablePlugins(ParadoxPlugin, PekkoParadoxPlugin, NoPublish, PublishRsyncPlugin)
.disablePlugins(MimaPlugin)
.addPekkoModuleDependency("pekko-stream", "provided", PekkoDependency.docs)
.addPekkoModuleDependency("pekko-actor-typed", "provided", PekkoDependency.docs)
diff --git a/project/ParadoxSupport.scala b/project/ParadoxSupport.scala
index 639425668..b80c2a0f4 100644
--- a/project/ParadoxSupport.scala
+++ b/project/ParadoxSupport.scala
@@ -10,6 +10,7 @@ import sbt._
import Keys._
import com.lightbend.paradox.markdown._
import com.lightbend.paradox.sbt.ParadoxPlugin.autoImport._
+import org.apache.pekko.PekkoParadoxPlugin.autoImport._
import org.pegdown.Printer
import org.pegdown.ast.{ DirectiveNode, HtmlBlockNode, VerbatimNode, Visitor }
@@ -19,7 +20,9 @@ import scala.io.{ Codec, Source }
object ParadoxSupport {
val paradoxWithCustomDirectives = Seq(
paradoxDirectives += ((context: Writer.Context) =>
- new SignatureDirective(context.location.tree.label, context.properties, context)))
+ new SignatureDirective(context.location.tree.label, context.properties, context)),
+ resolvers += "Apache Nexus Snapshots".at("https://repository.apache.org/content/repositories/snapshots/"),
+ pekkoParadoxGithub := "https://github.com/apache/incubator-pekko-http")
class SignatureDirective(
page: Page, variables: Map[String, String], ctx: Writer.Context) extends LeafBlockDirective("signature") {
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 2b55850e0..a65d783bc 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -17,11 +17,19 @@ addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1") // for
addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.6.1")
addSbtPlugin("com.lightbend.sbt" % "sbt-publish-rsync" % "0.2")
addSbtPlugin("com.lightbend.sbt" % "sbt-bill-of-materials" % "1.0.2")
+// allow access to snapshots for pekko-sbt-paradox
+resolvers += "Apache Nexus Snapshots".at("https://repository.apache.org/content/repositories/snapshots/")
+
// We have to deliberately use older versions of sbt-paradox because current Pekko sbt build
// only loads on JDK 1.8 so we need to bring in older versions of parboiled which support JDK 1.8
-addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.9.2")
-addSbtPlugin("com.lightbend.paradox" % "sbt-paradox-apidoc" % "0.10.1")
-addSbtPlugin("com.lightbend.paradox" % "sbt-paradox-project-info" % "2.0.0")
+addSbtPlugin(("org.apache.pekko" % "pekko-sbt-paradox" % "0.0.0+19-f498f7c0-SNAPSHOT").excludeAll(
+ "com.lightbend.paradox", "sbt-paradox",
+ "com.lightbend.paradox" % "sbt-paradox-apidoc",
+ "com.lightbend.paradox" % "sbt-paradox-project-info"))
+addSbtPlugin(("com.lightbend.paradox" % "sbt-paradox" % "0.9.2").force())
+addSbtPlugin(("com.lightbend.paradox" % "sbt-paradox-apidoc" % "0.10.1").force())
+addSbtPlugin(("com.lightbend.paradox" % "sbt-paradox-project-info" % "2.0.0").force())
+
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.7.0")
addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.30")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.0")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org