Skip to content

Commit 7f2ecc6

Browse files
Update s3 from 2.25.15 to 2.25.21
1 parent 014ad39 commit 7f2ecc6

File tree

1 file changed

+66
-62
lines changed

1 file changed

+66
-62
lines changed

build.sbt

Lines changed: 66 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -320,51 +320,53 @@ val scalazVersion = "7.3.8"
320320
val fs2Version = "3.10.0"
321321
val reactiveMongo = "1.1.0-RC12"
322322

323-
lazy val scala2_libraries = (project in file("scala-2-modules/scala2-libraries"))
324-
.configs(IntegrationTest)
325-
.settings(
326-
name := "scala2-libraries",
327-
scalaVersion := scalaV,
328-
libraryDependencies ++= scalaTestDeps.map(_.withConfigurations(Some("it,test"))),
329-
resolvers += "Kafka avro serializer" at "https://packages.confluent.io/maven",
330-
libraryDependencies ++= Seq(
331-
"com.github.julien-truffaut" %% "monocle-core" % monocleVersion,
332-
"com.github.julien-truffaut" %% "monocle-macro" % monocleVersion,
333-
"com.github.julien-truffaut" %% "monocle-law" % monocleVersion % "test",
334-
"com.chuusai" %% "shapeless" % shapelessVersion,
335-
"junit" % "junit" % "4.13.2" % Test,
336-
logback % Test,
337-
akkaActorTyped,
338-
akkaStreamDep,
339-
"com.github.cb372" %% "scalacache-core" % "0.28.0",
340-
"com.github.cb372" %% "scalacache-guava" % "0.28.0",
341-
"com.github.cb372" %% "scalacache-cats-effect" % "0.28.0",
342-
"com.github.cb372" %% "scalacache-caffeine" % "0.28.0",
343-
enumeratumDep,
344-
"io.monix" %% "monix" % monixVersion,
345-
pureConfigDep,
346-
"com.github.pureconfig" %% "pureconfig-enumeratum" % "0.17.6",
347-
"com.typesafe" % "config" % "1.4.3",
348-
"org.scala-lang.modules" %% "scala-async" % "1.0.1",
349-
"com.clever-cloud.pulsar4s" %% "pulsar4s-core" % "2.9.1",
350-
"com.clever-cloud.pulsar4s" %% "pulsar4s-jackson" % "2.9.1",
351-
"org.testcontainers" % "pulsar" % "1.19.7" % IntegrationTest,
352-
"org.apache.kafka" % "kafka-clients" % kafkaVersion,
353-
"com.fasterxml.jackson.core" % "jackson-databind" % jackSonVersion,
354-
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % jackSonVersion,
355-
"com.fasterxml.jackson.module" %% "jackson-module-scala" % jackSonVersion,
356-
"com.sksamuel.avro4s" %% "avro4s-core" % avro4sVersion,
357-
"io.confluent" % "kafka-avro-serializer" % kafkaAvroSerializer,
358-
log4jApiScalaDep,
359-
"org.apache.logging.log4j" % "log4j-core" % log4jVersion % Runtime
360-
),
361-
libraryDependencies ++= Seq(
362-
"com.typesafe.slick" %% "slick" % slickVersion,
363-
"com.h2database" % "h2" % "2.2.224"
364-
),
365-
scalacOptions += "-Xasync",
366-
Defaults.itSettings
367-
)
323+
lazy val scala2_libraries =
324+
(project in file("scala-2-modules/scala2-libraries"))
325+
.configs(IntegrationTest)
326+
.settings(
327+
name := "scala2-libraries",
328+
scalaVersion := scalaV,
329+
libraryDependencies ++= scalaTestDeps
330+
.map(_.withConfigurations(Some("it,test"))),
331+
resolvers += "Kafka avro serializer" at "https://packages.confluent.io/maven",
332+
libraryDependencies ++= Seq(
333+
"com.github.julien-truffaut" %% "monocle-core" % monocleVersion,
334+
"com.github.julien-truffaut" %% "monocle-macro" % monocleVersion,
335+
"com.github.julien-truffaut" %% "monocle-law" % monocleVersion % "test",
336+
"com.chuusai" %% "shapeless" % shapelessVersion,
337+
"junit" % "junit" % "4.13.2" % Test,
338+
logback % Test,
339+
akkaActorTyped,
340+
akkaStreamDep,
341+
"com.github.cb372" %% "scalacache-core" % "0.28.0",
342+
"com.github.cb372" %% "scalacache-guava" % "0.28.0",
343+
"com.github.cb372" %% "scalacache-cats-effect" % "0.28.0",
344+
"com.github.cb372" %% "scalacache-caffeine" % "0.28.0",
345+
enumeratumDep,
346+
"io.monix" %% "monix" % monixVersion,
347+
pureConfigDep,
348+
"com.github.pureconfig" %% "pureconfig-enumeratum" % "0.17.6",
349+
"com.typesafe" % "config" % "1.4.3",
350+
"org.scala-lang.modules" %% "scala-async" % "1.0.1",
351+
"com.clever-cloud.pulsar4s" %% "pulsar4s-core" % "2.9.1",
352+
"com.clever-cloud.pulsar4s" %% "pulsar4s-jackson" % "2.9.1",
353+
"org.testcontainers" % "pulsar" % "1.19.7" % IntegrationTest,
354+
"org.apache.kafka" % "kafka-clients" % kafkaVersion,
355+
"com.fasterxml.jackson.core" % "jackson-databind" % jackSonVersion,
356+
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % jackSonVersion,
357+
"com.fasterxml.jackson.module" %% "jackson-module-scala" % jackSonVersion,
358+
"com.sksamuel.avro4s" %% "avro4s-core" % avro4sVersion,
359+
"io.confluent" % "kafka-avro-serializer" % kafkaAvroSerializer,
360+
log4jApiScalaDep,
361+
"org.apache.logging.log4j" % "log4j-core" % log4jVersion % Runtime
362+
),
363+
libraryDependencies ++= Seq(
364+
"com.typesafe.slick" %% "slick" % slickVersion,
365+
"com.h2database" % "h2" % "2.2.224"
366+
),
367+
scalacOptions += "-Xasync",
368+
Defaults.itSettings
369+
)
368370

369371
val circeVersion = "0.14.6"
370372
val monixVersion = "3.4.1"
@@ -440,20 +442,21 @@ lazy val scala_libraries_os = (project in file("scala-libraries-os"))
440442
libraryDependencies += osLibDep
441443
)
442444

443-
lazy val redis_intro = (project in file("scala-libraries-standalone/redis-intro"))
444-
.configs(IntegrationTest)
445-
.settings(
446-
name := "redis-intro",
447-
scalaVersion := scala3Version,
448-
libraryDependencies ++= scalaTestDeps
449-
.map(_.withConfigurations(Some("it,test"))),
450-
libraryDependencies ++= Seq(
451-
"redis.clients" % "jedis" % "4.3.1",
452-
"com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.14.1",
453-
"org.scalatestplus" %% "mockito-3-4" % "3.2.10.0" % "it"
454-
),
455-
Defaults.itSettings
456-
)
445+
lazy val redis_intro =
446+
(project in file("scala-libraries-standalone/redis-intro"))
447+
.configs(IntegrationTest)
448+
.settings(
449+
name := "redis-intro",
450+
scalaVersion := scala3Version,
451+
libraryDependencies ++= scalaTestDeps
452+
.map(_.withConfigurations(Some("it,test"))),
453+
libraryDependencies ++= Seq(
454+
"redis.clients" % "jedis" % "4.3.1",
455+
"com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.14.1",
456+
"org.scalatestplus" %% "mockito-3-4" % "3.2.10.0" % "it"
457+
),
458+
Defaults.itSettings
459+
)
457460

458461
lazy val tapir = (project in file("scala-libraries-standalone/tapir"))
459462
.settings(
@@ -488,7 +491,7 @@ lazy val scala_libraries_fp = (project in file("scala-libraries-fp"))
488491
"org.typelevel" %% "cats-effect-testing-scalatest" % "1.5.0" % Test,
489492
"org.scalaz" %% "scalaz-core" % scalazVersion,
490493
"junit" % "junit" % "4.13.2" % Test,
491-
"org.typelevel" %% "spire" % spireVersion,
494+
"org.typelevel" %% "spire" % spireVersion
492495
)
493496
)
494497

@@ -498,7 +501,8 @@ lazy val scala_libraries_testing = (project in file("scala-libraries-testing"))
498501
name := "scala-libraries-testing",
499502
scalaVersion := scala3Version,
500503
testFrameworks += new TestFramework("utest.runner.Framework"),
501-
libraryDependencies ++= scalaTestDeps.map(_.withConfigurations(Some("it,test"))),
504+
libraryDependencies ++= scalaTestDeps
505+
.map(_.withConfigurations(Some("it,test"))),
502506
libraryDependencies ++= Seq(
503507
"org.scalacheck" %% "scalacheck" % "1.17.0" % Test,
504508
scalaMock,
@@ -507,7 +511,7 @@ lazy val scala_libraries_testing = (project in file("scala-libraries-testing"))
507511
"com.amazonaws" % "aws-java-sdk-s3" % "1.12.685" % IntegrationTest,
508512
"com.dimafeng" %% "testcontainers-scala-scalatest" % "0.41.3" % IntegrationTest,
509513
"com.dimafeng" %% "testcontainers-scala-localstack-v2" % "0.41.3" % IntegrationTest,
510-
"software.amazon.awssdk" % "s3" % "2.25.15"
514+
"software.amazon.awssdk" % "s3" % "2.25.21"
511515
),
512516
Defaults.itSettings,
513517
IntegrationTest / fork := true

0 commit comments

Comments
 (0)