Skip to content

Commit 60b9b2c

Browse files
authored
Merge branch 'master' into update/scalamock-7.4.2
2 parents 96c02b4 + e12b4ff commit 60b9b2c

File tree

11 files changed

+14
-14
lines changed

11 files changed

+14
-14
lines changed

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ val scalaTestDeps = Seq(
2121
)
2222

2323
val scalaMock = "org.scalamock" %% "scalamock" % "7.4.2" % Test
24-
val zioVersion = "2.1.20"
24+
val zioVersion = "2.1.21"
2525

2626
lazy val scala_core = (project in file("scala-core-modules/scala-core"))
2727
.settings(
@@ -472,7 +472,7 @@ lazy val scala_libraries = (project in file("scala-libraries"))
472472
"org.elasticmq" %% "elasticmq-rest-sqs" % "1.6.14"
473473
),
474474
libraryDependencies ++= Seq(
475-
"software.amazon.awssdk" % "sqs" % "2.32.33"
475+
"software.amazon.awssdk" % "sqs" % "2.33.5"
476476
),
477477
Defaults.itSettings
478478
)
@@ -596,7 +596,7 @@ lazy val scala_libraries_testing = (project in file("scala-libraries-testing"))
596596
"com.amazonaws" % "aws-java-sdk-s3" % "1.12.788" % IntegrationTest,
597597
"com.dimafeng" %% "testcontainers-scala-scalatest" % scalaTestContainersVersion % IntegrationTest,
598598
"com.dimafeng" %% "testcontainers-scala-localstack-v2" % scalaTestContainersVersion % IntegrationTest,
599-
"software.amazon.awssdk" % "s3" % "2.32.33"
599+
"software.amazon.awssdk" % "s3" % "2.33.5"
600600
),
601601
Defaults.itSettings,
602602
IntegrationTest / fork := true

play-scala/dependency-injection/build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ scalaVersion := ScalaVersions.scala3Version
88

99
libraryDependencies += guice
1010
libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % LibraryVersions.scalatestPlayVersion % Test
11-
libraryDependencies += "com.softwaremill.macwire" %% "macros" % "2.6.6" % Provided
12-
libraryDependencies += "com.softwaremill.macwire" %% "util" % "2.6.6"
11+
libraryDependencies += "com.softwaremill.macwire" %% "macros" % "2.6.7" % Provided
12+
libraryDependencies += "com.softwaremill.macwire" %% "util" % "2.6.7"

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
sbt.version=1.11.5
1+
sbt.version=1.11.6
22

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version = 1.11.5
1+
sbt.version = 1.11.6
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.11.5
1+
sbt.version=1.11.6
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.11.5
1+
sbt.version=1.11.6
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.11.5
1+
sbt.version=1.11.6

scala-libraries-standalone/tapir/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
val scalaV = "2.12.16"
2-
val tapirV = "1.11.42"
2+
val tapirV = "1.11.44"
33
ThisBuild / scalaVersion := scalaV
44
ThisBuild / version := "1.0.0"
55
ThisBuild / organization := "com.baeldung"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.11.5
1+
sbt.version=1.11.6
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.11.5
1+
sbt.version=1.11.6

0 commit comments

Comments
 (0)