Merge branch 'main' into update/patches

Author: mkurz

.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.10.7
+version = 3.11.1

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.10.7
+version = 3.11.1

docs/project/plugins.sbt

@@ -6,10 +6,10 @@ lazy val sbtPlayEbean = ProjectRef(Path.fileProperty("user.dir").getParentFile,
 
 resolvers ++= DefaultOptions.resolvers(snapshot = true)
 
-addSbtPlugin("org.playframework" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "3.1.0-M5"))
+addSbtPlugin("org.playframework" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "3.1.0-M9"))
 
 addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.12.0")
 
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.6.1")
 
 addSbtPlugin("com.github.sbt" % "sbt-header" % "5.11.0")

project/Dependencies.scala

@@ -17,7 +17,7 @@ object Dependencies {
 
   object Versions {
     val play: String   = "3.1.0-M8"
-    val ebean          = "17.3.0"
+    val ebean          = "17.10.0"
     val typesafeConfig = "1.4.9"
   }
 

project/plugins.sbt

@@ -4,7 +4,7 @@ addSbtPlugin("com.github.sbt" % "sbt-header" % "5.11.0")
 
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.5")
 
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.6.1")
 
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2")