Merge pull request #155 from mkurz/parboiled-java-upgrade

Explicitly upgrade pegdown's transitive parboiled-java dependency

.github/workflows/build-test.yml

@@ -15,23 +15,23 @@ concurrency:
 jobs:
   check-code-style:
     name: Code Style
-    uses: playframework/.github/.github/workflows/cmd.yml@v2
+    uses: playframework/.github/.github/workflows/cmd.yml@v3
     with:
       cmd: sbt validateCode
 
   tests:
     name: Tests
     needs:
       - "check-code-style"
-    uses: playframework/.github/.github/workflows/cmd.yml@v2
+    uses: playframework/.github/.github/workflows/cmd.yml@v3
     with:
-      java: 11, 8
-      scala: 2.12.15, 2.13.8
+      java: 17, 11
+      scala: 2.12.17, 2.13.9
       cmd: sbt ++$MATRIX_SCALA test
 
   finish:
     name: Finish
     if: github.event_name == 'pull_request'
     needs: # Should be last
       - "tests"
-    uses: playframework/.github/.github/workflows/rtm.yml@v2
+    uses: playframework/.github/.github/workflows/rtm.yml@v3

.github/workflows/publish.yml

@@ -11,5 +11,5 @@ on:
 jobs:
   publish-artifacts:
     name: Publish / Artifacts
-    uses: playframework/.github/.github/workflows/publish.yml@v2
+    uses: playframework/.github/.github/workflows/publish.yml@v3
     secrets: inherit

build.sbt

@@ -11,28 +11,28 @@ Global / onLoad := (Global / onLoad).value.andThen { s =>
 }
 
 lazy val `play-doc` = (project in file("."))
-  .enablePlugins(PlayLibrary, SbtTwirl, PlayReleaseBase)
+  .enablePlugins(PlayLibrary, SbtTwirl)
   .settings(
     crossScalaVersions := Seq(scala212, scala213)
   )
 
 libraryDependencies ++= Seq(
-  "org.pegdown" % "pegdown"     % "1.6.0",
-  "commons-io"  % "commons-io"  % "2.11.0",
-  "org.specs2" %% "specs2-core" % "4.16.1" % Test
+  ("org.pegdown"  % "pegdown"        % "1.6.0").exclude("org.parboiled", "parboiled-java"),
+  "org.parboiled" % "parboiled-java" % "1.4.1",
+  "commons-io"    % "commons-io"     % "2.11.0",
+  "org.specs2"   %% "specs2-core"    % "4.16.1" % Test
 )
 
 javacOptions ++= Seq(
-  "-source",
-  "1.8",
-  "-target",
-  "1.8",
+  "--release",
+  "11",
   "-Xlint:deprecation",
   "-Xlint:unchecked",
 )
 
 scalacOptions ++= Seq(
-  "-target:jvm-1.8",
+  "-release",
+  "11",
   "-encoding",
   "utf8",
   "-deprecation",

project/plugins.sbt

@@ -1,4 +1,4 @@
-addSbtPlugin("com.typesafe.play" % "interplay"      % "3.0.5")
+addSbtPlugin("com.typesafe.play" % "interplay"      % "3.1.0-RC3")
 addSbtPlugin("com.typesafe.sbt"  % "sbt-twirl"      % "1.5.1")
 addSbtPlugin("org.scalameta"     % "sbt-scalafmt"   % "2.4.6")
 addSbtPlugin("com.github.sbt"    % "sbt-ci-release" % "1.5.10")