Skip to content

Commit

Permalink
Merge pull request playframework#917 from scala-steward/update/patches
Browse files Browse the repository at this point in the history
Patch updates
  • Loading branch information
mkurz authored Jul 30, 2024
2 parents a98acd4 + 5fe9885 commit cd6ec92
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 6 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
b890253f092631d1c460353190098a0768b59176
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
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#
# Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
#
sbt.version=1.10.0
sbt.version=1.10.1

0 comments on commit cd6ec92

Please sign in to comment.