Merge pull request #778 from mkurz/2.0.x_branch_preps

Preparations on main for 2.0.x branch
playframework · Jun 27, 2024 · c62a9d6 · c62a9d6
2 parents 0354391 + aa27a83
commit c62a9d6
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 22 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -4,14 +4,31 @@ updates:
     directory: "gradle-twirl"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "gradle"
+    directory: "gradle-twirl"
+    schedule:
+      interval: "weekly"
+    target-branch: "2.0.x"
   - package-ecosystem: "maven"
     directory: "maven-twirl"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "maven"
+    directory: "maven-twirl"
+    schedule:
+      interval: "weekly"
+    target-branch: "2.0.x"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
+    target-branch: "2.0.x"
+    commit-message:
+      prefix: "[2.0.x] "
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

diff --git a/.github/scala-steward.conf b/.github/scala-steward.conf
@@ -12,13 +12,4 @@ buildRoots = [
 ]
 
 updates.pin = [
-  { groupId = "org.playframework", artifactId = "play-docs-sbt-plugin", version = "3.0." },
-  { groupId = "org.playframework", artifactId = "play-docs", version = "3.0." },
-  { groupId = "org.playframework", artifactId = "play-test", version = "3.0." },
-  { groupId = "org.playframework", artifactId = "play-specs2", version = "3.0." },
-  { groupId = "org.scala-lang.modules", artifactId = "scala-xml", version = "2.2." },
-  { groupId = "org.scala-lang.modules", artifactId = "scala-xml_sjs1", version = "2.2." },
-  { groupId = "org.scalatest", version = "3.2." },
-  { groupId = "org.scala-js", version = "1.15." },
-  { groupId = "org.portable-scala", version = "1.3." }
 ]
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -16,13 +16,13 @@ jobs:
   # Run Gradle Wrapper Validation to verify the wrapper's checksum
   gradle-validation:
     name: Gradle Wrapper
-    uses: playframework/.github/.github/workflows/gradle-wrapper-validation.yml@v3
+    uses: playframework/.github/.github/workflows/gradle-wrapper-validation.yml@v4
 
   check-code-style:
     name: Code Style
     needs:
       - "gradle-validation"
-    uses: playframework/.github/.github/workflows/cmd.yml@v3
+    uses: playframework/.github/.github/workflows/cmd.yml@v4
     with:
       gradle-build-root: gradle-twirl
       cmd: |
@@ -32,11 +32,11 @@ jobs:
 
   check-binary-compatibility:
     name: Binary Compatibility
-    uses: playframework/.github/.github/workflows/binary-check.yml@v3
+    uses: playframework/.github/.github/workflows/binary-check.yml@v4
 
   check-docs:
     name: Docs
-    uses: playframework/.github/.github/workflows/cmd.yml@v3
+    uses: playframework/.github/.github/workflows/cmd.yml@v4
     with:
       cmd: |
         cd docs
@@ -48,9 +48,9 @@ jobs:
       - "check-code-style"
       - "check-binary-compatibility"
       - "check-docs"
-    uses: playframework/.github/.github/workflows/cmd.yml@v3
+    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
       gradle-build-root: gradle-twirl
@@ -60,4 +60,4 @@ jobs:
     if: github.event_name == 'pull_request'
     needs: # Should be last
       - "tests"
-    uses: playframework/.github/.github/workflows/rtm.yml@v3
+    uses: playframework/.github/.github/workflows/rtm.yml@v4
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -10,7 +10,7 @@ jobs:
   publish-snapshot-artifacts:
     name: Publish / Artifacts (Snapshot)
     if: github.ref_type == 'branch' # Snapshots
-    uses: playframework/.github/.github/workflows/publish.yml@v3
+    uses: playframework/.github/.github/workflows/publish.yml@v4
     with:
       gradle-build-root: gradle-twirl
       cmd: |
@@ -22,13 +22,13 @@ jobs:
   publish-release:
     name: Publish / Artifacts (Stable Release)
     if: github.ref_type == 'tag' # Releases
-    uses: playframework/.github/.github/workflows/publish.yml@v3
+    uses: playframework/.github/.github/workflows/publish.yml@v4
     secrets: inherit
 
   publish-release-gradle:
     name: Publish / Artifacts (Stable Gradle Plugin)
     if: github.ref_type == 'tag' # Releases
-    uses: playframework/.github/.github/workflows/publish.yml@v3
+    uses: playframework/.github/.github/workflows/publish.yml@v4
     with:
       gradle-build-root: gradle-twirl
       cmd: |

diff --git a/maven-twirl/src/maven-test/simple/pom.xml b/maven-twirl/src/maven-test/simple/pom.xml
@@ -9,7 +9,7 @@
   <version>1.0.0-SNAPSHOT</version>
 
   <properties>
-    <java.version>11</java.version>
+    <java.version>17</java.version>
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <maven.compiler.source>${java.version}</maven.compiler.source>
   </properties>

diff --git a/project/Common.scala b/project/Common.scala
@@ -21,7 +21,7 @@ object Common extends AutoPlugin {
     "UTF-8",
     "-Xlint:-options",
     "--release",
-    "11",
+    "17",
     "-Xlint:deprecation",
     "-Xlint:unchecked"
   )
@@ -38,7 +38,7 @@ object Common extends AutoPlugin {
     CrossVersion.partialVersion(version) match {
       case Some((2, n)) if n < 12 =>
         scalacParameters ++ Seq(
-          "-release:11",
+          "-release:17",
           "-Ywarn-unused:imports",
           "-Xlint:nullary-unit",
           "-Xlint",