diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 0c441ab3..5da9e027 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 +b890253f092631d1c460353190098a0768b59176 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 a7ff997f..8ad4f977 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -11,11 +11,11 @@ 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") - val specsVersion = "4.20.7" + val specsVersion = "4.20.8" val specsBuild = Seq( "specs2-core", ).map("org.specs2" %% _ % specsVersion) @@ -51,7 +51,7 @@ object Dependencies { val pekkoStreams = Seq("org.apache.pekko" %% "pekko-stream" % pekkoVersion) val backendServerTestDependencies = Seq( - "org.playframework" %% "play-netty-server" % "3.0.4", + "org.playframework" %% "play-netty-server" % "3.0.5", // Following dependencies are pulled in by play-netty-server, we just make sure // now that we use the same pekko version here like pekko-stream above. // This is because when upgrading the pekko version in Play and play-ws here we usually release diff --git a/project/build.properties b/project/build.properties index 1894b625..7a3fbb32 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ # # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. # -sbt.version=1.10.0 +sbt.version=1.10.1