Skip to content

CORE-69: update various test dependencies #1568

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

Merged
merged 1 commit into from
Oct 16, 2024
Merged

CORE-69: update various test dependencies #1568

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
5 changes: 2 additions & 3 deletions automation/project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,9 @@ object Dependencies {
"com.typesafe.akka" %% "akka-http" % akkaHttpV,
"com.typesafe.akka" %% "akka-testkit" % akkaV % "test",
"com.typesafe.akka" %% "akka-slf4j" % akkaV,
"org.scalatest" %% "scalatest" % "3.2.3" % Test,
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.2",
"org.scalatest" %% "scalatest" % "3.2.12" % Test,
"org.scalatestplus" %% "scalacheck-1-15" % "3.2.11.0" % Test,
"org.scalatest" %% "scalatest" % "3.2.19" % Test,
"org.scalatestplus" %% "scalacheck-1-18" % "3.2.19.0" % Test,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"org.scalatest" %% "scalatest" was listed twice - with two different versions! I removed one of them.

"com.typesafe.scala-logging" %% "scala-logging" % "3.9.4",
workbenchServiceTest,
workbenchGoogle,
Expand Down
10 changes: 5 additions & 5 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ object Dependencies {
val akkaHttpV = "10.2.9"
val jacksonV = "2.17.0"
val scalaLoggingV = "3.9.2"
val scalaTestV = "3.2.12"
val scalaCheckV = "1.14.3"
val scalaTestV = "3.2.19"
val scalaCheckV = "1.18.1"
val scalikejdbcVersion = "3.4.2"
val postgresDriverVersion = "42.7.2"
val sentryVersion = "6.15.0"
Expand Down Expand Up @@ -77,8 +77,8 @@ object Dependencies {
val monocleMacro: ModuleID = "com.github.julien-truffaut" %% "monocle-macro" % monocleVersion

val scalaTest: ModuleID = "org.scalatest" %% "scalatest" % scalaTestV % "test"
val scalaTestScalaCheck = "org.scalatestplus" %% "scalacheck-1-15" % s"${scalaTestV}.0-RC2" % Test
val mockitoScalaTest = "org.mockito" %% "mockito-scala-scalatest" % "1.17.12" % Test
val scalaTestScalaCheck = "org.scalatestplus" %% "scalacheck-1-18" % s"${scalaTestV}.0" % Test
val mockitoScalaTest = "org.mockito" %% "mockito-scala-scalatest" % "1.17.37" % Test

// All of workbench-libs pull in Akka; exclude it since we provide our own Akka dependency.
// workbench-google pulls in workbench-{util, model, metrics}; exclude them so we can control the library versions individually.
Expand All @@ -103,7 +103,7 @@ object Dependencies {
val workbenchGoogle2Tests: ModuleID =
"org.broadinstitute.dsde.workbench" %% "workbench-google2" % workbenchGoogle2V % "test" classifier "tests" excludeAll (excludeWorkbenchUtil, excludeWorkbenchModel)
val googleStorageLocal: ModuleID =
"com.google.cloud" % "google-cloud-nio" % "0.127.7" % "test" // needed for mocking google cloud storage. Should use same version as wb-libs
"com.google.cloud" % "google-cloud-nio" % "0.127.25" % "test" // needed for mocking google cloud storage. Should use same version as wb-libs

val liquibaseCore: ModuleID = "org.liquibase" % "liquibase-core" % "4.2.2"

Expand Down
Loading