diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 0c441ab3..04f258cd 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,5 @@ # Scala Steward: Reformat with scalafmt 3.5.8 115fb7c2782ba8ca7d31b43673832ee5a6851de0 + +# Scala Steward: Reformat with scalafmt 3.8.3 +186674ddaa8e441a6361b4b677c666eb7bdb4aef diff --git a/.scalafmt.conf b/.scalafmt.conf index d4011dbf..d135e8af 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -11,4 +11,4 @@ rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abst spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in import x.{ yyy } trailingCommas = preserve newlines.afterCurlyLambda = preserve -version = 3.8.2 +version = 3.8.3 diff --git a/project/CleanShadedPlugin.scala b/project/CleanShadedPlugin.scala index d9c01436..dbde0682 100644 --- a/project/CleanShadedPlugin.scala +++ b/project/CleanShadedPlugin.scala @@ -4,7 +4,6 @@ */ // https://github.com/sbt/sbt-dirty-money/blob/master/src/main/scala/sbtdirtymoney/DirtyMoneyPlugin.scala - import sbt._ import Keys._ diff --git a/project/Dependencies.scala b/project/Dependencies.scala index f4cf0651..2cad6ff2 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -11,7 +11,7 @@ object Dependencies { val logback = Seq("ch.qos.logback" % "logback-core" % "1.5.6") - val assertj = Seq("org.assertj" % "assertj-core" % "3.26.0") + val assertj = Seq("org.assertj" % "assertj-core" % "3.26.3") val awaitility = Seq("org.awaitility" % "awaitility" % "4.2.1") @@ -47,7 +47,7 @@ object Dependencies { val akkaStreams = Seq("com.typesafe.akka" %% "akka-stream" % akkaVersion) val backendServerTestDependencies = Seq( - "com.typesafe.play" %% "play-netty-server" % "2.9.4", + "com.typesafe.play" %% "play-netty-server" % "2.9.5", // Following dependencies are pulled in by play-netty-server, we just make sure // now that we use the same akka version here like akka-stream above. // This is because when upgrading the akka version in Play and play-ws here we usually release