Skip to content

Commit 687ee61

Browse files
committed
Update sbt-pekko-paradox
1 parent f3149e0 commit 687ee61

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

build.sbt

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ ThisBuild / reproducibleBuildsCheckResolver := Resolver.ApacheMavenStagingRepo
2727
addCommandAlias("verifyCodeStyle", "scalafmtCheckAll; scalafmtSbtCheck; +headerCheckAll; javafmtCheckAll")
2828
addCommandAlias("applyCodeStyle", "+headerCreateAll; scalafmtAll; scalafmtSbt; javafmtAll")
2929

30+
ThisBuild / resolvers += Resolver.ApacheMavenSnapshotsRepo
31+
3032
inThisBuild(Def.settings(
3133
apiURL := {
3234
val apiVersion = if (isSnapshot.value) "current" else version.value

project/plugins.sbt

+2-13
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,8 @@ addSbtPlugin("com.github.sbt" % "sbt-boilerplate" % "0.7.0")
2222
addSbtPlugin("com.lightbend.sbt" % "sbt-bill-of-materials" % "1.0.2")
2323
addSbtPlugin("com.github.sbt" % "sbt-license-report" % "1.6.1")
2424

25-
// We have to deliberately use older versions of sbt-paradox because current Pekko sbt build
26-
// only loads on JDK 1.8 so we need to bring in older versions of parboiled which support JDK 1.8
27-
addSbtPlugin(("org.apache.pekko" % "pekko-sbt-paradox" % "1.0.0").excludeAll(
28-
"com.lightbend.paradox", "sbt-paradox",
29-
"com.lightbend.paradox" % "sbt-paradox-apidoc",
30-
"com.lightbend.paradox" % "sbt-paradox-project-info"))
31-
addSbtPlugin(("com.lightbend.paradox" % "sbt-paradox" % "0.9.2").force().exclude("com.typesafe.sbt", "sbt-web"))
32-
addSbtPlugin("com.github.sbt" % "sbt-web" % "1.5.4") // sbt-paradox 0.9.2 depends on old sbt-web 1.4.x, but we want a newer version
33-
addSbtPlugin(("com.lightbend.paradox" % "sbt-paradox-apidoc" % "1.1.0").excludeAll(
34-
"com.lightbend.paradox", "sbt-paradox"))
35-
addSbtPlugin(("com.lightbend.paradox" % "sbt-paradox-project-info" % "3.0.1").excludeAll(
36-
"com.lightbend.paradox", "sbt-paradox"))
37-
dependencyOverrides += "org.parboiled" % "parboiled-java" % "1.3.1"
25+
resolvers += Resolver.ApacheMavenSnapshotsRepo
26+
addSbtPlugin("org.apache.pekko" % "pekko-sbt-paradox" % "1.0.1-RC1+3-2b1f8708-SNAPSHOT")
3827

3928
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
4029
addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.32")

0 commit comments

Comments
 (0)