Merge pull request #965 from scala-steward/update/6.2.x/patches

[6.2.x] Patch updates

Author: mkurz

.git-blame-ignore-revs

@@ -1,2 +1,5 @@
 # Scala Steward: Reformat with scalafmt 3.8.3
 28e54446e0830b27d6f861bcdf10131fadce91d9
+
+# Scala Steward: Reformat with scalafmt 3.9.7
+ebc50dd590170d8a3659779c49684ab45413e7f6

.scalafmt.conf

@@ -1,5 +1,5 @@
 # This file was originally copied from https://github.com/playframework/playframework/blob/main/.scalafmt.conf
-version = 3.9.5
+version = 3.9.7
 runner.dialect = scala213
 align.preset = more
 assumeStandardLibraryStripMargin = true

build.sbt

@@ -24,7 +24,7 @@ lazy val commonSettings = Seq(
   compile / javacOptions ++= Seq("--release", "11"),
   doc / javacOptions := Seq("-source", "11"),
   scalaVersion       := "2.13.16",
-  crossScalaVersions := Seq("2.13.16", "3.3.5"),
+  crossScalaVersions := Seq("2.13.16", "3.3.6"),
   scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked", "-encoding", "utf8") ++
     (CrossVersion.partialVersion(scalaVersion.value) match {
       case Some((2, 13)) => Seq("-Xsource:3")

project/Dependencies.scala

@@ -21,7 +21,7 @@ object Dependencies {
 object Version {
   val play = _root_.play.core.PlayVersion.current
 
-  val slick = "3.6.0"
+  val slick = "3.6.1"
   val h2    = "2.3.232"
 }
 

project/Omnidoc.scala

@@ -32,7 +32,7 @@ object Omnidoc extends AutoPlugin {
       val tagged: String      = omnidocTagPrefix.getOrElse("v") + version.value
       val tree: String        = if (isSnapshot.value) development else tagged
       val prefix: String      = "/" + (omnidocPathPrefix ?? "").value
-      val path: String = {
+      val path: String        = {
         val buildDir: File      = (ThisBuild / baseDirectory).value
         val projDir: File       = baseDirectory.value
         val rel: Option[String] = IO.relativize(buildDir, projDir)

project/Playdoc.scala

@@ -19,7 +19,7 @@ object Playdoc extends AutoPlugin {
   override def projectSettings =
     Defaults.packageTaskSettings(playdocPackage, playdocPackage / mappings) ++
       Seq(
-        playdocDirectory := (ThisBuild / baseDirectory).value / "docs" / "manual",
+        playdocDirectory          := (ThisBuild / baseDirectory).value / "docs" / "manual",
         playdocPackage / mappings := {
           val base: File = playdocDirectory.value
           base.allPaths.pair(IO.relativize(base.getParentFile(), _))

src/core/src/test/scala/play/api/db/slick/util/WithReferenceConfig.scala

@@ -5,7 +5,7 @@ import org.specs2.specification.Scope
 import play.api.Configuration
 
 trait WithReferenceConfig extends Scope {
-  val ref = Configuration.reference
+  val ref                                            = Configuration.reference
   def enabledModules(c: Configuration): List[String] = {
     ref.get[Seq[String]]("play.modules.enabled").toList
   }

src/evolutions/src/main/scala/play/api/db/slick/evolutions/internal/DBApiAdapter.scala

@@ -51,7 +51,7 @@ private[evolutions] object DBApiAdapter {
       dbConfig.db.source match {
         case ds: DataSourceJdbcDataSource => ds.ds
         case hds: HikariCPJdbcDataSource  => hds.ds
-        case other =>
+        case other                        =>
           logger.error(s"Unexpected data source type ${other.getClass}. Please, file a ticket $IssueTracker.")
           throw new UnsupportedOperationException
       }