chore(deps): Non-AWS dependency updates

.git-blame-ignore-revs

@@ -1,2 +1,5 @@
 # Scala Steward: Reformat with scalafmt 3.7.17
 8d45a17f8613d549fc15af04d9f22199bf4f2c41
+
+# Scala Steward: Reformat with scalafmt 3.8.3
+066e20fcccd07ac97137c23b1a5a135ac06bbb31

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = "3.7.17"
+version = "3.8.3"
 align.openParenCallSite = false
 continuationIndent.defnSite = 2
 rewrite.rules = [SortImports]

common/internal_model/src/test/scala/weco/catalogue/internal_model/work/AvailabilityTest.scala

@@ -167,7 +167,10 @@ class AvailabilityTest
       )
       val workAvailabilities = Availabilities.forWorkData(work.data)
 
-      workAvailabilities should contain allOf (Availability.ClosedStores, Availability.Online)
+      workAvailabilities should contain allOf (
+        Availability.ClosedStores,
+        Availability.Online
+      )
     }
 
     it("does not add either availability if no conditions are satisfied") {

common/internal_model/src/test/scala/weco/catalogue/internal_model/work/generators/WorkGenerators.scala

@@ -298,7 +298,7 @@ trait WorkGenerators
                     sourceIdentifier = internalWork.sourceIdentifier,
                     canonicalId = internalWork.state.canonicalId,
                     workData = internalWork.data
-                  ),
+                  )
                 )
             )
           )

pipeline/matcher_merger/merger/src/test/scala/weco/pipeline/merger/rules/WorkPredicatesTest.scala

@@ -118,9 +118,7 @@ class WorkPredicatesTest
     forAll(filtered) {
       work =>
         work.data.format should contain oneOf
-          (Format.Pictures,
-          Format.DigitalImages,
-          Format.`3DObjects`)
+          (Format.Pictures, Format.DigitalImages, Format.`3DObjects`)
     }
   }
 

project/Common.scala

@@ -3,7 +3,7 @@ import sbt._
 
 object Common {
   val settings: Seq[Def.Setting[_]] = Seq(
-    scalaVersion := "2.12.20",
+    scalaVersion := "2.13.15",
     organization := "weco",
     scalacOptions ++= Seq(
       "-deprecation",

project/Dependencies.scala

@@ -91,16 +91,16 @@ object ExternalDependencies {
     val awsLambdaEvents = "3.14.0"
     val circe = "0.14.1"
     val diffJson = "4.1.1"
-    val fastparse = "2.3.3"
+    val fastparse = "3.1.1"
     val scalatest = "3.2.19"
-    val scalatestplus = "3.1.4.0"
+    val scalatestplus = "3.2.2.0"
     val scalacheckShapeless = "1.1.8"
-    val scalacsv = "1.3.10"
+    val scalacsv = "1.4.1"
     val scalaGraph = "1.13.1"
-    val enumeratum = "1.7.4"
-    val enumeratumScalacheck = "1.7.4"
+    val enumeratum = "1.7.5"
+    val enumeratumScalacheck = "1.7.5"
     val jsoup = "1.18.1"
-    val logback = "1.1.11"
+    val logback = "1.5.8"
     val scalatestPlus = "3.2.12.0"
     val scalatestPlusMockitoArtifactId = "mockito-4-5"
     val uPickle = "3.3.1"
@@ -133,9 +133,9 @@ object ExternalDependencies {
   val mySqlDependencies = Seq(
     // Version 7.15.0 is the latest version of Flyway which supports MySQL 5.7. To update to a newer version of Flyway,
     // we would also need to update the MySQL tei-adapter-cluster and identifiers-delta-cluster databases in RDS.
-    "org.flywaydb" % "flyway-core" % "7.15.0",
-    "org.scalikejdbc" %% "scalikejdbc" % "3.4.2",
-    "com.mysql" % "mysql-connector-j" % "8.2.0"
+    "org.flywaydb" % "flyway-core" % "10.19.0",
+    "org.scalikejdbc" %% "scalikejdbc" % "3.5.0",
+    "com.mysql" % "mysql-connector-j" % "8.4.0"
   )
 
   val scalacheckDependencies = Seq(
@@ -161,7 +161,7 @@ object ExternalDependencies {
   )
 
   val scalaXmlDependencies = Seq(
-    "org.scala-lang.modules" %% "scala-xml" % "1.3.1"
+    "org.scala-lang.modules" %% "scala-xml" % "2.3.0"
   )
 
   val jsoupDependencies = Seq(

project/build.properties

@@ -1,2 +1,2 @@
-sbt.version=1.9.9
+sbt.version=1.10.2
 

project/build.sbt

@@ -1,4 +1,4 @@
-scalaVersion := "2.12.20"
+scalaVersion := "2.13.15"
 scalacOptions ++= Seq(
   "-deprecation",
   "-feature"

project/metals.sbt

@@ -1,4 +1,4 @@
 // DO NOT EDIT! This file is auto-generated.
 // This file enables sbt-bloop to create bloop config files.
 
-addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.6.0")
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "2.0.2")

project/project/metals.sbt

@@ -1,4 +1,4 @@
 // DO NOT EDIT! This file is auto-generated.
 // This file enables sbt-bloop to create bloop config files.
 
-addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.6.0")
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "2.0.2")

project/project/project/metals.sbt

@@ -1,4 +1,4 @@
 // DO NOT EDIT! This file is auto-generated.
 // This file enables sbt-bloop to create bloop config files.
 
-addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.6.0")
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "2.0.2")

tei_adapter/tei_id_extractor/src/test/scala/weco/catalogue/tei/id_extractor/PathIdManagerTest.scala

@@ -205,11 +205,14 @@ class PathIdManagerTest extends AnyFunSpec with PathIdDatabase {
           messageSender
             .getMessages[
               TeiIdMessage
-            ]() should contain only (TeiIdChangeMessage(
-            id = updatedPathId.id,
-            s3Location = expectedS3Location,
-            newTime
-          ), TeiIdDeletedMessage(id = "manuscript_1234", newTime))
+            ]() should contain only (
+            TeiIdChangeMessage(
+              id = updatedPathId.id,
+              s3Location = expectedS3Location,
+              newTime
+            ),
+            TeiIdDeletedMessage(id = "manuscript_1234", newTime)
+          )
 
       }
     }
@@ -311,11 +314,14 @@ class PathIdManagerTest extends AnyFunSpec with PathIdDatabase {
           messageSender
             .getMessages[
               TeiIdMessage
-            ]() should contain only (TeiIdChangeMessage(
-            id = id2,
-            s3Location = expectedS3Location,
-            newTime
-          ), TeiIdDeletedMessage(id = id1, newTime))
+            ]() should contain only (
+            TeiIdChangeMessage(
+              id = id2,
+              s3Location = expectedS3Location,
+              newTime
+            ),
+            TeiIdDeletedMessage(id = id1, newTime)
+          )
 
       }
     }