Skip to content

Commit 3f6d656

Browse files
authored
Merge branch 'master' into update/spark-sql-4.0.0
2 parents 12c1bb7 + ddcde52 commit 3f6d656

File tree

11 files changed

+23
-23
lines changed

11 files changed

+23
-23
lines changed

build.sbt

Lines changed: 13 additions & 13 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.3.2" % Test
24-
val zioVersion = "2.1.18"
24+
val zioVersion = "2.1.19"
2525

2626
lazy val scala_core = (project in file("scala-core-modules/scala-core"))
2727
.settings(
@@ -41,7 +41,7 @@ lazy val scala_core_2 = (project in file("scala-core-modules/scala-core-2"))
4141
scalaVersion := scala3Version
4242
)
4343

44-
val scalaXmlDep = "org.scala-lang.modules" %% "scala-xml" % "2.3.0"
44+
val scalaXmlDep = "org.scala-lang.modules" %% "scala-xml" % "2.4.0"
4545

4646
lazy val scala_core_3 = (project in file("scala-core-modules/scala-core-3"))
4747
.settings(
@@ -361,9 +361,9 @@ val shapelessVersion = "2.3.13"
361361
val scalazVersion = "7.3.8"
362362
val fs2Version = "3.12.0"
363363
val reactiveMongo = "1.1.0-RC15"
364-
val slickPgVersion = "0.23.0"
364+
val slickPgVersion = "0.23.1"
365365
val scalaTestContainersVersion = "0.43.0"
366-
val postgresqlVersion = "42.7.5"
366+
val postgresqlVersion = "42.7.6"
367367
val json4sVersion = "4.0.7"
368368

369369
lazy val scala2_libraries =
@@ -417,12 +417,12 @@ lazy val scala2_libraries =
417417
val circeVersion = "0.14.13"
418418
val monixVersion = "3.4.1"
419419
val sparkVersion = "4.0.0"
420-
val elastic4sVersion = "8.18.0"
420+
val elastic4sVersion = "8.18.1"
421421

422422
val sparkCoreDep = "org.apache.spark" %% "spark-core" % sparkVersion
423423
val sparkSqlDep = "org.apache.spark" %% "spark-sql" % sparkVersion
424424

425-
val enumeratumDep = "com.beachape" %% "enumeratum" % "1.7.6"
425+
val enumeratumDep = "com.beachape" %% "enumeratum" % "1.9.0"
426426
val circeDep = "io.circe" %% "circe-generic" % circeVersion
427427
val circeParserDep = "io.circe" %% "circe-parser" % circeVersion
428428

@@ -443,7 +443,7 @@ lazy val scala_libraries = (project in file("scala-libraries"))
443443
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.5",
444444
"software.amazon.awssdk" % "s3" % "2.25.9",
445445
"com.github.seratch" %% "awscala" % "0.9.2",
446-
"com.opencsv" % "opencsv" % "5.11",
446+
"com.opencsv" % "opencsv" % "5.11.1",
447447
"com.github.tototoshi" %% "scala-csv" % "2.0.0",
448448
"org.apache.commons" % "commons-csv" % "1.14.0"
449449
),
@@ -471,7 +471,7 @@ lazy val scala_libraries = (project in file("scala-libraries"))
471471
"org.elasticmq" %% "elasticmq-rest-sqs" % "1.6.12"
472472
),
473473
libraryDependencies ++= Seq(
474-
"software.amazon.awssdk" % "sqs" % "2.31.47"
474+
"software.amazon.awssdk" % "sqs" % "2.31.58"
475475
),
476476
Defaults.itSettings
477477
)
@@ -483,7 +483,7 @@ lazy val scala_libraries_2 = (project in file("scala-libraries-2"))
483483
scalaVersion := scala3Version,
484484
libraryDependencies ++= scalaTestDeps
485485
.map(_.withConfigurations(Some("it,test"))),
486-
libraryDependencies += "io.scalaland" %% "chimney" % "1.8.0",
486+
libraryDependencies += "io.scalaland" %% "chimney" % "1.8.1",
487487
Defaults.itSettings
488488
)
489489

@@ -592,10 +592,10 @@ lazy val scala_libraries_testing = (project in file("scala-libraries-testing"))
592592
scalaMock,
593593
"com.lihaoyi" %% "utest" % "0.8.5" % "test",
594594
munitDep,
595-
"com.amazonaws" % "aws-java-sdk-s3" % "1.12.783" % IntegrationTest,
595+
"com.amazonaws" % "aws-java-sdk-s3" % "1.12.785" % IntegrationTest,
596596
"com.dimafeng" %% "testcontainers-scala-scalatest" % scalaTestContainersVersion % IntegrationTest,
597597
"com.dimafeng" %% "testcontainers-scala-localstack-v2" % scalaTestContainersVersion % IntegrationTest,
598-
"software.amazon.awssdk" % "s3" % "2.31.47"
598+
"software.amazon.awssdk" % "s3" % "2.31.58"
599599
),
600600
Defaults.itSettings,
601601
IntegrationTest / fork := true
@@ -739,7 +739,7 @@ lazy val zio3 = (project in file("zio3"))
739739
.settings(
740740
libraryDependencies ++= Seq(
741741
zioJsonDep,
742-
"dev.zio" %% "zio-http" % "3.2.0",
742+
"dev.zio" %% "zio-http" % "3.3.3",
743743
"io.getquill" %% "quill-zio" % "4.8.5",
744744
"io.getquill" %% "quill-jdbc-zio" % "4.8.5",
745745
"com.h2database" % "h2" % "2.2.220"
@@ -748,7 +748,7 @@ lazy val zio3 = (project in file("zio3"))
748748
"dev.zio" %% "zio-test" % zioVersion % Test,
749749
zioTestSbt,
750750
"dev.zio" %% "zio-test-magnolia" % zioVersion % Test,
751-
"dev.zio" %% "zio-http-testkit" % "3.2.0" % Test
751+
"dev.zio" %% "zio-http-testkit" % "3.3.3" % Test
752752
),
753753
testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"),
754754
run / 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.16"
3-
val scala3Version = "3.7.0"
3+
val scala3Version = "3.7.1"
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/build.properties

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

sbt-release/project/build.properties

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

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.29"
2+
val tapirV = "1.11.33"
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.10.11
1+
sbt.version=1.11.1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.10.11
1+
sbt.version=1.11.1

scalatra/project/build.properties

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

0 commit comments

Comments
 (0)