Merge pull request #962 from scala-steward/update/5.4.x/patches

[5.4.x] Patch updates

Author: mkurz

.git-blame-ignore-revs

@@ -1,2 +1,5 @@
 # Scala Steward: Reformat with scalafmt 3.8.3
 d7d4bc4d51319e3a74b0e7858e68bd93e2e056f8
+
+# Scala Steward: Reformat with scalafmt 3.9.7
+26bb9e5d48711aa372655293379a734ffe89809e

.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

@@ -20,7 +20,7 @@ lazy val commonSettings = Seq(
   // Work around https://issues.scala-lang.org/browse/SI-9311
   scalacOptions ~= (_.filterNot(_ == "-Xfatal-warnings")),
   scalaVersion       := "2.13.16",
-  crossScalaVersions := Seq("2.13.16", "3.3.5"),
+  crossScalaVersions := Seq("2.13.16", "3.3.6"),
   pomExtra           := scala.xml.NodeSeq.Empty, // Can be removed when dropping interplay
   developers += Developer(
     "playframework",

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"
 }
 

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
       }