From 8a9a457ef45c82af9654de73bec9d1f95e5047d8 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Thu, 27 Jun 2024 10:59:43 +0200 Subject: [PATCH 01/81] Setup 3.0.x branch --- .github/dependabot.yml | 13 ------------- .github/scala-steward.conf | 4 ++-- .github/workflows/build-test.yml | 2 +- .github/workflows/dependency-graph.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/release-drafter.yml | 4 ++-- 6 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index b3e0cb6..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,13 +0,0 @@ -version: 2 -updates: - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "weekly" - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "weekly" - target-branch: "2.3.x" - commit-message: - prefix: "[2.3.x] " diff --git a/.github/scala-steward.conf b/.github/scala-steward.conf index c17dba6..e4826a9 100644 --- a/.github/scala-steward.conf +++ b/.github/scala-steward.conf @@ -1,7 +1,7 @@ pullRequests.frequency = "@monthly" -commits.message = "${artifactName} ${nextVersion} (was ${currentVersion})" +commits.message = "[3.0.x] ${artifactName} ${nextVersion} (was ${currentVersion})" pullRequests.grouping = [ - { name = "patches", "title" = "Patch updates", "filter" = [{"version" = "patch"}] } + { name = "patches", "title" = "[3.0.x] Patch updates", "filter" = [{"version" = "patch"}] } ] diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 4f08498..3be3389 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -5,7 +5,7 @@ on: push: branches: - - main # Check branch after merge + - 3.0.x # Check branch after merge concurrency: # Only run once for latest commit per ref and cancel other (previous) runs. diff --git a/.github/workflows/dependency-graph.yml b/.github/workflows/dependency-graph.yml index df0daa3..c9fe360 100644 --- a/.github/workflows/dependency-graph.yml +++ b/.github/workflows/dependency-graph.yml @@ -2,7 +2,7 @@ name: Dependency Graph on: push: branches: - - main + - 3.0.x concurrency: # Only run once for latest commit per ref and cancel other (previous) runs. diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index db1edc7..3c87054 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -3,7 +3,7 @@ name: Publish on: push: branches: # Snapshots - - main + - 3.0.x tags: ["**"] # Releases jobs: diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index eb1a1fa..bdd0ce1 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -3,7 +3,7 @@ name: Release Drafter on: push: branches: - - main + - 3.0.x jobs: update_release_draft: @@ -12,7 +12,7 @@ jobs: - uses: release-drafter/release-drafter@v6 with: name: "cachecontrol $RESOLVED_VERSION" - config-name: release-drafts/increasing-minor-version.yml # located in .github/ in the default branch within this or the .github repo + config-name: release-drafts/increasing-patch-version.yml # located in .github/ in the default branch within this or the .github repo commitish: ${{ github.ref_name }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 004ef5abeae994a57a6cc895282f78ab4c5d39be Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 28 Jun 2024 18:31:26 +0000 Subject: [PATCH 02/81] [3.0.x] scalafmt-core 3.8.2 (was 3.8.1) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index f30b359..322ee93 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -13,4 +13,4 @@ rewrite.rules = [ AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifi rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abstract", "implicit", "override", "lazy" ] spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in import x.{ yyy } trailingCommas = preserve -version = 3.8.1 +version = 3.8.2 From 24d27df2e02f18eac388b101b9629b58831df693 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 28 Jun 2024 18:31:42 +0000 Subject: [PATCH 03/81] [3.0.x] scalatest 3.2.19 (was 3.2.18) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 8536dd2..c2c8701 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -10,7 +10,7 @@ object Dependencies { val ScalaVersions = Seq(Scala212, Scala213, Scala3) - def scalaTest = "org.scalatest" %% "scalatest" % "3.2.18" % Test + def scalaTest = "org.scalatest" %% "scalatest" % "3.2.19" % Test def parserCombinators(scalaVersion: String) = "org.scala-lang.modules" %% "scala-parser-combinators" % { From 5141b51c3b52056e352e6e4b2ba06f565f83948a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 29 Jul 2024 21:17:44 +0000 Subject: [PATCH 04/81] [3.0.x] sbt 1.10.1 (was 1.10.0) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 1894b62..7a3fbb3 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ # # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. # -sbt.version=1.10.0 +sbt.version=1.10.1 From ec21d38987ecb68793002c2e061837323b8614f0 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 29 Jul 2024 21:17:46 +0000 Subject: [PATCH 05/81] [3.0.x] scalafmt-core 3.8.3 (was 3.8.2) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 322ee93..c89528a 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -13,4 +13,4 @@ rewrite.rules = [ AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifi rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abstract", "implicit", "override", "lazy" ] spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in import x.{ yyy } trailingCommas = preserve -version = 3.8.2 +version = 3.8.3 From 74504eabba695079dc83931746f073bc5eeb9a38 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 29 Jul 2024 21:18:00 +0000 Subject: [PATCH 06/81] Reformat with scalafmt 3.8.3 Executed command: scalafmt --non-interactive --- .../org/playframework/cachecontrol/CacheDirectiveParser.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/scala/org/playframework/cachecontrol/CacheDirectiveParser.scala b/src/main/scala/org/playframework/cachecontrol/CacheDirectiveParser.scala index 81774d9..5454116 100644 --- a/src/main/scala/org/playframework/cachecontrol/CacheDirectiveParser.scala +++ b/src/main/scala/org/playframework/cachecontrol/CacheDirectiveParser.scala @@ -34,7 +34,6 @@ object CacheDirectiveParser { // http://bitwalker.org/blog/2013/08/10/learn-by-example-scala-parser-combinators/ // https://wiki.scala-lang.org/display/SW/Parser+Combinators--Getting+Started // http://www.bizcoder.com/everything-you-need-to-know-about-http-header-syntax-but-were-afraid-to-ask - import CacheDirectives._ private val logger = LoggerFactory.getLogger("org.playframework.cachecontrol.CacheControlParser") From 74cd82566c868d5beadfbf3b05618283e361474b Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 29 Jul 2024 21:18:00 +0000 Subject: [PATCH 07/81] Add 'Reformat with scalafmt 3.8.3' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..0c5c235 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.8.3 +74504eabba695079dc83931746f073bc5eeb9a38 From 8e1549df607c8393b6298255034a9a04faaeb574 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 29 Aug 2024 17:19:37 +0000 Subject: [PATCH 08/81] [3.0.x] sbt-ci-release 1.6.1 (was 1.5.12) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 3b3efaa..d404a21 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,4 +2,4 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3") addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.1") From 071a661a4df71b1dea83eed4be627e1b4c206eb6 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 29 Aug 2024 17:19:44 +0000 Subject: [PATCH 09/81] [3.0.x] sbt-mima-plugin 1.1.4 (was 1.1.3) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 3b3efaa..fc429cc 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4") addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") From 25503d405fe7a40cadfb01d8184edfc31386965d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 29 Aug 2024 17:19:49 +0000 Subject: [PATCH 10/81] [3.0.x] slf4j-api 2.0.16 (was 2.0.13) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c2c8701..f4a3979 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -20,7 +20,7 @@ object Dependencies { } } - val slf4jVersion = "2.0.13" + val slf4jVersion = "2.0.16" val slf4j = "org.slf4j" % "slf4j-api" % slf4jVersion val slf4jSimple = "org.slf4j" % "slf4j-simple" % slf4jVersion } From 87a4c48571e375d7fd46466e5c911d396c55477d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 28 Sep 2024 20:51:25 +0000 Subject: [PATCH 11/81] [3.0.x] scala-library 2.12.20 (was 2.12.19) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index f4a3979..6c29d69 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,7 +4,7 @@ import sbt._ object Dependencies { - val Scala212 = "2.12.19" + val Scala212 = "2.12.20" val Scala213 = "2.13.14" val Scala3 = "3.3.3" From 24c3f653d40723849cae5f7231f4f5880bca573e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 28 Sep 2024 20:51:28 +0000 Subject: [PATCH 12/81] [3.0.x] scala-library 2.13.15 (was 2.13.14) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 6c29d69..ece3810 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -5,7 +5,7 @@ import sbt._ object Dependencies { val Scala212 = "2.12.20" - val Scala213 = "2.13.14" + val Scala213 = "2.13.15" val Scala3 = "3.3.3" val ScalaVersions = Seq(Scala212, Scala213, Scala3) From a377a3a4f03ffab255cccd84c4b246f9db6629a8 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 28 Sep 2024 20:51:32 +0000 Subject: [PATCH 13/81] [3.0.x] scala3-library 3.3.4 (was 3.3.3) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ece3810..af86d96 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -6,7 +6,7 @@ import sbt._ object Dependencies { val Scala212 = "2.12.20" val Scala213 = "2.13.15" - val Scala3 = "3.3.3" + val Scala3 = "3.3.4" val ScalaVersions = Seq(Scala212, Scala213, Scala3) From a7542a2aa971534152e7b9941523dabf564df1f5 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 28 Sep 2024 20:51:34 +0000 Subject: [PATCH 14/81] [3.0.x] sbt 1.10.2 (was 1.10.1) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 7a3fbb3..6e08e6c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ # # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. # -sbt.version=1.10.1 +sbt.version=1.10.2 From afbfc3f6d7350cd5840962e2a5b771f3d1f64b57 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 30 Oct 2024 22:32:12 +0000 Subject: [PATCH 15/81] [3.0.x] sbt-ci-release 1.9.0 (was 1.6.1) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 144078e..9bb265e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,4 +2,4 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4") addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.1") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.0") From 3a5754d2d0017dc9f326a4889de71b6ffd2f10eb Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 30 Oct 2024 22:32:22 +0000 Subject: [PATCH 16/81] [3.0.x] sbt 1.10.4 (was 1.10.2) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 6e08e6c..51aad33 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ # # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. # -sbt.version=1.10.2 +sbt.version=1.10.4 From 551c5078ff6c41a21e23271aa3349febd7e93d7a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 1 Dec 2024 22:13:48 +0000 Subject: [PATCH 17/81] [3.0.x] sbt 1.10.6 (was 1.10.4) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 51aad33..38aeeb1 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ # # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. # -sbt.version=1.10.4 +sbt.version=1.10.6 From ef16128502ced4a328bc948a880330cad3ed1546 Mon Sep 17 00:00:00 2001 From: Sergey Morgunov Date: Sat, 28 Dec 2024 15:20:49 +0300 Subject: [PATCH 18/81] Fix `Dependency Graph` action (cherry picked from commit 5d8734ab5283a6d89232ebe45997f11605ecd802) --- .github/workflows/dependency-graph.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dependency-graph.yml b/.github/workflows/dependency-graph.yml index c9fe360..61cae1a 100644 --- a/.github/workflows/dependency-graph.yml +++ b/.github/workflows/dependency-graph.yml @@ -21,4 +21,5 @@ jobs: with: fetch-depth: 0 ref: ${{ inputs.ref }} + - uses: sbt/setup-sbt@v1 - uses: scalacenter/sbt-dependency-submission@v3 From 8e79478cced112b2a171803e62fec9883531c08a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 2 Jan 2025 17:20:12 +0000 Subject: [PATCH 19/81] [3.0.x] sbt-ci-release 1.9.2 (was 1.9.0) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 9bb265e..45147bf 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,4 +2,4 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4") addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.0") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2") From 26c53bcd1b3cceccd0b239a890be95a403700899 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 2 Jan 2025 17:20:14 +0000 Subject: [PATCH 20/81] [3.0.x] sbt 1.10.7 (was 1.10.6) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 38aeeb1..f667f13 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ # # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. # -sbt.version=1.10.6 +sbt.version=1.10.7 From cffbd5bcb7ec1a4b753872ab5eca63de14d0404b Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 4 Feb 2025 03:12:04 +0000 Subject: [PATCH 21/81] [3.0.x] scala-library 2.13.16 (was 2.13.15) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index af86d96..1a9bba3 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -5,7 +5,7 @@ import sbt._ object Dependencies { val Scala212 = "2.12.20" - val Scala213 = "2.13.15" + val Scala213 = "2.13.16" val Scala3 = "3.3.4" val ScalaVersions = Seq(Scala212, Scala213, Scala3) From 6edd38b2fe34b73bd164e2349fa5acb83e479ed5 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 4 Feb 2025 03:12:10 +0000 Subject: [PATCH 22/81] [3.0.x] scala3-library 3.3.5 (was 3.3.4) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 1a9bba3..b8bd3c1 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -6,7 +6,7 @@ import sbt._ object Dependencies { val Scala212 = "2.12.20" val Scala213 = "2.13.16" - val Scala3 = "3.3.4" + val Scala3 = "3.3.5" val ScalaVersions = Seq(Scala212, Scala213, Scala3) From 95c40f8ac3d026375fe2e852724caf807056dc08 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 4 Feb 2025 03:12:16 +0000 Subject: [PATCH 23/81] [3.0.x] sbt-scalafmt 2.5.4 (was 2.5.2) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 45147bf..ce241fa 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4") addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2") From 086b8fdbf26ab3fb64d3a3a9df1ad4a56416ed70 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 4 Feb 2025 03:12:19 +0000 Subject: [PATCH 24/81] [3.0.x] scalafmt-core 3.8.6 (was 3.8.3) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index c89528a..5265157 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -13,4 +13,4 @@ rewrite.rules = [ AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifi rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abstract", "implicit", "override", "lazy" ] spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in import x.{ yyy } trailingCommas = preserve -version = 3.8.3 +version = 3.8.6 From 7ae424d0a3af467d77fdd191082cb9fa897df25a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 7 Mar 2025 23:50:45 +0000 Subject: [PATCH 25/81] [3.0.x] scalafmt-core 3.9.3 (was 3.8.6) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 5265157..820ff26 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -13,4 +13,4 @@ rewrite.rules = [ AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifi rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abstract", "implicit", "override", "lazy" ] spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in import x.{ yyy } trailingCommas = preserve -version = 3.8.6 +version = 3.9.3 From 59b798bfd0aac2b1429727f1e9c8d89a83239702 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 7 Mar 2025 23:51:10 +0000 Subject: [PATCH 26/81] [3.0.x] sbt 1.10.10 (was 1.10.7) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index f667f13..fb5fef3 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ # # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. # -sbt.version=1.10.7 +sbt.version=1.10.10 From 891df5f7fbaad9ddf360aa398d1ed165ba564192 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 7 Mar 2025 23:51:18 +0000 Subject: [PATCH 27/81] [3.0.x] slf4j-api 2.0.17 (was 2.0.16) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index b8bd3c1..f3aa72b 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -20,7 +20,7 @@ object Dependencies { } } - val slf4jVersion = "2.0.16" + val slf4jVersion = "2.0.17" val slf4j = "org.slf4j" % "slf4j-api" % slf4jVersion val slf4jSimple = "org.slf4j" % "slf4j-simple" % slf4jVersion } From 52ba3b2b1a043945bb388bc7a58522ef2ff1817f Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 8 Apr 2025 20:57:44 +0000 Subject: [PATCH 28/81] [3.0.x] sbt-ci-release 1.9.3 (was 1.9.2) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index ce241fa..3ef2be8 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,4 +2,4 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4") addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4") -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.3") From a061f76aa9d93847bed63a65bd96790819eaf720 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 8 Apr 2025 20:57:48 +0000 Subject: [PATCH 29/81] [3.0.x] sbt 1.10.11 (was 1.10.10) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index fb5fef3..07e2b8f 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ # # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. # -sbt.version=1.10.10 +sbt.version=1.10.11 From 1c279e3a87b27ea23de12a8437e753e006ef13d5 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 8 Apr 2025 20:57:49 +0000 Subject: [PATCH 30/81] [3.0.x] scalafmt-core 3.9.4 (was 3.9.3) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 820ff26..1ec490b 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -13,4 +13,4 @@ rewrite.rules = [ AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifi rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abstract", "implicit", "override", "lazy" ] spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in import x.{ yyy } trailingCommas = preserve -version = 3.9.3 +version = 3.9.4 From 87bf9ed1751aa23059e20b4530f334b44aa63a5d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 9 May 2025 09:08:54 +0000 Subject: [PATCH 31/81] [3.0.x] sbt-java-formatter 0.10.0 (was 0.8.0) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 3ef2be8..42f938b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4") -addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0") +addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.10.0") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.3") From 0f66238498e366be284d7702d7ae7e9e3ec885cc Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 9 May 2025 09:10:17 +0000 Subject: [PATCH 32/81] [3.0.x] scala3-library 3.3.6 (was 3.3.5) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index f3aa72b..813d649 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -6,7 +6,7 @@ import sbt._ object Dependencies { val Scala212 = "2.12.20" val Scala213 = "2.13.16" - val Scala3 = "3.3.5" + val Scala3 = "3.3.6" val ScalaVersions = Seq(Scala212, Scala213, Scala3) From 0d527065fd18395ef4d234db1e82cb6ca965c290 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 9 May 2025 09:10:20 +0000 Subject: [PATCH 33/81] [3.0.x] scalafmt-core 3.9.6 (was 3.9.4) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 1ec490b..4922e67 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -13,4 +13,4 @@ rewrite.rules = [ AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifi rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abstract", "implicit", "override", "lazy" ] spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in import x.{ yyy } trailingCommas = preserve -version = 3.9.4 +version = 3.9.6 From 0f0f9b1914cbba0c9f1b7a1f77e666dce74fb1ab Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 9 Jun 2025 22:04:51 +0000 Subject: [PATCH 34/81] [3.0.x] sbt-ci-release 1.11.1 (was 1.9.3) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 42f938b..9ac494d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,4 +2,4 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4") addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.10.0") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4") -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.3") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.1") From 0a89e54758d20fbea256c0c08a1325d545641203 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 9 Jun 2025 22:05:09 +0000 Subject: [PATCH 35/81] [3.0.x] sbt, scripted-plugin 1.11.2 (was 1.10.11) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 07e2b8f..9dab565 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ # # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. # -sbt.version=1.10.11 +sbt.version=1.11.2 From adbb0df1a16e5cafdcf4263a6d4d34eaaea7812b Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 9 Jun 2025 22:05:15 +0000 Subject: [PATCH 36/81] [3.0.x] scalafmt-core 3.9.7 (was 3.9.6) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 4922e67..723dec8 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -13,4 +13,4 @@ rewrite.rules = [ AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifi rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abstract", "implicit", "override", "lazy" ] spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in import x.{ yyy } trailingCommas = preserve -version = 3.9.6 +version = 3.9.7 From fa901af121af0329e7bfcc215f4cda57c9cb33cd Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 9 Jun 2025 22:05:38 +0000 Subject: [PATCH 37/81] Reformat with scalafmt 3.9.7 Executed command: scalafmt --non-interactive --- build.sbt | 2 +- .../cachecontrol/CacheDefaults.scala | 2 +- .../cachecontrol/CacheDirectiveParser.scala | 6 +++--- .../CacheDirectiveParserCompat.scala | 2 +- .../CacheDirectiveParserSpec.scala | 2 +- .../ResponseCachingCalculatorSpec.scala | 18 +++++++++--------- .../ResponseSelectionCalculatorSpec.scala | 2 +- .../ResponseServingcalculatorSpec.scala | 10 +++++----- .../SecondaryKeyCalculatorSpec.scala | 4 ++-- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/build.sbt b/build.sbt index 391c9af..a13624e 100644 --- a/build.sbt +++ b/build.sbt @@ -22,7 +22,7 @@ lazy val cachecontrol = (project in file(".")) slf4jSimple % Test ), mimaPreviousArtifacts := previousVersion.map(organization.value %% moduleName.value % _).toSet, - headerLicense := { + headerLicense := { Some( HeaderLicense.Custom( s"Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. " diff --git a/src/main/scala/org/playframework/cachecontrol/CacheDefaults.scala b/src/main/scala/org/playframework/cachecontrol/CacheDefaults.scala index a08a5b8..4b6f967 100644 --- a/src/main/scala/org/playframework/cachecontrol/CacheDefaults.scala +++ b/src/main/scala/org/playframework/cachecontrol/CacheDefaults.scala @@ -116,7 +116,7 @@ trait CacheDefaults extends Cache { while (nominatedHeadersIter.hasNext) { val nominatedHeaderName = nominatedHeadersIter.next() presentedHeaders.get(nominatedHeaderName) match { - case None => return false + case None => return false case Some(presentedHeaderValues) => val nominatedHeaderValues = nominatedHeaders(nominatedHeaderName) // There's a list of header values, so we need a way to normalize it. diff --git a/src/main/scala/org/playframework/cachecontrol/CacheDirectiveParser.scala b/src/main/scala/org/playframework/cachecontrol/CacheDirectiveParser.scala index 5454116..e944b31 100644 --- a/src/main/scala/org/playframework/cachecontrol/CacheDirectiveParser.scala +++ b/src/main/scala/org/playframework/cachecontrol/CacheDirectiveParser.scala @@ -52,9 +52,9 @@ object CacheDirectiveParser { * * These patterns are translated directly using the same naming */ - val ctl = acceptIf { c => (c >= 0 && c <= 0x1f) || c.toInt == 0x7f }(_ => "Expected a control character") - val char = acceptIf(_ < 0x80)(_ => "Expected an ascii character") - val text = not(ctl) ~> any + val ctl = acceptIf { c => (c >= 0 && c <= 0x1f) || c.toInt == 0x7f }(_ => "Expected a control character") + val char = acceptIf(_ < 0x80)(_ => "Expected an ascii character") + val text = not(ctl) ~> any val separators = { acceptIf(c => separatorBitSet(c.toInt))(_ => "Expected one of " + separatorChars) } diff --git a/src/main/scala/org/playframework/cachecontrol/CacheDirectiveParserCompat.scala b/src/main/scala/org/playframework/cachecontrol/CacheDirectiveParserCompat.scala index dba778f..66fee96 100644 --- a/src/main/scala/org/playframework/cachecontrol/CacheDirectiveParserCompat.scala +++ b/src/main/scala/org/playframework/cachecontrol/CacheDirectiveParserCompat.scala @@ -8,7 +8,7 @@ object CacheDirectiveParserCompat { def toImmutableSeq[T](seq: Seq[T]): scala.collection.immutable.Seq[T] = { seq match { case xs: scala.collection.immutable.Seq[T @unchecked] => xs - case _ => + case _ => val b = scala.collection.immutable.Seq.newBuilder[T] seq.iterator.foreach(b += _) b.result() diff --git a/src/test/scala/org/playframework/cachecontrol/CacheDirectiveParserSpec.scala b/src/test/scala/org/playframework/cachecontrol/CacheDirectiveParserSpec.scala index 501c898..c02ccbf 100644 --- a/src/test/scala/org/playframework/cachecontrol/CacheDirectiveParserSpec.scala +++ b/src/test/scala/org/playframework/cachecontrol/CacheDirectiveParserSpec.scala @@ -154,7 +154,7 @@ class CacheDirectiveParserSpec extends AnyWordSpec { "parse random input as cache directives" in { // include embedded commas to make things interesting... - val directives = CacheDirectiveParser.parse(Seq("""i, have, no=idea, what="I'm, doing"""")) + val directives = CacheDirectiveParser.parse(Seq("""i, have, no=idea, what="I'm, doing"""")) val badSequence = Seq( CacheDirectiveExtension("i", None), CacheDirectiveExtension("have", None), diff --git a/src/test/scala/org/playframework/cachecontrol/ResponseCachingCalculatorSpec.scala b/src/test/scala/org/playframework/cachecontrol/ResponseCachingCalculatorSpec.scala index 5b66ed6..37745ed 100644 --- a/src/test/scala/org/playframework/cachecontrol/ResponseCachingCalculatorSpec.scala +++ b/src/test/scala/org/playframework/cachecontrol/ResponseCachingCalculatorSpec.scala @@ -173,10 +173,10 @@ class ResponseCachingCalculatorSpec extends AnyWordSpec { "with qualified private and qualified no-cache response directives" should { "return DoCache with only no-cache stripped headers when private" in { import CacheDirectives._ - val policy = new ResponseCachingCalculator(privateCache) - val request: CacheRequest = defaultRequest - val noCache = NoCache(Some(List("Set-Cookie"))) - val privDirective = Private(Some(List("Some-Header"))) + val policy = new ResponseCachingCalculator(privateCache) + val request: CacheRequest = defaultRequest + val noCache = NoCache(Some(List("Set-Cookie"))) + val privDirective = Private(Some(List("Some-Header"))) val response: OriginResponse = defaultResponse.copy(headers = h(privDirective.toString + "," + noCache.toString)) val result = policy.isCacheable(request, response) @@ -185,10 +185,10 @@ class ResponseCachingCalculatorSpec extends AnyWordSpec { "return DoCache with both stripped headers when shared cache" in { import CacheDirectives._ - val policy = new ResponseCachingCalculator(sharedCache) - val request: CacheRequest = defaultRequest - val noCache = NoCache(Some(List("Set-Cookie"))) - val privDirective = Private(Some(List("Some-Header"))) + val policy = new ResponseCachingCalculator(sharedCache) + val request: CacheRequest = defaultRequest + val noCache = NoCache(Some(List("Set-Cookie"))) + val privDirective = Private(Some(List("Some-Header"))) val response: OriginResponse = defaultResponse.copy(headers = h(privDirective.toString + "," + noCache.toString)) val result = policy.isCacheable(request, response) @@ -241,7 +241,7 @@ class ResponseCachingCalculatorSpec extends AnyWordSpec { "with a containsCachableExtension" should { "return DoCacheResponse" in { - var called = false + var called = false val cacheWithExtensions = new StubCache(shared = false) { override def isCacheableExtension(extension: CacheDirectives.CacheDirectiveExtension): Boolean = { called = extension.name == "public-on-tuesday" diff --git a/src/test/scala/org/playframework/cachecontrol/ResponseSelectionCalculatorSpec.scala b/src/test/scala/org/playframework/cachecontrol/ResponseSelectionCalculatorSpec.scala index 69343d0..bffba3b 100644 --- a/src/test/scala/org/playframework/cachecontrol/ResponseSelectionCalculatorSpec.scala +++ b/src/test/scala/org/playframework/cachecontrol/ResponseSelectionCalculatorSpec.scala @@ -113,7 +113,7 @@ class ResponseSelectionCalculatorSpec extends AnyWordSpec { val policy = new ResponseSelectionCalculator(cache) val presentingHeaders = Map(HeaderName("X-Custom-Header") -> Seq("value1")) val request = defaultRequest.copy(headers = presentingHeaders) - val nominatedHeaders = + val nominatedHeaders = Map(HeaderName("X-Custom-Header") -> Seq("value1"), HeaderName("X-Custom-Header") -> Seq("value2")) val response = defaultResponse.copy(nominatedHeaders = nominatedHeaders) val action = policy.selectResponse(request, Seq(response)) diff --git a/src/test/scala/org/playframework/cachecontrol/ResponseServingcalculatorSpec.scala b/src/test/scala/org/playframework/cachecontrol/ResponseServingcalculatorSpec.scala index 62e3283..123197e 100644 --- a/src/test/scala/org/playframework/cachecontrol/ResponseServingcalculatorSpec.scala +++ b/src/test/scala/org/playframework/cachecontrol/ResponseServingcalculatorSpec.scala @@ -44,7 +44,7 @@ class ResponseServingCalculatorSpec extends AnyWordSpec { "return Validate" in { val policy = new ResponseServingCalculator(privateCache) - val request = defaultRequest.copy(headers = defaultRequest.headers ++ Map(`Cache-Control` -> Seq("no-cache"))) + val request = defaultRequest.copy(headers = defaultRequest.headers ++ Map(`Cache-Control` -> Seq("no-cache"))) val response = defaultResponse.copy(headers = defaultResponse.headers ++ Map(`Cache-Control` -> Seq("max-age=60"))) @@ -58,12 +58,12 @@ class ResponseServingCalculatorSpec extends AnyWordSpec { "return Validate" in { val policy = new ResponseServingCalculator(privateCache) - val request = defaultRequest.copy(headers = defaultRequest.headers ++ Map(`Pragma` -> Seq("no-cache"))) + val request = defaultRequest.copy(headers = defaultRequest.headers ++ Map(`Pragma` -> Seq("no-cache"))) val response = defaultResponse.copy(headers = defaultResponse.headers ++ Map(`Cache-Control` -> Seq("max-age=60"))) val action: ResponseServeAction = policy.serveResponse(request, response, Duration.ofSeconds(5)) - val msg = + val msg = "Request does not contain Cache-Control header found, but does contains no-cache Pragma header, validation required" action should be(Validate(msg)) } @@ -73,7 +73,7 @@ class ResponseServingCalculatorSpec extends AnyWordSpec { "return ServeFresh when fresh" in { val policy = new ResponseServingCalculator(privateCache) - val request = defaultRequest.copy(headers = defaultRequest.headers ++ Map(`Cache-Control` -> Seq("no-store"))) + val request = defaultRequest.copy(headers = defaultRequest.headers ++ Map(`Cache-Control` -> Seq("no-store"))) val response = defaultResponse.copy(headers = defaultResponse.headers ++ Map(`Cache-Control` -> Seq("publish,max-age=60"))) @@ -85,7 +85,7 @@ class ResponseServingCalculatorSpec extends AnyWordSpec { "return Validate when stale" in { val policy = new ResponseServingCalculator(privateCache) - val request = defaultRequest.copy(headers = defaultRequest.headers ++ Map(`Cache-Control` -> Seq("no-store"))) + val request = defaultRequest.copy(headers = defaultRequest.headers ++ Map(`Cache-Control` -> Seq("no-store"))) val response = defaultResponse.copy(headers = defaultResponse.headers ++ Map(`Cache-Control` -> Seq("publish,max-age=60"))) diff --git a/src/test/scala/org/playframework/cachecontrol/SecondaryKeyCalculatorSpec.scala b/src/test/scala/org/playframework/cachecontrol/SecondaryKeyCalculatorSpec.scala index 1d7b8ec..09619be 100644 --- a/src/test/scala/org/playframework/cachecontrol/SecondaryKeyCalculatorSpec.scala +++ b/src/test/scala/org/playframework/cachecontrol/SecondaryKeyCalculatorSpec.scala @@ -12,8 +12,8 @@ import org.scalatest.wordspec.AnyWordSpec class SecondaryKeyCalculatorSpec extends AnyWordSpec { def responseHeaders = { - val now = HttpDate.now - val age = Duration.ofSeconds(60) + val now = HttpDate.now + val age = Duration.ofSeconds(60) val headers = Map( `Date` -> Seq(HttpDate.format(now)), `Age` -> Seq(age.getSeconds.toString), From 7f4f6938da7f5c94dd73d3248747d8c59eb2d033 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 9 Jun 2025 22:05:38 +0000 Subject: [PATCH 38/81] Add 'Reformat with scalafmt 3.9.7' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 0c5c235..6cf3a47 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,5 @@ # Scala Steward: Reformat with scalafmt 3.8.3 74504eabba695079dc83931746f073bc5eeb9a38 + +# Scala Steward: Reformat with scalafmt 3.9.7 +fa901af121af0329e7bfcc215f4cda57c9cb33cd From 387c80c5557e99f4a4eaff2e68895b13a8675e35 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Sat, 5 Jul 2025 00:07:41 +0200 Subject: [PATCH 39/81] [3.0.x] sbt-scalafmt 2.5.5 (was 2.5.4) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 9ac494d..d5c4374 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4") addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.10.0") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.5") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.1") From 2dfd33fff0ee6a34b93d33d2d85249f4ed629002 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Sat, 5 Jul 2025 00:07:42 +0200 Subject: [PATCH 40/81] [3.0.x] scalafmt-core 3.9.8 (was 3.9.7) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 723dec8..0c5547f 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -13,4 +13,4 @@ rewrite.rules = [ AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifi rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abstract", "implicit", "override", "lazy" ] spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in import x.{ yyy } trailingCommas = preserve -version = 3.9.7 +version = 3.9.8 From 380770294e659b71c62db1c8937cbddbac4b41c1 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Tue, 8 Apr 2025 11:26:33 +0200 Subject: [PATCH 41/81] Remove frequency from scala steward conf (cherry picked from commit 1114a2f012d44495f16bc68f3cf8686a8e4550b3) # Conflicts: # .github/scala-steward.conf --- .github/scala-steward.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/scala-steward.conf b/.github/scala-steward.conf index e4826a9..b363832 100644 --- a/.github/scala-steward.conf +++ b/.github/scala-steward.conf @@ -1,5 +1,3 @@ -pullRequests.frequency = "@monthly" - commits.message = "[3.0.x] ${artifactName} ${nextVersion} (was ${currentVersion})" pullRequests.grouping = [ From 5dce6f4617b7719e0e5cc66e6599b78da178722b Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 7 Jul 2025 17:59:56 +0000 Subject: [PATCH 42/81] [3.0.x] sbt 1.11.3 (was 1.11.2) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 9dab565..774bf9d 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ # # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. # -sbt.version=1.11.2 +sbt.version=1.11.3 From 20b7c5a5ef358877ccf110e253e956d45a3c57bd Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 2 Aug 2025 19:27:48 +0000 Subject: [PATCH 43/81] [3.0.x] scalafmt-core 3.9.9 (was 3.9.8) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 0c5547f..225821c 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -13,4 +13,4 @@ rewrite.rules = [ AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifi rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abstract", "implicit", "override", "lazy" ] spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in import x.{ yyy } trailingCommas = preserve -version = 3.9.8 +version = 3.9.9 From c1f4342917220e68f96bb513dc67363e55eaa890 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 12 Aug 2025 16:47:02 +0000 Subject: [PATCH 44/81] [3.0.x] sbt 1.11.4 (was 1.11.3) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 774bf9d..6dbafe1 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ # # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. # -sbt.version=1.11.3 +sbt.version=1.11.4 From 31c07122d89952dacaf66e1f480c5bb6ba1cfad9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Aug 2025 14:20:29 +0000 Subject: [PATCH 45/81] [3.0.x] Bump actions/checkout from 4 to 5 Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-graph.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-graph.yml b/.github/workflows/dependency-graph.yml index 61cae1a..5462d16 100644 --- a/.github/workflows/dependency-graph.yml +++ b/.github/workflows/dependency-graph.yml @@ -17,7 +17,7 @@ jobs: name: Submit dependencies to GitHub runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: fetch-depth: 0 ref: ${{ inputs.ref }} From e2c8f0cb0a3614f0f7076e0069cbb26c5d896c8e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 20 Aug 2025 16:48:11 +0000 Subject: [PATCH 46/81] [3.0.x] sbt-ci-release 1.11.2 (was 1.11.1) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index d5c4374..e9aed55 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,4 +2,4 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4") addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.10.0") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.5") -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.1") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2") From 948d1424f4fc6e9360f01c22bd2d07eddcef8579 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 26 Aug 2025 17:58:07 +0000 Subject: [PATCH 47/81] [3.0.x] sbt 1.11.5 (was 1.11.4) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 6dbafe1..57231aa 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ # # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. # -sbt.version=1.11.4 +sbt.version=1.11.5 From 79d38c39dba34013f5e937f1a8c934984d8596e8 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 7 Sep 2025 18:39:20 +0000 Subject: [PATCH 48/81] [3.0.x] sbt 1.11.6 (was 1.11.5) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 57231aa..dca9bce 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ # # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. # -sbt.version=1.11.5 +sbt.version=1.11.6 From afb03d39e97d2cb01770992bc931912defdef4b1 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 13 Sep 2025 17:16:14 +0000 Subject: [PATCH 49/81] [3.0.x] sbt-header 5.11.0 (was 5.10.0) --- project/plugins.sbt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index e9aed55..635e1c4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4") -addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.10.0") -addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.5") -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4") +addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.10.0") +addSbtPlugin("com.github.sbt" % "sbt-header" % "5.11.0") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.5") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2") From f6d36e6af90e3a5f6230c2b6d5d0630d2e2a4e52 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 17 Sep 2025 18:48:22 +0000 Subject: [PATCH 50/81] [3.0.x] scalafmt-core 3.9.10 (was 3.9.9) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 225821c..06ece56 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -13,4 +13,4 @@ rewrite.rules = [ AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifi rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abstract", "implicit", "override", "lazy" ] spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in import x.{ yyy } trailingCommas = preserve -version = 3.9.9 +version = 3.9.10 From 0f34716c20466ee9edb261d3643def9be52f6a76 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 6 Oct 2025 03:22:53 +0000 Subject: [PATCH 51/81] [3.0.x] sbt 1.11.7 (was 1.11.6) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index dca9bce..c952972 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ # # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. # -sbt.version=1.11.6 +sbt.version=1.11.7 From a913a4c4246634090ea665018671a61186f9da98 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 7 Oct 2025 17:26:55 +0000 Subject: [PATCH 52/81] [3.0.x] scala-library 2.13.17 (was 2.13.16) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 813d649..2083c15 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -5,7 +5,7 @@ import sbt._ object Dependencies { val Scala212 = "2.12.20" - val Scala213 = "2.13.16" + val Scala213 = "2.13.17" val Scala3 = "3.3.6" val ScalaVersions = Seq(Scala212, Scala213, Scala3) From 14d7e370048472ace872612b1fb70839539d4326 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 13 Oct 2025 17:01:25 +0000 Subject: [PATCH 53/81] [3.0.x] scalafmt-core 3.10.0 (was 3.9.10) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 06ece56..a644004 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -13,4 +13,4 @@ rewrite.rules = [ AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifi rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abstract", "implicit", "override", "lazy" ] spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in import x.{ yyy } trailingCommas = preserve -version = 3.9.10 +version = 3.10.0 From f398fb1431647931b72683da633d9bd505c117f9 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 15 Oct 2025 18:18:43 +0000 Subject: [PATCH 54/81] [3.0.x] scala3-library 3.3.7 (was 3.3.6) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 2083c15..9023e87 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -6,7 +6,7 @@ import sbt._ object Dependencies { val Scala212 = "2.12.20" val Scala213 = "2.13.17" - val Scala3 = "3.3.6" + val Scala3 = "3.3.7" val ScalaVersions = Seq(Scala212, Scala213, Scala3) From eb7b745cc90054ed16c3191d37f2be534e99ed17 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 19 Oct 2025 16:55:42 +0000 Subject: [PATCH 55/81] [3.0.x] scalafmt-core 3.10.1 (was 3.10.0) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index a644004..c3d3ca7 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -13,4 +13,4 @@ rewrite.rules = [ AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifi rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abstract", "implicit", "override", "lazy" ] spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in import x.{ yyy } trailingCommas = preserve -version = 3.10.0 +version = 3.10.1 From 7e164339af5854ead94076b5abcce1e74020b592 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 31 Oct 2025 17:26:35 +0000 Subject: [PATCH 56/81] [3.0.x] sbt-scalafmt 2.5.6 (was 2.5.5) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 635e1c4..e71433f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4") addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.10.0") addSbtPlugin("com.github.sbt" % "sbt-header" % "5.11.0") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.5") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2") From f405678d0a7333fc578c9ab76c49184a0662b925 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Nov 2025 11:49:37 +0000 Subject: [PATCH 57/81] [3.0.x] Bump actions/checkout from 5 to 6 Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/dependency-graph.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-graph.yml b/.github/workflows/dependency-graph.yml index 5462d16..6fafdce 100644 --- a/.github/workflows/dependency-graph.yml +++ b/.github/workflows/dependency-graph.yml @@ -17,7 +17,7 @@ jobs: name: Submit dependencies to GitHub runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: fetch-depth: 0 ref: ${{ inputs.ref }} From b6522a372d622c873d07d2854a1d5bd3d23756bd Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 26 Nov 2025 20:15:45 +0000 Subject: [PATCH 58/81] [3.0.x] scala-library 2.13.18 (was 2.13.17) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 9023e87..5f514e8 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -5,7 +5,7 @@ import sbt._ object Dependencies { val Scala212 = "2.12.20" - val Scala213 = "2.13.17" + val Scala213 = "2.13.18" val Scala3 = "3.3.7" val ScalaVersions = Seq(Scala212, Scala213, Scala3) From cbe4e698d125f95ba8ac89c82b0fabe344eeb810 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 26 Nov 2025 20:15:48 +0000 Subject: [PATCH 59/81] [3.0.x] scalafmt-core 3.10.2 (was 3.10.1) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index c3d3ca7..71b3fa6 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -13,4 +13,4 @@ rewrite.rules = [ AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifi rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abstract", "implicit", "override", "lazy" ] spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in import x.{ yyy } trailingCommas = preserve -version = 3.10.1 +version = 3.10.2 From fd15e9501834be624d3fad990ad447e4f6c96a7b Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Fri, 12 Dec 2025 10:57:14 +0100 Subject: [PATCH 60/81] [3.0.x] scala-library 2.12.21 (was 2.12.20) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 5f514e8..100eccf 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,7 +4,7 @@ import sbt._ object Dependencies { - val Scala212 = "2.12.20" + val Scala212 = "2.12.21" val Scala213 = "2.13.18" val Scala3 = "3.3.7" From 063e938a5116ff19f7ac99e8d6ae067c2164cf18 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 24 Dec 2025 18:24:53 +0000 Subject: [PATCH 61/81] [3.0.x] scalafmt-core 3.10.3 (was 3.10.2) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 71b3fa6..1e728cf 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -13,4 +13,4 @@ rewrite.rules = [ AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifi rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abstract", "implicit", "override", "lazy" ] spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in import x.{ yyy } trailingCommas = preserve -version = 3.10.2 +version = 3.10.3 From daefddefb290b279746cd949a2357507f068fe78 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 5 Jan 2026 22:11:02 +0000 Subject: [PATCH 62/81] [3.0.x] sbt, scripted-plugin 1.12.0 (was 1.11.7) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index c952972..b83af27 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ # # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. # -sbt.version=1.11.7 +sbt.version=1.12.0 From 9e4621c6ae7fbb5b0b23fb53553b9de72810d176 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 17 Jan 2026 20:05:27 +0000 Subject: [PATCH 63/81] [3.0.x] scalafmt-core 3.10.4 (was 3.10.3) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 1e728cf..7e0a046 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -13,4 +13,4 @@ rewrite.rules = [ AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifi rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abstract", "implicit", "override", "lazy" ] spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in import x.{ yyy } trailingCommas = preserve -version = 3.10.3 +version = 3.10.4 From 73ce29541fad13760b195faee8bfc0b7875b6dd8 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 28 Jan 2026 04:03:54 +0000 Subject: [PATCH 64/81] [3.0.x] sbt 1.12.1 (was 1.12.0) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index b83af27..9d297ae 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ # # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. # -sbt.version=1.12.0 +sbt.version=1.12.1 From 1197175e7c3e60e8770cc4ec472d14c95c2ebe81 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 29 Jan 2026 05:56:11 +0000 Subject: [PATCH 65/81] [3.0.x] scalafmt-core 3.10.5 (was 3.10.4) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 7e0a046..8aab224 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -13,4 +13,4 @@ rewrite.rules = [ AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifi rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abstract", "implicit", "override", "lazy" ] spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in import x.{ yyy } trailingCommas = preserve -version = 3.10.4 +version = 3.10.5 From 97a3746fdcebd40d6610a1624954bf76cf734ce4 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 1 Feb 2026 17:33:24 +0000 Subject: [PATCH 66/81] [3.0.x] scalafmt-core 3.10.6 (was 3.10.5) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 8aab224..78d0dab 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -13,4 +13,4 @@ rewrite.rules = [ AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifi rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abstract", "implicit", "override", "lazy" ] spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in import x.{ yyy } trailingCommas = preserve -version = 3.10.5 +version = 3.10.6 From 19f4fa967904b0c37b3d22d98e1c9d7912da3691 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 4 Feb 2026 22:45:58 +0000 Subject: [PATCH 67/81] [3.0.x] sbt 1.12.2 (was 1.12.1) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 9d297ae..26396e1 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ # # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. # -sbt.version=1.12.1 +sbt.version=1.12.2 From d7ccf56abf5915af954fe76979181105344771fc Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 12 Feb 2026 20:42:34 +0000 Subject: [PATCH 68/81] [3.0.x] scalafmt-core 3.10.7 (was 3.10.6) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 78d0dab..e376d50 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -13,4 +13,4 @@ rewrite.rules = [ AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifi rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abstract", "implicit", "override", "lazy" ] spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in import x.{ yyy } trailingCommas = preserve -version = 3.10.6 +version = 3.10.7 From 3f6b06bccab8bc5891762f43b97b1b0a19f4f0a9 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 16 Feb 2026 20:10:39 +0000 Subject: [PATCH 69/81] [3.0.x] sbt 1.12.3 (was 1.12.2) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 26396e1..e063874 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ # # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. # -sbt.version=1.12.2 +sbt.version=1.12.3 From ad2f10f7afbf2b25451ebc5379f8c54aec8444e2 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 18 Feb 2026 20:07:44 +0000 Subject: [PATCH 70/81] [3.0.x] sbt-mima-plugin 1.1.5 (was 1.1.4) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index e71433f..c2346f8 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.5") addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.10.0") addSbtPlugin("com.github.sbt" % "sbt-header" % "5.11.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6") From 011be94da869c99136de40475fa50714b983469e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 24 Feb 2026 20:27:12 +0000 Subject: [PATCH 71/81] [3.0.x] sbt 1.12.4 (was 1.12.3) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index e063874..54ebd6d 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ # # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. # -sbt.version=1.12.3 +sbt.version=1.12.4 From d7b67622b2f6e75df949cb3539b894c11bcbaadf Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 2 Mar 2026 20:55:25 +0000 Subject: [PATCH 72/81] [3.0.x] sbt 1.12.5 (was 1.12.4) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 54ebd6d..1b407c6 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ # # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. # -sbt.version=1.12.4 +sbt.version=1.12.5 From 2c665022eac4112c5e712066984004b93452b173 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Mar 2026 10:50:24 +0000 Subject: [PATCH 73/81] [3.0.x] Bump release-drafter/release-drafter from 6 to 7 Bumps [release-drafter/release-drafter](https://github.com/release-drafter/release-drafter) from 6 to 7. - [Release notes](https://github.com/release-drafter/release-drafter/releases) - [Commits](https://github.com/release-drafter/release-drafter/compare/v6...v7) --- updated-dependencies: - dependency-name: release-drafter/release-drafter dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/release-drafter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index bdd0ce1..346113b 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -9,7 +9,7 @@ jobs: update_release_draft: runs-on: ubuntu-latest steps: - - uses: release-drafter/release-drafter@v6 + - uses: release-drafter/release-drafter@v7 with: name: "cachecontrol $RESOLVED_VERSION" config-name: release-drafts/increasing-patch-version.yml # located in .github/ in the default branch within this or the .github repo From 16d3d7a9a65232ebcb46aab81e4ae1d8e598e13d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 16 Mar 2026 20:46:56 +0000 Subject: [PATCH 74/81] [3.0.x] sbt 1.12.6 (was 1.12.5) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 1b407c6..47dafd5 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ # # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. # -sbt.version=1.12.5 +sbt.version=1.12.6 From ade193d9367f682be5e6bc961270398a0995c576 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 26 Mar 2026 21:57:38 +0000 Subject: [PATCH 75/81] [3.0.x] sbt 1.12.8 (was 1.12.6) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 47dafd5..083a059 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ # # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. # -sbt.version=1.12.6 +sbt.version=1.12.8 From eb2b77c619509dcf5c7ed33568dbbac0e8b4a90e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 26 Mar 2026 21:57:41 +0000 Subject: [PATCH 76/81] [3.0.x] scalatest 3.2.20 (was 3.2.19) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 100eccf..ce102fe 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -10,7 +10,7 @@ object Dependencies { val ScalaVersions = Seq(Scala212, Scala213, Scala3) - def scalaTest = "org.scalatest" %% "scalatest" % "3.2.19" % Test + def scalaTest = "org.scalatest" %% "scalatest" % "3.2.20" % Test def parserCombinators(scalaVersion: String) = "org.scala-lang.modules" %% "scala-parser-combinators" % { From 05ce8c4cffa1a39c85dca5fd35004367eb06a642 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 3 Apr 2026 17:27:35 +0000 Subject: [PATCH 77/81] [3.0.x] sbt-java-formatter 0.11.0 (was 0.10.0) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index c2346f8..f52f2f0 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.5") -addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.10.0") +addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.11.0") addSbtPlugin("com.github.sbt" % "sbt-header" % "5.11.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2") From 9efb62c06195e727472c555065bc82d596c1cfd1 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 7 Apr 2026 19:38:43 +0000 Subject: [PATCH 78/81] [3.0.x] sbt 1.12.9 (was 1.12.8) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 083a059..3e06ee3 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ # # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. # -sbt.version=1.12.8 +sbt.version=1.12.9 From 0404b913142c9b96a0688c1af1e3d975c8ae2091 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 13 Apr 2026 19:18:31 +0000 Subject: [PATCH 79/81] [3.0.x] sbt-scalafmt 2.6.0 (was 2.5.6) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index f52f2f0..a2fa528 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.5") addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.11.0") addSbtPlugin("com.github.sbt" % "sbt-header" % "5.11.0") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.6.0") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2") From f9f338227ceccfd81a2b9f3f9feae55080ed72ba Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 13 Apr 2026 19:18:37 +0000 Subject: [PATCH 80/81] [3.0.x] scalafmt-core 3.11.0 (was 3.10.7) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index e376d50..e4f5e34 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -13,4 +13,4 @@ rewrite.rules = [ AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifi rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abstract", "implicit", "override", "lazy" ] spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in import x.{ yyy } trailingCommas = preserve -version = 3.10.7 +version = 3.11.0 From 416b06afbdf1ff0a6efdc96c1c2368040aefba30 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Mon, 13 Apr 2026 23:31:05 +0200 Subject: [PATCH 81/81] release drafter v7 --- .github/workflows/release-drafter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 346113b..f00f60e 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -15,4 +15,4 @@ jobs: config-name: release-drafts/increasing-patch-version.yml # located in .github/ in the default branch within this or the .github repo commitish: ${{ github.ref_name }} env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }}