chore(deps): Non-AWS dependency updates

.git-blame-ignore-revs

@@ -12,3 +12,6 @@ c7065a7fd22fc65c30d5c71f7ce819e84133be1b
 
 # Scala Steward: Reformat with scalafmt 3.7.17
 42870d8b202ac19404b5de4aaa50a6c510542c91
+
+# Scala Steward: Reformat with scalafmt 3.8.3
+382354d34b5ee5298908cc8f43aaa17623503f70

.scalafmt.conf

@@ -1,4 +1,4 @@
-version=3.7.17
+version=3.8.3
 maxColumn = 120
 trailingCommas = always
 align.preset = none

build.sbt

@@ -309,7 +309,10 @@ lazy val `zuora-models` = library(
   scala3Settings,
 )
   .settings(
-    libraryDependencies += "com.gu" %% "support-internationalisation" % "0.16" exclude ("com.typesafe.scala-logging", "scala-logging_2.13"),
+    libraryDependencies += "com.gu" %% "support-internationalisation" % "0.16" exclude (
+      "com.typesafe.scala-logging",
+      "scala-logging_2.13",
+    ),
   )
 
 lazy val `credit-processor` = library(
@@ -639,12 +642,15 @@ lazy val `product-move-api` = lambdaProject(
     ) exclude ("com.typesafe.scala-logging", "scala-logging_2.13"),
     awsEvents,
     awsLambda,
-    "com.softwaremill.sttp.client3" %% "zio" % sttpVersion exclude ("org.scala-lang.modules", "scala-collection-compat_2.13"),
+    "com.softwaremill.sttp.client3" %% "zio" % sttpVersion exclude (
+      "org.scala-lang.modules",
+      "scala-collection-compat_2.13",
+    ),
     awsS3,
     awsSQS,
     scalatest,
     "com.softwaremill.sttp.client3" %% "zio-json" % sttpVersion,
-    "dev.zio" %% "zio-logging-slf4j" % "2.1.17",
+    "dev.zio" %% "zio-logging-slf4j" % "2.4.0",
     "dev.zio" %% "zio-test" % zio2Version % Test,
     "dev.zio" %% "zio-test-sbt" % zio2Version % Test,
     "com.softwaremill.sttp.tapir" %% "tapir-core" % tapirVersion,

handlers/digital-voucher-suspension-processor/src/main/scala/com/gu/digitalvouchersuspensionprocessor/Handler.scala

@@ -31,11 +31,13 @@ object Handler extends LazyLogging {
       imovo <- ImovoClient(sttpBackend, config.imovo)
         .leftMap(e => DigitalVoucherSuspendFailure(s"Failed to create Imovo client: $e"))
       suspensions <- fetchSuspensionsToBeProcessed(salesforce).leftWiden[Failure]
-      suspensionResults <- EitherT.right[Failure].apply(
-        suspensions.traverse(suspension =>
-          sendSuspensionToDigitalVoucherApi(salesforce, imovo, LocalDateTime.now)(suspension).value
+      suspensionResults <- EitherT
+        .right[Failure]
+        .apply(
+          suspensions.traverse(suspension =>
+            sendSuspensionToDigitalVoucherApi(salesforce, imovo, LocalDateTime.now)(suspension).value,
+          ),
         )
-      )
       maybeFailures = suspensionResults.collect { case Left(failure) => failure } match {
         case Nil => None
         case failures => Some[Failure](CompositeFailure(failures))

handlers/holiday-stop-api/src/test/scala/com/gu/holiday_stops/HolidayStopSubscriptionCancellationTest.scala

@@ -84,7 +84,7 @@ class HolidayStopSubscriptionCancellationTest extends AnyFlatSpec with Matchers
       ),
       processedExpectedRefundedAfterCancellationDate.copy(
         Actual_Price__c = Some(Price(estimatedPrice)),
-      )
+      ),
     )
   }
 

handlers/holiday-stop-processor/src/test/scala/com/gu/holidaystopprocessor/ProcessorErrorHandlingSpec.scala

@@ -186,7 +186,7 @@ class ProcessorErrorHandlingSpec extends AnyFlatSpec with Matchers with OptionVa
     result.flatMap(_.overallFailure) should contain atLeastOneOf (
       OverallFailure("zuora boom 1"),
       OverallFailure("zuora boom 2"),
-      OverallFailure("zuora boom 3")
+      OverallFailure("zuora boom 3"),
     )
   }
 

handlers/product-move-api/src/main/scala/com/gu/productmove/SQS.scala

@@ -201,8 +201,7 @@ case class toRCEmailPayloadProductSwitchAttributes(
     payment_frequency: String,
     currency: String,
     subscription_id: String,
-) extends EmailPayloadAttributes
-    derives JsonEncoder
+) extends EmailPayloadAttributes derives JsonEncoder
 
 case class RCtoSPEmailPayloadProductSwitchAttributes(
     first_name: String,
@@ -213,16 +212,14 @@ case class RCtoSPEmailPayloadProductSwitchAttributes(
     payment_frequency: String,
     currency: String,
     subscription_id: String,
-) extends EmailPayloadAttributes
-    derives JsonEncoder
+) extends EmailPayloadAttributes derives JsonEncoder
 
 case class EmailPayloadCancellationAttributes(
     first_name: String,
     last_name: String,
     product_type: String,
     cancellation_effective_date: Option[String],
-) extends EmailPayloadAttributes
-    derives JsonEncoder
+) extends EmailPayloadAttributes derives JsonEncoder
 
 case class EmailPayloadUpdateAmountAttributes(
     first_name: String,
@@ -231,8 +228,7 @@ case class EmailPayloadUpdateAmountAttributes(
     currency: String,
     frequency: String,
     next_payment_date: String,
-) extends EmailPayloadAttributes
-    derives JsonEncoder
+) extends EmailPayloadAttributes derives JsonEncoder
 
 case class EmailPayloadContactAttributes(SubscriberAttributes: EmailPayloadAttributes) derives JsonEncoder
 

handlers/product-move-api/src/main/scala/com/gu/productmove/endpoint/move/ProductMoveEndpointTypes.scala

@@ -37,8 +37,7 @@ object ProductMoveEndpointTypes {
   sealed trait OutputBody
   case class Success(
       @description("Success message.") message: String,
-  ) extends OutputBody
-      derives JsonCodec
+  ) extends OutputBody derives JsonCodec
   case class PreviewResult(
       @description("The amount payable by the customer today") amountPayableToday: BigDecimal,
       @description(
@@ -49,8 +48,7 @@ object ProductMoveEndpointTypes {
       @description(
         "The next payment date of the new supporter plus subscription, i.e.: the second payment date",
       ) nextPaymentDate: LocalDate,
-  ) extends OutputBody
-      derives JsonCodec
+  ) extends OutputBody derives JsonCodec
 
   case class BadRequest(@description("Error message.") message: String) extends ErrorResponse derives JsonCodec
 

handlers/product-move-api/src/main/scala/com/gu/productmove/endpoint/updateamount/UpdateSupporterPlusAmountEndpointTypes.scala

@@ -17,8 +17,7 @@ object UpdateSupporterPlusAmountEndpointTypes {
   sealed trait OutputBody derives JsonCodec
   case class Success(
       @description("Success message.") message: String,
-  ) extends OutputBody
-      derives JsonCodec
+  ) extends OutputBody derives JsonCodec
 
   given Schema[Success] = inlineSchema(Schema.derived)
 

handlers/product-move-api/src/main/scala/com/gu/productmove/zuora/SubscriptionUpdate.scala

@@ -50,13 +50,11 @@ case class SwitchProductUpdateRequest(
     targetDate: Option[LocalDate] = None,
     currentTerm: Option[String] = None,
     currentTermPeriodType: Option[String] = None,
-) extends SubscriptionUpdateRequest
-    derives JsonEncoder
+) extends SubscriptionUpdateRequest derives JsonEncoder
 
 case class UpdateSubscriptionAmount(
     update: List[UpdateSubscriptionAmountItem],
-) extends SubscriptionUpdateRequest
-    derives JsonEncoder
+) extends SubscriptionUpdateRequest derives JsonEncoder
 
 case class UpdateSubscriptionAmountItem(
     contractEffectiveDate: LocalDate,

handlers/stripe-webhook-endpoints/src/main/scala/com/gu/stripeCardUpdated/CardUpdatedMessageBody.scala

@@ -79,7 +79,7 @@ object CardUpdatedMessageBody {
       (JsPath \ "customer").read[String].map(StripeCustomerId.apply) and
       (
         (JsPath \ "exp_month").read[Int] and
-          (JsPath \ "exp_year").read[Int],
+          (JsPath \ "exp_year").read[Int]
       )(StripeExpiry.apply _) and
       (JsPath \ "last4").read[String].map(StripeLast4.apply)
   )(EventDataObject.apply _)

project/Dependencies.scala

@@ -8,11 +8,11 @@ object Dependencies {
   val awsSdkVersion = "2.27.24"
   val circeVersion = "0.14.10"
   val sttpVersion = "3.10.1"
-  val http4sVersion = "0.22.15" // keep version 0.22.15, later versions pull in cats effect 3 which is not compatible
+  val http4sVersion = "0.23.30" // keep version 0.23.30, later versions pull in cats effect 3 which is not compatible
   val catsVersion = "2.12.0"
-  val catsEffectVersion = "2.5.5"
+  val catsEffectVersion = "3.5.7"
   val logging: Seq[ModuleID] = Seq(
-    "ch.qos.logback" % "logback-classic" % "1.5.11",
+    "ch.qos.logback" % "logback-classic" % "1.5.14",
     "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5",
   )
 
@@ -38,7 +38,7 @@ object Dependencies {
   val scalaLambda = "io.github.mkotsur" %% "aws-lambda-scala" % "0.3.0"
 
   // GCP
-  val googleBigQuery = "com.google.cloud" % "google-cloud-bigquery" % "2.43.1"
+  val googleBigQuery = "com.google.cloud" % "google-cloud-bigquery" % "2.43.3"
 
   // Cats
   val catsCore = "org.typelevel" %% "cats-core" % catsVersion
@@ -77,22 +77,22 @@ object Dependencies {
 
   // Other
   val zio = "dev.zio" %% "zio" % "1.0.17"
-  val zio2Version = "2.0.22"
+  val zio2Version = "2.1.14"
   val zio2 = "dev.zio" %% "zio" % zio2Version
-  val tapirVersion = "1.9.11"
+  val tapirVersion = "1.11.10"
   val enumeratum = "com.beachape" %% "enumeratum" % "1.7.5"
   val scalaXml = "org.scala-lang.modules" %% "scala-xml" % "2.3.0"
-  val stripe = "com.stripe" % "stripe-java" % "22.31.0"
-  val parallelCollections = "org.scala-lang.modules" %% "scala-parallel-collections" % "1.0.4"
+  val stripe = "com.stripe" % "stripe-java" % "28.2.0"
+  val parallelCollections = "org.scala-lang.modules" %% "scala-parallel-collections" % "1.1.0"
 
   // Testing
   val diffx = "com.softwaremill.diffx" %% "diffx-scalatest-should" % "0.9.0" % Test
   val scalatest = "org.scalatest" %% "scalatest" % "3.2.19" % Test
-  val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.17.1" % Test
-  val scalaMock = "org.scalamock" %% "scalamock" % "5.2.0" % Test
-  val mockito = "org.mockito" % "mockito-core" % "5.14.1" % Test
+  val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.18.1" % Test
+  val scalaMock = "org.scalamock" %% "scalamock" % "6.0.0" % Test
+  val mockito = "org.mockito" % "mockito-core" % "5.14.2" % Test
   // play-json still uses an old version of jackson-core which has a vulnerability - https://security.snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-7569538
-  val jacksonVersion = "2.17.2"
+  val jacksonVersion = "2.17.3"
 
   val jacksonDependencies: Seq[ModuleID] = Seq(
     "com.fasterxml.jackson.core" % "jackson-core" % jacksonVersion,

project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.2
+sbt.version=1.10.6