Skip to content

Commit fe87f25

Browse files
authored
Merge branch 'master' into update/tapir-core-1.11.13
2 parents 8e2806f + 554de34 commit fe87f25

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

build.sbt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ lazy val scala_core_dates =
176176
scalaVersion := scala3Version,
177177
libraryDependencies ++= scalaTestDeps,
178178
libraryDependencies += "joda-time" % "joda-time" % "2.13.0",
179-
libraryDependencies += "com.github.nscala-time" %% "nscala-time" % "2.34.0",
179+
libraryDependencies += "com.github.nscala-time" %% "nscala-time" % "3.0.0",
180180
libraryDependencies += "com.typesafe" % "config" % "1.4.3"
181181
)
182182

@@ -354,7 +354,7 @@ val scalazVersion = "7.3.8"
354354
val fs2Version = "3.11.0"
355355
val reactiveMongo = "1.1.0-RC14"
356356
val slickPgVersion = "0.22.2"
357-
val scalaTestContainersVersion = "0.41.5"
357+
val scalaTestContainersVersion = "0.41.8"
358358
val postgresqlVersion = "42.7.5"
359359
val json4sVersion = "4.0.7"
360360

@@ -460,7 +460,7 @@ lazy val scala_libraries = (project in file("scala-libraries"))
460460
"org.elasticmq" %% "elasticmq-rest-sqs" % "1.6.11"
461461
),
462462
libraryDependencies ++= Seq(
463-
"software.amazon.awssdk" % "sqs" % "2.29.52"
463+
"software.amazon.awssdk" % "sqs" % "2.30.7"
464464
),
465465
Defaults.itSettings
466466
)
@@ -472,7 +472,7 @@ lazy val scala_libraries_2 = (project in file("scala-libraries-2"))
472472
scalaVersion := scala3Version,
473473
libraryDependencies ++= scalaTestDeps
474474
.map(_.withConfigurations(Some("it,test"))),
475-
libraryDependencies += "io.scalaland" %% "chimney" % "1.6.0",
475+
libraryDependencies += "io.scalaland" %% "chimney" % "1.7.0",
476476
Defaults.itSettings
477477
)
478478

@@ -485,7 +485,7 @@ val osLibDep = "com.lihaoyi" %% "os-lib" % osLibVersion
485485
val log4jApiScalaDep =
486486
"org.apache.logging.log4j" %% "log4j-api-scala" % "13.1.0"
487487

488-
val munitDep = "org.scalameta" %% "munit" % "1.0.4" % Test
488+
val munitDep = "org.scalameta" %% "munit" % "1.1.0" % Test
489489

490490
lazy val scala_libraries_os = (project in file("scala-libraries-os"))
491491
.settings(
@@ -533,7 +533,7 @@ lazy val nscalatime = (project in file("scala-libraries-standalone/nscalatime"))
533533
.settings(
534534
name := "nscalatime",
535535
scalaVersion := scala3Version,
536-
libraryDependencies += "com.github.nscala-time" %% "nscala-time" % "2.34.0",
536+
libraryDependencies += "com.github.nscala-time" %% "nscala-time" % "3.0.0",
537537
libraryDependencies ++= scalaTestDeps
538538
)
539539

@@ -556,7 +556,7 @@ lazy val scala_libraries_fp = (project in file("scala-libraries-fp"))
556556
libraryDependencies ++= Seq(
557557
"co.fs2" %% "fs2-core" % fs2Version,
558558
"co.fs2" %% "fs2-io" % fs2Version,
559-
"org.typelevel" %% "cats-core" % "2.12.0",
559+
"org.typelevel" %% "cats-core" % "2.13.0",
560560
"org.http4s" %% "http4s-dsl" % http4sVersion,
561561
"org.http4s" %% "http4s-blaze-server" % http4sBlaze,
562562
"org.http4s" %% "http4s-blaze-client" % http4sBlaze,
@@ -584,7 +584,7 @@ lazy val scala_libraries_testing = (project in file("scala-libraries-testing"))
584584
"com.amazonaws" % "aws-java-sdk-s3" % "1.12.780" % IntegrationTest,
585585
"com.dimafeng" %% "testcontainers-scala-scalatest" % scalaTestContainersVersion % IntegrationTest,
586586
"com.dimafeng" %% "testcontainers-scala-localstack-v2" % scalaTestContainersVersion % IntegrationTest,
587-
"software.amazon.awssdk" % "s3" % "2.29.52"
587+
"software.amazon.awssdk" % "s3" % "2.30.7"
588588
),
589589
Defaults.itSettings,
590590
IntegrationTest / fork := true
@@ -682,7 +682,7 @@ lazy val cats_effects = (project in file("cats-effects"))
682682
libraryDependencies += "junit" % "junit" % "4.13.2" % Test
683683
)
684684

685-
val zioJsonDep = "dev.zio" %% "zio-json" % "0.7.4"
685+
val zioJsonDep = "dev.zio" %% "zio-json" % "0.7.8"
686686
val zioTestSbt = "dev.zio" %% "zio-test-sbt" % zioVersion % Test
687687

688688
lazy val zio = (project in file("zio"))
@@ -704,7 +704,7 @@ lazy val zio2 = (project in file("zio-2"))
704704
name := "zio-2",
705705
scalaVersion := scala3Version,
706706
libraryDependencies += "dev.zio" %% "zio" % zioVersion,
707-
libraryDependencies += "dev.zio" %% "zio-json" % "0.7.4",
707+
libraryDependencies += "dev.zio" %% "zio-json" % "0.7.8",
708708
libraryDependencies += "dev.zio" %% "zio-test" % zioVersion % Test,
709709
libraryDependencies += "dev.zio" %% "zio-test-sbt" % zioVersion % Test,
710710
libraryDependencies += "dev.zio" %% "zio-logging" % "2.1.17",

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.5" % Provided
12-
libraryDependencies += "com.softwaremill.macwire" %% "util" % "2.6.5"
11+
libraryDependencies += "com.softwaremill.macwire" %% "macros" % "2.6.6" % Provided
12+
libraryDependencies += "com.softwaremill.macwire" %% "util" % "2.6.6"

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.6.2"
3+
val scala3Version = "3.6.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,7 +1,7 @@
11
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
22

33
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.6")
4-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.1")
4+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.2")
55

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

0 commit comments

Comments
 (0)