From 9a1f0de9cd0401adba662598833f038b80a303c7 Mon Sep 17 00:00:00 2001
From: Matthias Kurz <m.kurz@irregular.at>
Date: Fri, 3 May 2024 15:01:30 +0200
Subject: [PATCH 1/2] Preparations on main for 3.0.x branch

---
 .github/dependabot.yml     |  7 +++++++
 .github/scala-steward.conf | 10 ----------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index ca2061c4..310db144 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,6 +4,13 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "3.0.x"
+    commit-message:
+      prefix: "[3.0.x] "
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
diff --git a/.github/scala-steward.conf b/.github/scala-steward.conf
index f7e0b48b..e53600f0 100644
--- a/.github/scala-steward.conf
+++ b/.github/scala-steward.conf
@@ -14,14 +14,4 @@ updates.ignore = [
 ]
 
 updates.pin = [
-  { groupId = "org.playframework", artifactId = "play-docs-sbt-plugin", version = "3.0." },
-  { groupId = "org.playframework", artifactId = "play-docs", version = "3.0." },
-  { groupId = "com.fasterxml.jackson.core", version = "2.14." },
-  { groupId = "com.fasterxml.jackson.datatype", version = "2.14." },
-  { groupId = "org.scala-native", artifactId = "sbt-scala-native", version = "0.4." },
-  { groupId = "org.scala-native", artifactId = "nscplugin", version = "0.4." },
-  { groupId = "org.scala-js", version = "1.15." },
-  { groupId = "org.portable-scala", version = "1.3." },
-  { groupId = "org.specs2", version = "4.20." },
-  { groupId = "org.scalacheck", artifactId = "scalacheck", version = "1.17.0." }
 ]

From 9215fb0cce4c56c5bc3535737975e58e9c27c9d0 Mon Sep 17 00:00:00 2001
From: Matthias Kurz <m.kurz@irregular.at>
Date: Thu, 27 Jun 2024 13:05:48 +0200
Subject: [PATCH 2/2] We are targeting JVM 17 (and 21 for tests)

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

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index c15809bb..3490cc6d 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -22,14 +22,11 @@ jobs:
   check-binary-compatibility:
     name: Binary Compatibility
     uses: playframework/.github/.github/workflows/binary-check.yml@v4
-    with:
-      java: 11
 
   check-docs:
     name: Docs
     uses: playframework/.github/.github/workflows/cmd.yml@v4
     with:
-      java: 11
       cmd: sbt docs/validateDocs
 
   tests:
@@ -40,7 +37,7 @@ jobs:
       - "check-docs"
     uses: playframework/.github/.github/workflows/cmd.yml@v4
     with:
-      java: 21, 17, 11
+      java: 21, 17
       scala: 2.12.x, 2.13.x, 3.x
       cmd: scripts/test-code.sh
 
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 481bed9f..ded11b27 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -10,6 +10,4 @@ jobs:
   publish-artifacts:
     name: Publish / Artifacts
     uses: playframework/.github/.github/workflows/publish.yml@v4
-    with:
-      java: 11
     secrets: inherit
diff --git a/build.sbt b/build.sbt
index f5345e3b..c96ed862 100644
--- a/build.sbt
+++ b/build.sbt
@@ -51,7 +51,7 @@ def playJsonMimaSettings = Seq(
 
 val javacSettings = Seq(
   "-source",
-  "11",
+  "17",
   "-Xlint:deprecation",
   "-Xlint:unchecked",
 )
@@ -59,7 +59,7 @@ val javacSettings = Seq(
 val scalacOpts = Seq(
   "-language:higherKinds",
   "-release",
-  "11",
+  "17",
   "-Ywarn-unused:imports",
   "-Xlint:nullary-unit",
   "-Xlint",
@@ -96,7 +96,7 @@ lazy val commonSettings = Def.settings(
   crossScalaVersions := Seq(Dependencies.Scala212, Dependencies.Scala213, Dependencies.Scala3),
   Compile / javacOptions ++= javacSettings,
   Test / javacOptions ++= javacSettings,
-  Compile / compile / javacOptions ++= Seq("--release", "11"), // sbt #1785, avoids passing to javadoc
+  Compile / compile / javacOptions ++= Seq("--release", "17"), // sbt #1785, avoids passing to javadoc
   scalacOptions ++= (if (isScala3.value) Nil else scalacOpts),
   Compile / doc / scalacOptions ++= Seq(
     // Work around 2.12 bug which prevents javadoc in nested java classes from compiling.