Skip to content

Commit 5752f1f

Browse files
authored
Merge branch 'master' into update/logback-classic-1.5.7
2 parents c523ea2 + 0ea4aae commit 5752f1f

File tree

7 files changed

+13
-10
lines changed

7 files changed

+13
-10
lines changed

build.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -443,14 +443,14 @@ lazy val scala_libraries = (project in file("scala-libraries"))
443443
"org.elasticmq" %% "elasticmq-core" % "1.6.6",
444444
"org.elasticmq" %% "elasticmq-server" % "1.6.6",
445445
"org.elasticmq" %% "elasticmq-rest-sqs" % "1.6.6",
446-
"software.amazon.awssdk" % "sqs" % "2.26.31"
446+
"software.amazon.awssdk" % "sqs" % "2.27.10"
447447
),
448448
Defaults.itSettings
449449
)
450450

451451
val http4sBlaze = "0.23.16"
452452
val http4sVersion = "0.23.27"
453-
val osLibVersion = "0.10.3"
453+
val osLibVersion = "0.10.4"
454454

455455
val osLibDep = "com.lihaoyi" %% "os-lib" % osLibVersion
456456

@@ -545,10 +545,10 @@ lazy val scala_libraries_testing = (project in file("scala-libraries-testing"))
545545
scalaMock,
546546
"com.lihaoyi" %% "utest" % "0.8.4" % "test",
547547
munitDep,
548-
"com.amazonaws" % "aws-java-sdk-s3" % "1.12.767" % IntegrationTest,
548+
"com.amazonaws" % "aws-java-sdk-s3" % "1.12.770" % IntegrationTest,
549549
"com.dimafeng" %% "testcontainers-scala-scalatest" % "0.41.3" % IntegrationTest,
550550
"com.dimafeng" %% "testcontainers-scala-localstack-v2" % "0.41.3" % IntegrationTest,
551-
"software.amazon.awssdk" % "s3" % "2.26.31"
551+
"software.amazon.awssdk" % "s3" % "2.27.10"
552552
),
553553
Defaults.itSettings,
554554
IntegrationTest / fork := true
@@ -649,7 +649,7 @@ lazy val zio = (project in file("zio"))
649649
libraryDependencies += "dev.zio" %% "zio" % zioVersion,
650650
libraryDependencies += "dev.zio" %% "zio-streams" % zioVersion,
651651
libraryDependencies += zioTestSbt,
652-
libraryDependencies += "dev.zio" %% "zio-kafka" % "2.8.0",
652+
libraryDependencies += "dev.zio" %% "zio-kafka" % "2.8.2",
653653
libraryDependencies += zioJsonDep,
654654
libraryDependencies += "dev.zio" %% "zio-prelude" % "1.0.0-RC23",
655655
libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.19" % Test,

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.14"
3-
val scala3Version = "3.4.2"
3+
val scala3Version = "3.4.3"
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
)

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
22

3-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.4")
3+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.5")
44
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
55

66
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.2.1")

scala-core-modules/scala-core-9/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
- [Find Two’s Complement of a Number in Scala](https://www.baeldung.com/scala/compute-twos-complement)
77
- [Convert Option to Either in Scala](https://www.baeldung.com/scala/option-either-conversion)
88
- [Meaning of _root_ In Scala Import Clause](https://www.baeldung.com/scala/root-import-clause)
9-
- [Check if All Characters in a Scala String Are Either Upper or Lower Case](https://www.baeldung.com/scala/string-check-all-characters-upper-lower-case
9+
- [Check if All Characters in a Scala String Are Either Upper or Lower Case](https://www.baeldung.com/scala/string-check-all-characters-upper-lower-case)
10+
- [TASTy Files in Scala 3](https://www.baeldung.com/scala/scala-3-tasty)

scala-core-modules/scala-core-numbers/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
- [Find Factorial of a Number in Scala](https://www.baeldung.com/scala/find-factorial)
77
- [Check if a Number Is a Power of Two in Scala](https://www.baeldung.com/scala/check-power-of-two)
88
- [Get the Individual Digits of a Number in Scala](https://www.baeldung.com/scala/number-extract-digits)
9+
- [Convert a Number to Roman Numeral in Scala](https://www.baeldung.com/scala/convert-number-roman)

scala-core-modules/scala-strings-2/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
This module contains articles about Scala's Strings.
44

55
### Relevant Articles:
6-
6+
- [How to Check if a String Is Null or Empty in Scala](https://www.baeldung.com/scala/string-test-null-empty)
7+
- [Convert From Camel Case to Snake Case in Scala](https://www.baeldung.com/scala/camel-snake-case-automatic-conversion)

scalatra/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ libraryDependencies ++= Seq(
99
"org.scalatra" %% "scalatra" % ScalatraVersion,
1010
"org.scalatra" %% "scalatra-scalatest" % ScalatraVersion % "test",
1111
"ch.qos.logback" % "logback-classic" % "1.5.7" % "runtime",
12-
"org.eclipse.jetty" % "jetty-webapp" % "11.0.22" % "container",
12+
"org.eclipse.jetty" % "jetty-webapp" % "11.0.23" % "container",
1313
"javax.servlet" % "javax.servlet-api" % "4.0.1" % "provided",
1414
"org.scalatra" %% "scalatra-auth" % ScalatraVersion,
1515
"org.scalatra" %% "scalatra-json" % "2.8.4",

0 commit comments

Comments
 (0)