Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2.2.x] Patch updates #919

Merged
merged 5 commits into from
Jul 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading