From 6f9096a446f39294c61364574d650096001f92fe Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 4 Feb 2025 03:25:01 +0000 Subject: [PATCH 1/4] [7.x] scala-library 2.13.16 (was 2.13.15) --- .github/workflows/build-test.yml | 2 +- docs/build.sbt | 4 ++-- project/Dependencies.scala | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index a7b9a72..dae2b4b 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -53,7 +53,7 @@ jobs: uses: playframework/.github/.github/workflows/cmd.yml@v3 with: java: 17, 11 - scala: 2.13.15, 3.3.3 + scala: 2.13.16, 3.3.3 cmd: >- sbt " +publishLocal; diff --git a/docs/build.sbt b/docs/build.sbt index 5b9c54e..53b1499 100644 --- a/docs/build.sbt +++ b/docs/build.sbt @@ -21,8 +21,8 @@ lazy val docs = project // No resource directories shuts the ebean agent up about java sources in the classes directory Test / unmanagedResourceDirectories := Nil, Test / parallelExecution := false, - scalaVersion := "2.13.15", - crossScalaVersions := Seq("2.13.15", "3.3.3"), + scalaVersion := "2.13.16", + crossScalaVersions := Seq("2.13.16", "3.3.3"), ) .settings( Test / javafmt / sourceDirectories ++= (Test / unmanagedSourceDirectories).value, diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 3c8768c..99e0ff3 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -10,7 +10,7 @@ object Dependencies { object ScalaVersions { val scala212 = "2.12.20" - val scala213 = "2.13.15" + val scala213 = "2.13.16" val scala3 = "3.3.4" } From e2b4feef149a198bbf0bf5e1e46d0e7c6e7f904e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 4 Feb 2025 03:25:14 +0000 Subject: [PATCH 2/4] [7.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 99e0ff3..ecdb0a6 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -11,7 +11,7 @@ object Dependencies { object ScalaVersions { val scala212 = "2.12.20" val scala213 = "2.13.16" - val scala3 = "3.3.4" + val scala3 = "3.3.5" } object Versions { From 6201bf09e0e9698fe4fac70b5aaf72690fe8cde4 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 4 Feb 2025 03:25:28 +0000 Subject: [PATCH 3/4] [7.x] sbt-scalafmt 2.5.4 (was 2.5.2) --- docs/project/plugins.sbt | 2 +- project/plugins.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/project/plugins.sbt b/docs/project/plugins.sbt index 8d94259..31836be 100644 --- a/docs/project/plugins.sbt +++ b/docs/project/plugins.sbt @@ -10,6 +10,6 @@ addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse( addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") diff --git a/project/plugins.sbt b/project/plugins.sbt index 999ac06..4fd627b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,7 +4,7 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4") -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 15f07109b4815e40b21c6893bf7a3745fd5b4dd4 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 4 Feb 2025 03:25:33 +0000 Subject: [PATCH 4/4] [7.x] scalafmt-core 3.8.6 (was 3.8.3) --- .scalafmt.conf | 2 +- docs/.scalafmt.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 1af9c64..f478ffb 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -10,4 +10,4 @@ spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in im trailingCommas = preserve newlines.afterCurlyLambda = preserve runner.dialect = scala212source3 -version = 3.8.3 +version = 3.8.6 diff --git a/docs/.scalafmt.conf b/docs/.scalafmt.conf index d13296c..f2cb8ff 100644 --- a/docs/.scalafmt.conf +++ b/docs/.scalafmt.conf @@ -13,4 +13,4 @@ spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in im trailingCommas = preserve newlines.afterCurlyLambda = preserve runner.dialect = scala212source3 -version = 3.8.3 +version = 3.8.6