Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update reactive-streams-tck to 1.0.4 in series/7.x #3269

Merged
merged 1 commit into from
Dec 29, 2024
Merged

Update reactive-streams-tck to 1.0.4 in series/7.x #3269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -207,7 +207,7 @@ lazy val httpstreams = (project in file("elastic4s-http-streams"))
Dependencies.akkaActor,
Dependencies.akkaStream,
Dependencies.reactiveStreamsTck,
Dependencies.scalaTestPlusTestng67
Dependencies.scalaTestPlusTestng
)
)

Expand Down
11 changes: 6 additions & 5 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"

}
Loading