Skip to content

Commit 3d6bdf0

Browse files
authored
Merge branch 'master' into update/os-lib-0.11.6
2 parents 06d12f8 + 4323ff7 commit 3d6bdf0

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

build.sbt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ val scalaTestDeps = Seq(
2020
"org.scalatest" %% "scalatest-flatspec" % "3.2.19" % Test
2121
)
2222

23-
val scalaMock = "org.scalamock" %% "scalamock" % "7.5.0" % Test
23+
val scalaMock = "org.scalamock" %% "scalamock" % "7.5.1" % Test
2424
val zioVersion = "2.1.22"
2525

2626
lazy val scala_core = (project in file("scala-core-modules/scala-core"))
@@ -472,7 +472,7 @@ lazy val scala_libraries = (project in file("scala-libraries"))
472472
"org.elasticmq" %% "elasticmq-rest-sqs" % "1.6.15"
473473
),
474474
libraryDependencies ++= Seq(
475-
"software.amazon.awssdk" % "sqs" % "2.35.11"
475+
"software.amazon.awssdk" % "sqs" % "2.37.3"
476476
),
477477
Defaults.itSettings
478478
)
@@ -489,9 +489,10 @@ lazy val scala_libraries_2 = (project in file("scala-libraries-2"))
489489
)
490490

491491
val http4sBlaze = "0.23.17"
492-
val http4sVersion = "0.23.32"
492+
val http4sVersion = "0.23.33"
493493
val osLibVersion = "0.11.6"
494494

495+
495496
val osLibDep = "com.lihaoyi" %% "os-lib" % osLibVersion
496497

497498
val log4jApiScalaDep =
@@ -521,7 +522,7 @@ lazy val redis_intro =
521522
.map(_.withConfigurations(Some("it,test"))),
522523
libraryDependencies ++= Seq(
523524
"redis.clients" % "jedis" % "7.0.0",
524-
"com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.20.0",
525+
"com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.20.1",
525526
"org.scalatestplus" %% "mockito-3-4" % "3.2.10.0" % "it"
526527
),
527528
Defaults.itSettings
@@ -552,7 +553,7 @@ lazy val nscalatime = (project in file("scala-libraries-standalone/nscalatime"))
552553
val spireVersion = "0.18.0"
553554
val kafkaVersion = "8.1.0-ce"
554555
val pureconfigVersion = "0.17.9"
555-
val jackSonVersion = "2.20.0"
556+
val jackSonVersion = "2.20.1"
556557
val log4jApiScalaVersion = "13.1.0"
557558
val log4jVersion = "2.25.2"
558559
val avro4sVersion = "4.1.2"
@@ -593,10 +594,10 @@ lazy val scala_libraries_testing = (project in file("scala-libraries-testing"))
593594
scalaMock,
594595
"com.lihaoyi" %% "utest" % "0.8.9" % "test",
595596
munitDep,
596-
"com.amazonaws" % "aws-java-sdk-s3" % "1.12.792" % IntegrationTest,
597+
"com.amazonaws" % "aws-java-sdk-s3" % "1.12.793" % IntegrationTest,
597598
"com.dimafeng" %% "testcontainers-scala-scalatest" % scalaTestContainersVersion % IntegrationTest,
598599
"com.dimafeng" %% "testcontainers-scala-localstack-v2" % scalaTestContainersVersion % IntegrationTest,
599-
"software.amazon.awssdk" % "s3" % "2.35.11"
600+
"software.amazon.awssdk" % "s3" % "2.37.3"
600601
),
601602
Defaults.itSettings,
602603
IntegrationTest / fork := true

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.9")
44
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1")
55

66
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.2.1")
7-
libraryDependencies += "ai.kien" %% "python-native-libs" % "0.2.4"
7+
libraryDependencies += "ai.kien" %% "python-native-libs" % "0.2.5"
88

99
// Make sure to keep the play plugin in sync with the sub modules under play-scala group
1010
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.9")

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.50"
2+
val tapirV = "1.12.1"
33
ThisBuild / scalaVersion := scalaV
44
ThisBuild / version := "1.0.0"
55
ThisBuild / organization := "com.baeldung"

0 commit comments

Comments
 (0)