Skip to content

Commit

Permalink
Merge pull request playframework#919 from scala-steward/update/2.2.x/…
Browse files Browse the repository at this point in the history
…patches

[2.2.x] Patch updates
  • Loading branch information
mkurz authored Jul 30, 2024
2 parents 7237cad + c7d64e0 commit 6b0644c
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Scala Steward: Reformat with scalafmt 3.5.8
115fb7c2782ba8ca7d31b43673832ee5a6851de0

# Scala Steward: Reformat with scalafmt 3.8.3
186674ddaa8e441a6361b4b677c666eb7bdb4aef
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion project/CleanShadedPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
*/

// https://github.com/sbt/sbt-dirty-money/blob/master/src/main/scala/sbtdirtymoney/DirtyMoneyPlugin.scala

import sbt._
import Keys._

Expand Down
4 changes: 2 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 6b0644c

Please sign in to comment.