From 2447ba458c287530a0533569b3e56d2e0ca345c9 Mon Sep 17 00:00:00 2001
From: Matthias Kurz <m.kurz@irregular.at>
Date: Fri, 30 Sep 2022 16:12:25 +0200
Subject: [PATCH 1/3] Explicitly upgrade pegdown's transitive parboiled-java
 dependency

To make the whole thing work with Java 11+, thanks to a newer
transitive ASM dependency
---
 build.sbt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.sbt b/build.sbt
index c8a0c95..f936f04 100644
--- a/build.sbt
+++ b/build.sbt
@@ -17,9 +17,10 @@ lazy val `play-doc` = (project in file("."))
   )
 
 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(

From 7f86a207a487a7ec4b1756dfcdd418fe6429a39d Mon Sep 17 00:00:00 2001
From: Matthias Kurz <m.kurz@irregular.at>
Date: Thu, 29 Sep 2022 12:07:12 +0200
Subject: [PATCH 2/3] Drop Java 8

---
 .github/workflows/build-test.yml | 8 ++++----
 .github/workflows/publish.yml    | 2 +-
 build.sbt                        | 9 ++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index b3a38bf..bfc37cf 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -15,7 +15,7 @@ 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
 
@@ -23,9 +23,9 @@ jobs:
     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
+      java: 17, 11
       scala: 2.12.15, 2.13.8
       cmd: sbt ++$MATRIX_SCALA test
 
@@ -34,4 +34,4 @@ jobs:
     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
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 9e99930..92e6f54 100644
--- a/.github/workflows/publish.yml
+++ b/.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
diff --git a/build.sbt b/build.sbt
index f936f04..9687eda 100644
--- a/build.sbt
+++ b/build.sbt
@@ -24,16 +24,15 @@ libraryDependencies ++= Seq(
 )
 
 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",

From 57e2e8d2ae308e0291184dbaf00bc39718cdaade Mon Sep 17 00:00:00 2001
From: Matthias Kurz <m.kurz@irregular.at>
Date: Thu, 29 Sep 2022 15:13:14 +0200
Subject: [PATCH 3/3] Upgrade interplay

---
 .github/workflows/build-test.yml | 2 +-
 build.sbt                        | 2 +-
 project/plugins.sbt              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index bfc37cf..efa9cc8 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -26,7 +26,7 @@ jobs:
     uses: playframework/.github/.github/workflows/cmd.yml@v3
     with:
       java: 17, 11
-      scala: 2.12.15, 2.13.8
+      scala: 2.12.17, 2.13.9
       cmd: sbt ++$MATRIX_SCALA test
 
   finish:
diff --git a/build.sbt b/build.sbt
index 9687eda..fd6527a 100644
--- a/build.sbt
+++ b/build.sbt
@@ -11,7 +11,7 @@ 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)
   )
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 6aa50c4..4ce1aec 100644
--- a/project/plugins.sbt
+++ b/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")