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/01/22 08:17:58 UTC
[incubator-pekko-http] branch main updated: Switch to standard paradox plugin
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 8340cb48b Switch to standard paradox plugin
8340cb48b is described below
commit 8340cb48be7822d940b255d92a1c442bfc0d601b
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Sun Jan 22 08:17:53 2023 +0000
Switch to standard paradox plugin
---
build.sbt | 2 +-
project/plugins.sbt | 8 ++++++--
project/project-info.conf | 7 -------
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/build.sbt b/build.sbt
index 5d93c49b6..0dcdab8a4 100644
--- a/build.sbt
+++ b/build.sbt
@@ -400,7 +400,7 @@ lazy val httpScalafixTests =
.enablePlugins(ScalafixTestkitPlugin)
lazy val docs = project("docs")
- .enablePlugins(AkkaParadoxPlugin, NoPublish, PublishRsyncPlugin)
+ .enablePlugins(ParadoxPlugin, NoPublish, PublishRsyncPlugin)
.disablePlugins(MimaPlugin)
.addAkkaModuleDependency("akka-stream", "provided", AkkaDependency.docs)
.addAkkaModuleDependency("akka-actor-typed", "provided", AkkaDependency.docs)
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 383dba0c7..a20cfe465 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,6 +1,6 @@
resolvers += Classpaths.sbtPluginReleases
resolvers += Classpaths.typesafeReleases
-resolvers += Resolver.sonatypeRepo("releases") // to more quickly obtain paradox rigth after release
+resolvers ++= Resolver.sonatypeOssRepos("releases") // to more quickly obtain paradox right after release
// need this to resolve https://jcenter.bintray.com/org/jenkins-ci/jenkins/1.26/
// which is used by plugin "org.kohsuke" % "github-api" % "1.68"
@@ -17,7 +17,11 @@ 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")
-addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.44")
+// 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("de.heikoseeberger" % "sbt-header" % "5.7.0")
addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.30")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.0")
diff --git a/project/project-info.conf b/project/project-info.conf
index 42103f940..e4354508b 100644
--- a/project/project-info.conf
+++ b/project/project-info.conf
@@ -32,13 +32,6 @@ project-info {
http: ${project-info.shared-info} {
title: "Pekko Http"
jpms-name: "pekko.http"
- levels: [
- {
- readiness: Supported
- since: "2016-11-26"
- since-version: "10.0.0"
- }
- ]
api-docs: [
{
url: ${project-info.scaladoc}"/index.html"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org