Merge pull request #1031 from mkurz/3.0.x_branch_preps

Preparations on main for 3.0.x branch

.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:

.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." }
 ]

.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
 

.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

build.sbt

@@ -51,15 +51,15 @@ def playJsonMimaSettings = Seq(
 
 val javacSettings = Seq(
   "-source",
-  "11",
+  "17",
   "-Xlint:deprecation",
   "-Xlint:unchecked",
 )
 
 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.