Skip to content

Commit

Permalink
3rdparty: Actually upgrade scalatest to 3.1.2
Browse files Browse the repository at this point in the history
Problem

In the previous commit where I claimed to have upgraded to 3.1.2, I actually
upgraded to 3.1.1.  I also broke the sbt build 😬

Solution

Let's actually move to 3.1.2.  We aren't moving to 3.2.0 yet because of the
breaking API changes related to suite names.

JIRA Issues: CSL-9722

Differential Revision: https://phabricator.twitter.biz/D518794
  • Loading branch information
mosesn authored and jenkins committed Jul 17, 2020
1 parent 0976b23 commit db63a6d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ val baseSettings = Seq(
// See https://www.scala-sbt.org/0.13/docs/Testing.html#JUnit
"com.novocode" % "junit-interface" % "0.11" % "test",
"org.mockito" % "mockito-all" % "1.10.19" % "test",
"org.scalatest" %% "scalatest" % "3.1.1" % "test",
"org.scalatest" %% "scalatest" % "3.1.2" % "test",
"org.scalatestplus" %% "junit-4-12" % "3.1.2.0" % "test",
"org.scalatestplus" %% "mockito_1-10" % "3.1.0.0" % "test"
"org.scalatestplus" %% "mockito-1-10" % "3.1.0.0" % "test"
),
fork in Test := true, // We have to fork to get the JavaOptions
// Workaround for cross building HealthyQueue.scala, which is not compatible between
Expand Down Expand Up @@ -487,9 +487,9 @@ lazy val utilTest = Project(
name := "util-test",
libraryDependencies ++= Seq(
"org.mockito" % "mockito-all" % "1.10.19",
"org.scalatest" %% "scalatest" % "3.1.1",
"org.scalatest" %% "scalatest" % "3.1.2",
"org.scalatestplus" %% "junit-4-12" % "3.1.2.0",
"org.scalatestplus" %% "mockito_1-10" % "3.1.1.0"
"org.scalatestplus" %% "mockito-1-10" % "3.1.0.0"
)
).dependsOn(utilCore, utilLogging)

Expand Down

0 comments on commit db63a6d

Please sign in to comment.