Skip to content

Commit e059418

Browse files
authored
Merge branch 'master' into update/elasticmq-core-1.6.10
2 parents b301d1f + 03629da commit e059418

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

build.sbt

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ val jUnitInterface = "com.github.sbt" % "junit-interface" % "0.13.3" % "test"
77
val catsEffect = "org.typelevel" %% "cats-effect" % "3.5.7"
88
val catEffectTest = "org.typelevel" %% "cats-effect-testkit" % "3.5.7" % Test
99
val scalaReflection = "org.scala-lang" % "scala-reflect" % scalaV
10-
val logback = "ch.qos.logback" % "logback-classic" % "1.5.12"
10+
val logback = "ch.qos.logback" % "logback-classic" % "1.5.13"
1111
val embedMongoVersion = "4.18.1"
1212
val AkkaVersion = "2.9.3"
1313
val AlpakkaVersion = "8.0.0"
@@ -60,7 +60,7 @@ lazy val scala2_core = (project in file("scala-2-modules/scala2-core"))
6060
libraryDependencies += scalaReflection,
6161
libraryDependencies += scalaXmlDep,
6262
libraryDependencies += "com.github.scopt" %% "scopt" % "4.1.0",
63-
libraryDependencies += "org.rogach" %% "scallop" % "5.1.0",
63+
libraryDependencies += "org.rogach" %% "scallop" % "5.2.0",
6464
libraryDependencies += "org.backuity.clist" %% "clist-core" % "3.5.1",
6565
libraryDependencies += "org.backuity.clist" %% "clist-macros" % "3.5.1" % "provided",
6666
libraryDependencies += "args4j" % "args4j" % "2.37",
@@ -431,7 +431,7 @@ lazy val scala_libraries = (project in file("scala-libraries"))
431431
circeParserDep,
432432
"com.softwaremill.retry" %% "retry" % "0.3.6",
433433
log4jApiScalaDep,
434-
"org.apache.logging.log4j" % "log4j-core" % "2.24.2" % Runtime,
434+
"org.apache.logging.log4j" % "log4j-core" % "2.24.3" % Runtime,
435435
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.5",
436436
"software.amazon.awssdk" % "s3" % "2.25.9",
437437
"com.github.seratch" %% "awscala" % "0.9.2"
@@ -457,8 +457,10 @@ lazy val scala_libraries = (project in file("scala-libraries"))
457457
libraryDependencies ++= Seq(
458458
"org.elasticmq" %% "elasticmq-core" % "1.6.10",
459459
"org.elasticmq" %% "elasticmq-server" % "1.6.10",
460-
"org.elasticmq" %% "elasticmq-rest-sqs" % "1.6.10",
461-
"software.amazon.awssdk" % "sqs" % "2.29.24"
460+
"org.elasticmq" %% "elasticmq-rest-sqs" % "1.6.10"
461+
),
462+
libraryDependencies ++= Seq(
463+
"software.amazon.awssdk" % "sqs" % "2.29.37"
462464
),
463465
Defaults.itSettings
464466
)
@@ -492,7 +494,7 @@ lazy val scala_libraries_os = (project in file("scala-libraries-os"))
492494
libraryDependencies ++= scalaTestDeps,
493495
libraryDependencies ++= Seq(
494496
log4jApiScalaDep,
495-
"org.apache.logging.log4j" % "log4j-core" % "2.24.2" % Runtime
497+
"org.apache.logging.log4j" % "log4j-core" % "2.24.3" % Runtime
496498
),
497499
libraryDependencies += osLibDep
498500
)
@@ -559,7 +561,7 @@ lazy val scala_libraries_fp = (project in file("scala-libraries-fp"))
559561
"org.http4s" %% "http4s-blaze-server" % http4sBlaze,
560562
"org.http4s" %% "http4s-blaze-client" % http4sBlaze,
561563
catEffectTest,
562-
"org.typelevel" %% "cats-effect-testing-scalatest" % "1.5.0" % Test,
564+
"org.typelevel" %% "cats-effect-testing-scalatest" % "1.6.0" % Test,
563565
"org.scalaz" %% "scalaz-core" % scalazVersion,
564566
"junit" % "junit" % "4.13.2" % Test,
565567
"org.typelevel" %% "spire" % spireVersion
@@ -579,10 +581,10 @@ lazy val scala_libraries_testing = (project in file("scala-libraries-testing"))
579581
scalaMock,
580582
"com.lihaoyi" %% "utest" % "0.8.4" % "test",
581583
munitDep,
582-
"com.amazonaws" % "aws-java-sdk-s3" % "1.12.779" % IntegrationTest,
584+
"com.amazonaws" % "aws-java-sdk-s3" % "1.12.780" % IntegrationTest,
583585
"com.dimafeng" %% "testcontainers-scala-scalatest" % scalaTestContainersVersion % IntegrationTest,
584586
"com.dimafeng" %% "testcontainers-scala-localstack-v2" % scalaTestContainersVersion % IntegrationTest,
585-
"software.amazon.awssdk" % "s3" % "2.29.24"
587+
"software.amazon.awssdk" % "s3" % "2.29.37"
586588
),
587589
Defaults.itSettings,
588590
IntegrationTest / fork := true

project/ScalaVersions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
object ScalaVersions {
22
val scala2Version = "2.13.15"
3-
val scala3Version = "3.5.2"
3+
val scala3Version = "3.6.2"
44
@deprecated(
55
"Use Scala 2.13 or Scala 3. Don't use 2.12 unless it is a specific feature in 2.12."
66
)

scalatra/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ version := "0.1.0-SNAPSHOT"
88
libraryDependencies ++= Seq(
99
"org.scalatra" %% "scalatra" % ScalatraVersion,
1010
"org.scalatra" %% "scalatra-scalatest" % ScalatraVersion % "test",
11-
"ch.qos.logback" % "logback-classic" % "1.5.12" % "runtime",
11+
"ch.qos.logback" % "logback-classic" % "1.5.13" % "runtime",
1212
"org.eclipse.jetty" % "jetty-webapp" % "11.0.24" % "container",
1313
"javax.servlet" % "javax.servlet-api" % "4.0.1" % "provided",
1414
"org.scalatra" %% "scalatra-auth" % ScalatraVersion,

0 commit comments

Comments
 (0)