From dd4cddeb1d51461488ab9eb20eec520d09d63b2a Mon Sep 17 00:00:00 2001 From: philippus Date: Sun, 29 Dec 2024 21:12:27 +0100 Subject: [PATCH] Update reactive-streams-tck to 1.0.4 in series/7.x and related dependencies --- build.sbt | 4 ++-- project/Dependencies.scala | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index 107e20709..7dcac3694 100644 --- a/build.sbt +++ b/build.sbt @@ -196,7 +196,7 @@ lazy val testkit = (project in file("elastic4s-testkit")) .dependsOn(core, clientesjava) .settings(name := "elastic4s-testkit") .settings(allSettings) - .settings(libraryDependencies ++= Seq(Dependencies.scalaTest, scalaTestPlusMockito)) + .settings(libraryDependencies ++= Seq(Dependencies.scalaTestMain, scalaTestPlusMockito)) lazy val httpstreams = (project in file("elastic4s-http-streams")) .dependsOn(core, testkit % "test", jackson % "test") @@ -207,7 +207,7 @@ lazy val httpstreams = (project in file("elastic4s-http-streams")) Dependencies.akkaActor, Dependencies.akkaStream, Dependencies.reactiveStreamsTck, - Dependencies.scalaTestPlusTestng67 + Dependencies.scalaTestPlusTestng ) ) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index b433c22e9..4be9e03c0 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -17,10 +17,10 @@ object Dependencies { val MockitoVersion = "5.14.2" val MonixVersion = "3.4.1" val PlayJsonVersion = "3.0.4" - val ReactiveStreamsVersion = "1.0.3" + val ReactiveStreamsVersion = "1.0.4" val ScalamockVersion = "6.0.0" - val ScalatestPlusMockitoArtifactId = "mockito-3-3" - val ScalatestPlusVersion = "3.1.4.0" + val ScalatestPlusMockitoArtifactId = "mockito-5-12" + val ScalatestPlusVersion = "3.2.19.0" val ScalazVersion = "7.2.36" val ScalatestVersion = "3.2.19" val Slf4jVersion = "2.0.16" @@ -75,8 +75,9 @@ object Dependencies { lazy val mockitoCore = "org.mockito" % "mockito-core" % MockitoVersion % "test" lazy val reactiveStreamsTck = "org.reactivestreams" % "reactive-streams-tck" % ReactiveStreamsVersion % "test" lazy val scalaMock = "org.scalamock" %% "scalamock" % ScalamockVersion % "test" - lazy val scalaTest = "org.scalatest" %% "scalatest" % ScalatestVersion % "test" + lazy val scalaTestMain = "org.scalatest" %% "scalatest" % ScalatestVersion + lazy val scalaTest = scalaTestMain % "test" lazy val scalaTestPlusMockito = "org.scalatestplus" %% ScalatestPlusMockitoArtifactId % ScalatestPlusVersion - lazy val scalaTestPlusTestng67 = "org.scalatestplus" %% "testng-6-7" % ScalatestPlusVersion % "test" + lazy val scalaTestPlusTestng = "org.scalatestplus" %% "testng-7-10" % ScalatestPlusVersion % "test" }