Merge pull request #884 from scala-steward/update/2.0.x/patches

[2.0.x] Patch updates
playframework · Jan 20, 2025 · f03a082 · f03a082
2 parents b95347c + 8723c73
commit f03a082
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,6 @@
-version = 3.8.3
+version = 3.8.5
+
+project.layout=StandardConvention
 
 runner.dialect = scala213
 

diff --git 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/docs/project/build.properties b/docs/project/build.properties
@@ -1,3 +1,3 @@
 # Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
 
-sbt.version=1.10.6
+sbt.version=1.10.7
diff --git 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/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)
 }
diff --git a/project/build.properties b/project/build.properties
@@ -1,3 +1,3 @@
 # Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
 
-sbt.version=1.10.6
+sbt.version=1.10.7
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -8,8 +8,8 @@ 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.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")