Merge pull request #531 from scala-steward/update/7.x/patches

mkurz · web-flow · commit 190e79f7fa3f · 2025-04-09T14:18:44.000+02:00
[7.x] Patch updates
diff --git 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.9.3
+version = 3.9.4
diff --git 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.9.3
+version = 3.9.4
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.10
+sbt.version=1.10.11
diff --git a/docs/project/plugins.sbt b/docs/project/plugins.sbt
@@ -6,7 +6,7 @@ lazy val sbtPlayEbean = ProjectRef(Path.fileProperty("user.dir").getParentFile,
 
 resolvers ++= DefaultOptions.resolvers(snapshot = true)
 
-addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.9.6"))
+addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.9.7"))
 
 addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
 
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -15,7 +15,7 @@ object Dependencies {
   }
 
   object Versions {
-    val play: String   = "2.9.6"
+    val play: String   = "2.9.7"
     val ebean          = "15.8.2"
     val typesafeConfig = "1.4.3"
   }
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.10
+sbt.version=1.10.11
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -6,6 +6,6 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
 
 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")
 
 addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`# Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>`
`2`	`2`
`3`		`-sbt.version=1.10.10`
	`3`	`+sbt.version=1.10.11`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ object Dependencies {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`object Versions {`
`18`		`- val play: String = "2.9.6"`
	`18`	`+ val play: String = "2.9.7"`
`19`	`19`	`val ebean = "15.8.2"`
`20`	`20`	`val typesafeConfig = "1.4.3"`
`21`	`21`	`}`