From e2cee5e9519497996097991ea3ca9670cdc44a32 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Thu, 2 May 2024 23:58:33 +0200 Subject: [PATCH 1/3] Preparations on main for 3.0.x branch --- .github/dependabot.yml | 7 +++++++ .github/scala-steward.conf | 9 --------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 1ee3bf70..d120711f 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 9354ee83..fa748739 100644 --- a/.github/scala-steward.conf +++ b/.github/scala-steward.conf @@ -7,13 +7,4 @@ pullRequests.grouping = [ ] updates.pin = [ - { groupId = "org.apache.pekko", artifactId="pekko-stream", version = "1.0." }, - { groupId = "org.apache.pekko", artifactId="pekko-http", version = "1.0." }, - { groupId = "org.playframework", artifactId = "cachecontrol", version = "3.0." }, - { groupId = "org.playframework", artifactId = "play-json", version = "3.0." }, - { groupId = "org.playframework", artifactId = "play-netty-server", version = "3.0." }, - { groupId = "org.specs2", version = "4.20." }, - { groupId = "com.eed3si9n", artifactId = "sbt-assembly", version = "2.1." }, - { groupId = "org.scala-lang.modules", artifactId = "scala-xml", version = "2.2." }, - { groupId = "org.scala-lang.modules", artifactId = "scala-xml_sjs1", version = "2.2." } ] From 85d4aa95efffb0550e9512d0576a3e05cc4d6b49 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Fri, 3 May 2024 00:31:54 +0200 Subject: [PATCH 2/3] We are targeting JVM 17 --- .github/workflows/build-test.yml | 2 +- build.sbt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 39423436..90791359 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -37,7 +37,7 @@ jobs: - "check-docs" uses: playframework/.github/.github/workflows/cmd.yml@v3 with: - java: 21, 17, 11 + java: 21, 17 scala: 2.13.x, 3.x cmd: sbt ++$MATRIX_SCALA 'testOnly -- xonly timefactor 5' diff --git a/build.sbt b/build.sbt index 7b47c002..9e05e7bc 100644 --- a/build.sbt +++ b/build.sbt @@ -24,7 +24,7 @@ Global / onLoad := (Global / onLoad).value.andThen { s => val javacSettings = Seq( "--release", - "11", + "17", "-Xlint:deprecation", "-Xlint:unchecked" ) @@ -34,7 +34,7 @@ val scalacOpts = Def.setting[Seq[String]] { val common = Seq( "-release", - "11", + "17", "-deprecation", "-encoding", "UTF-8", From ef1eea39317cec8a25cad8c1a64498d9d7cb3cc8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Mar 2024 23:07:56 +0000 Subject: [PATCH 3/3] Bump playframework/.github from 3 to 4 Bumps [playframework/.github](https://github.com/playframework/.github) from 3 to 4. - [Release notes](https://github.com/playframework/.github/releases) - [Commits](https://github.com/playframework/.github/compare/v3...v4) --- updated-dependencies: - dependency-name: playframework/.github dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-test.yml | 10 +++++----- .github/workflows/publish.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 90791359..6b99248f 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -15,17 +15,17 @@ concurrency: jobs: check-code-style: name: Code Style - uses: playframework/.github/.github/workflows/cmd.yml@v3 + uses: playframework/.github/.github/workflows/cmd.yml@v4 with: cmd: sbt validateCode 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: sbt doc @@ -35,7 +35,7 @@ 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 scala: 2.13.x, 3.x @@ -46,4 +46,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 index db1edc72..ded11b27 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -9,5 +9,5 @@ on: jobs: publish-artifacts: name: Publish / Artifacts - uses: playframework/.github/.github/workflows/publish.yml@v3 + uses: playframework/.github/.github/workflows/publish.yml@v4 secrets: inherit