From 6359c6224b068e8edd08fffeeda4c1e2512047d9 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 19 Jan 2025 04:32:11 +0000 Subject: [PATCH 1/6] [2.0.x] sbt-bloop 2.0.7 (was 2.0.6) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 196cd3ad..862f2dd0 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -10,6 +10,6 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0") -addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "2.0.6") +addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "2.0.7") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1") addSbtPlugin("com.github.sbt" % "sbt-maven-plugin" % "0.0.2") From 27841e9344b23961d2a48be8d06aaf45d9b4480d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 19 Jan 2025 04:32:28 +0000 Subject: [PATCH 2/6] [2.0.x] scala-compiler 2.13.16 (was 2.13.15) --- docs/build.sbt | 2 +- project/Dependencies.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/build.sbt b/docs/build.sbt index 2f21ac69..f9c44b93 100644 --- a/docs/build.sbt +++ b/docs/build.sbt @@ -10,7 +10,7 @@ lazy val docs = project .enablePlugins(PlayDocsPlugin) .configs(Configuration.of("Docs", "docs")) .settings( - scalaVersion := "2.13.15", + scalaVersion := "2.13.16", // use special snapshot play version for now resolvers ++= DefaultOptions.resolvers(snapshot = true), libraryDependencies += component("play-test") % "test", diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 10cbf1c2..ffe3b9c2 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,7 +4,7 @@ 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 9ce5462b6df82207bcc8963f802ea2ffad474efb Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 19 Jan 2025 04:32:41 +0000 Subject: [PATCH 3/6] [2.0.x] sbt 1.10.7 (was 1.10.6) --- docs/project/build.properties | 2 +- project/build.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/project/build.properties b/docs/project/build.properties index c7e32983..bacdf161 100644 --- a/docs/project/build.properties +++ b/docs/project/build.properties @@ -1,3 +1,3 @@ # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. -sbt.version=1.10.6 +sbt.version=1.10.7 diff --git a/project/build.properties b/project/build.properties index c7e32983..bacdf161 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,3 +1,3 @@ # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. -sbt.version=1.10.6 +sbt.version=1.10.7 From aea69497fa53f64303dd4f5f4620be9f7ce5eeb4 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 19 Jan 2025 04:32:57 +0000 Subject: [PATCH 4/6] [2.0.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 8e5548f6..a89e1e22 100644 --- a/docs/project/plugins.sbt +++ b/docs/project/plugins.sbt @@ -8,4 +8,4 @@ resolvers ++= DefaultOptions.resolvers(snapshot = true) addSbtPlugin("org.playframework" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "3.0.6")) addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4") diff --git a/project/plugins.sbt b/project/plugins.sbt index 862f2dd0..ec4da443 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,7 +8,7 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4") 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.lightbend.sbt" % "sbt-java-formatter" % "0.8.0") addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "2.0.7") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1") From 0dc1572ab4ef2c73efe978935df51ceb029cbcc9 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 19 Jan 2025 04:33:03 +0000 Subject: [PATCH 5/6] [2.0.x] scalafmt-core 3.8.5 (was 3.8.3) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 7cb39388..599effa8 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.3 +version = 3.8.5 runner.dialect = scala213 From 8723c73ef5c05028abd4b568f043f87dcb15cbbe Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Mon, 20 Jan 2025 09:27:45 +0100 Subject: [PATCH 6/6] scalafmt: StandardConvention layout --- .scalafmt.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.scalafmt.conf b/.scalafmt.conf index 599effa8..af41349e 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,5 +1,7 @@ version = 3.8.5 +project.layout=StandardConvention + runner.dialect = scala213 align.preset = true