Merge pull request #343 from mkurz/enable-sbt-paradox

Revert "Temporary disable sbt-paradox projects because not compatible with sbt-web 1.5 yet"
playframework · Jun 12, 2023 · 5ad8034 · 5ad8034
2 parents 2ee5edd + 431e68b
commit 5ad8034
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 15 deletions.
diff --git a/play-java-grpc-example/build.sbt b/play-java-grpc-example/build.sbt
@@ -78,5 +78,5 @@ val TestDeps = Seq(
 // Documentation for this project:
 //    sbt "project docs" "~ paradox"
 //    open docs/target/paradox/site/main/index.html
-//lazy val docs = (project in file("docs"))
-//  .enablePlugins(ParadoxPlugin)
+lazy val docs = (project in file("docs"))
+  .enablePlugins(ParadoxPlugin)
diff --git a/play-java-grpc-example/project/paradox.sbt b/play-java-grpc-example/project/paradox.sbt
diff --git a/play-java-grpc-example/project/plugins.sbt b/play-java-grpc-example/project/plugins.sbt
@@ -5,6 +5,8 @@ buildInfoPackage := "play.java.grpc.sample"
 
 addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-M6")
 
+addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.3")
+
 // #grpc_sbt_plugin
 // project/plugins.sbt
 addSbtPlugin("com.lightbend.akka.grpc" %% "sbt-akka-grpc" % "1.0.2")

diff --git a/play-java-grpc-example/scripts/test-sbt b/play-java-grpc-example/scripts/test-sbt
@@ -3,4 +3,4 @@
 echo "+----------------------------+"
 echo "| Executing tests using sbt  |" 
 echo "+----------------------------+"
-sbt ++$MATRIX_SCALA test
+sbt ++$MATRIX_SCALA test docs/paradox
diff --git a/play-scala-grpc-example/build.sbt b/play-scala-grpc-example/build.sbt
@@ -81,5 +81,5 @@ Test / javaOptions ++= List("--add-exports=java.base/sun.security.x509=ALL-UNNAM
 // Documentation for this project:
 //    sbt "project docs" "~ paradox"
 //    open docs/target/paradox/site/main/index.html
-//lazy val docs = (project in file("docs"))
-//  .enablePlugins(ParadoxPlugin) 
+lazy val docs = (project in file("docs"))
+  .enablePlugins(ParadoxPlugin) 
diff --git a/play-scala-grpc-example/project/paradox.sbt b/play-scala-grpc-example/project/paradox.sbt
diff --git a/play-scala-grpc-example/project/plugins.sbt b/play-scala-grpc-example/project/plugins.sbt
@@ -6,6 +6,8 @@ buildInfoPackage := "play.scala.grpc.sample"
 
 addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-M6")
 
+addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.3")
+
 // #grpc_sbt_plugin
 // project/plugins.sbt
 addSbtPlugin("com.lightbend.akka.grpc" %% "sbt-akka-grpc" % "1.0.2")

diff --git a/play-scala-grpc-example/scripts/test-sbt b/play-scala-grpc-example/scripts/test-sbt
@@ -3,4 +3,4 @@
 echo "+----------------------------+"
 echo "| Executing tests using sbt  |" 
 echo "+----------------------------+"
-sbt ++$MATRIX_SCALA test
+sbt ++$MATRIX_SCALA test docs/paradox
diff --git a/play-scala-rest-api-example/build.sbt b/play-scala-rest-api-example/build.sbt
@@ -39,9 +39,9 @@ lazy val gatling = (project in file("gatling"))
 // Documentation for this project:
 //    sbt "project docs" "~ paradox"
 //    open docs/target/paradox/site/index.html
-//lazy val docs = (project in file("docs")).enablePlugins(ParadoxPlugin).
-//  settings(
-//    scalaVersion := scala213,
-//    crossScalaVersions := Seq(scala213, scala3),
-//    paradoxProperties += ("download_url" -> "https://example.lightbend.com/v1/download/play-samples-play-scala-rest-api-example")
-//  )
+lazy val docs = (project in file("docs")).enablePlugins(ParadoxPlugin).
+  settings(
+    scalaVersion := scala213,
+    crossScalaVersions := Seq(scala213, scala3),
+    paradoxProperties += ("download_url" -> "https://example.lightbend.com/v1/download/play-samples-play-scala-rest-api-example")
+  )
diff --git a/play-scala-rest-api-example/scripts/test-sbt b/play-scala-rest-api-example/scripts/test-sbt
@@ -6,5 +6,5 @@ set -o pipefail
 echo "+----------------------------+"
 echo "| Executing tests using sbt  |"
 echo "+----------------------------+"
-sbt ++$MATRIX_SCALA test
+sbt ++$MATRIX_SCALA test docs/paradox
 sbt ++$MATRIX_SCALA ";project gatling;gatling:compile"