Skip to content

Commit

Permalink
use sbt paradox release (#597)
Browse files Browse the repository at this point in the history
  • Loading branch information
pjfanning authored Aug 29, 2023
1 parent cbdc8d8 commit 99cc4e7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
4 changes: 0 additions & 4 deletions project/Paradox.scala
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,6 @@ object Paradox {
"fault-tolerance-sample.html"))

val themeSettings = Seq(
// TODO: allow access to snapshots for pekko-sbt-paradox, remove when pekko is released
resolvers += Resolver.ApacheMavenSnapshotsRepo,
updateOptions := updateOptions.value.withLatestSnapshots(false),
pekkoParadoxGithub := Some("https://github.com/apache/incubator-pekko"))

// FIXME https://github.com/lightbend/paradox/issues/350
Expand Down Expand Up @@ -114,6 +111,5 @@ object Paradox {
sourceGeneratorSettings ++
Seq(
Compile / paradox / name := "Pekko",
resolvers += Resolver.jcenterRepo,
ApidocPlugin.autoImport.apidocRootPackage := "org.apache.pekko")
}
6 changes: 1 addition & 5 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,9 @@ addSbtPlugin("org.mdedetrich" % "sbt-apache-sonatype" % "0.1.10")
addSbtPlugin("com.github.reibitto" % "sbt-welcome" % "0.2.2")
addSbtPlugin("com.github.sbt" % "sbt-license-report" % "1.5.0")

// allow access to snapshots for pekko-sbt-paradox
resolvers += Resolver.ApacheMavenSnapshotsRepo
updateOptions := updateOptions.value.withLatestSnapshots(false)

// 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(("org.apache.pekko" % "pekko-sbt-paradox" % "0.0.0+56-bff08336-SNAPSHOT").excludeAll(
addSbtPlugin(("org.apache.pekko" % "pekko-sbt-paradox" % "1.0.0").excludeAll(
"com.lightbend.paradox", "sbt-paradox",
"com.lightbend.paradox" % "sbt-paradox-apidoc",
"com.lightbend.paradox" % "sbt-paradox-project-info"))
Expand Down

0 comments on commit 99cc4e7

Please sign in to comment.