From 5de5197aea2b9278dbab0088545ea2de18a3d9e0 Mon Sep 17 00:00:00 2001
From: Matthias Kurz <m.kurz@irregular.at>
Date: Thu, 29 Sep 2022 15:38:23 +0200
Subject: [PATCH 1/4] Drop Java 8

---
 .github/workflows/build-test.yml | 14 +++++++-------
 .github/workflows/publish.yml    |  2 +-
 project/Common.scala             |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 8fa68bde..71fd56c7 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -15,19 +15,19 @@ 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
 
   check-binary-compatibility:
     name: Binary Compatibility
-    uses: playframework/.github/.github/workflows/binary-check.yml@v2
+    uses: playframework/.github/.github/workflows/binary-check.yml@v3
 
   check-docs:
     name: Docs
-    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.11.x, 2.12.x, 2.13.x # TODO: 3.x (other play modules not ok)
       cmd: sbt ++$MATRIX_SCALA docs/test
 
@@ -37,9 +37,9 @@ jobs:
       - "check-code-style"
       - "check-binary-compatibility"
       - "check-docs"
-    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.11.x, 2.12.x, 2.13.x, 3.x
       cmd: sbt ++$MATRIX_SCALA publishLocal test
 
@@ -48,4 +48,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 9e999302..92e6f544 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/project/Common.scala b/project/Common.scala
index a0873a41..b1d825c9 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -40,7 +40,7 @@ object Common extends AutoPlugin {
     scalacOptions ++= Seq("-Xfatal-warnings"),
     scalacOptions ++= {
       if (scalaBinaryVersion.value != "3") {
-        Seq("-target:jvm-1.8", "-Xlint", "-g:vars")
+        Seq("-release", "11", "-Xlint", "-g:vars")
       } else {
         Seq.empty
       }

From 4da26b872f368a5ecee4b96aa7f2a5fcc031fe7d Mon Sep 17 00:00:00 2001
From: Matthias Kurz <m.kurz@irregular.at>
Date: Thu, 29 Sep 2022 15:49:56 +0200
Subject: [PATCH 2/4] CMS garbage collector was removed in Java 14

---
 .jvmopts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.jvmopts b/.jvmopts
index d8253be3..e7d74476 100644
--- a/.jvmopts
+++ b/.jvmopts
@@ -1,3 +1,2 @@
 -Xss2M
--XX:+CMSClassUnloadingEnabled
 -XX:ReservedCodeCacheSize=192m

From 5ec9415b6d5dd07e82113c6af8cdfbef8123427a Mon Sep 17 00:00:00 2001
From: Matthias Kurz <m.kurz@irregular.at>
Date: Thu, 29 Sep 2022 18:01:54 +0200
Subject: [PATCH 3/4] -release flag not availabe in Scala 2.11

---
 project/Common.scala | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/project/Common.scala b/project/Common.scala
index b1d825c9..b5173811 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -40,7 +40,14 @@ object Common extends AutoPlugin {
     scalacOptions ++= Seq("-Xfatal-warnings"),
     scalacOptions ++= {
       if (scalaBinaryVersion.value != "3") {
-        Seq("-release", "11", "-Xlint", "-g:vars")
+        Seq("-Xlint", "-g:vars")
+      } else {
+        Seq.empty
+      }
+    },
+    scalacOptions ++= {
+      if (scalaBinaryVersion.value != "2.11") {
+        Seq("-release", "11")
       } else {
         Seq.empty
       }

From 62884f6a1331be1578df2f9c27b36194f44df3a7 Mon Sep 17 00:00:00 2001
From: Matthias Kurz <m.kurz@irregular.at>
Date: Thu, 29 Sep 2022 18:37:26 +0200
Subject: [PATCH 4/4] Pull in new Guice version for Java 17 support

---
 build.sbt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index dd55f275..1b56d185 100644
--- a/build.sbt
+++ b/build.sbt
@@ -371,7 +371,8 @@ lazy val docs = project
     libraryDependencies ++= Seq(
       "com.typesafe.play" %% "play-jdbc"   % playVer.value % Test,
       "com.typesafe.play" %% "play-specs2" % playVer.value % Test,
-      "com.h2database"     % "h2"          % "1.4.199"
+      "com.google.inject" % "guice" % "5.1.0" % Test, // TODO: Remove when depending on play-jdbc/-specs2 2.8.x+
+      "com.h2database"    % "h2"    % "1.4.199"
     )
   )
   .dependsOn(`anorm-core`)