Skip to content

Commit

Permalink
util|finagle|finatra|twitter-server|scrooge: Bump Scalacheck to 1.15.…
Browse files Browse the repository at this point in the history
…4 in sbt

Problem

Scala 3 requires Scalacheck 1.15.x but the sbt builds currently uses 1.14.x

Solution

Upgrade Scalacheck in build.sbt to 1.15.4 to simplify Scala 3 cross-building.

Result

The tests use Scalacheck 1.15.4.  We still use `scalatestplus scalacheck-1-14`
because there is no `1-15` version available for Scalatest 3.1.x.

Closes twitter/util#291
Signed-off-by: Lily He <[email protected]>

JIRA Issues: CSL-11064

Differential Revision: https://phabricator.twitter.biz/D691691
  • Loading branch information
felixbr authored and jenkins committed Jun 30, 2021
1 parent 645b494 commit ad06366
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 4 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ Note that ``PHAB_ID=#`` and ``RB_ID=#`` correspond to associated messages in com
Unreleased
----------

Runtime Behavior Changes
~~~~~~~~~~~~~~~~~~~~~~~~

* scrooge: Update Scalatest to version 1.15.4. scrooge-sbt-plugin and
scrooge-generator still use the older version 1.14.3 because they compile
with Scala 2.10 ``PHAB_ID=D691691``

21.6.0
------

Expand Down
16 changes: 12 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ val sharedSettingsWithoutScalaVersion = Seq(
),
libraryDependencies ++= Seq(
"junit" % "junit" % "4.12" % "test",
"org.scalacheck" %% "scalacheck" % "1.14.3" % "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",
Expand Down Expand Up @@ -181,7 +180,10 @@ val settingsWithTwoTen =
scalaVersion := "2.10.7",
scalacOptions := scalacTwoTenOptions,
javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint:unchecked"),
doc / javacOptions := Seq("-source", "1.8")
doc / javacOptions := Seq("-source", "1.8"),
libraryDependencies ++= Seq(
"org.scalacheck" %% "scalacheck" % "1.14.3" % "test"
)
)

// settings for projects that are cross compiled with scala 2.10
Expand All @@ -192,7 +194,10 @@ val settingsCrossCompiledWithTwoTen =
scalaVersion := "2.13.6",
scalacOptions := scalacTwoTenOptions,
javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint:unchecked"),
doc / javacOptions := Seq("-source", "1.8")
doc / javacOptions := Seq("-source", "1.8"),
libraryDependencies ++= Seq(
"org.scalacheck" %% "scalacheck" % "1.14.3" % "test"
)
)

val sharedSettings =
Expand All @@ -212,7 +217,10 @@ val sharedSettings =
"40"
),
javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint:unchecked"),
doc / javacOptions := Seq("-source", "1.8")
doc / javacOptions := Seq("-source", "1.8"),
libraryDependencies ++= Seq(
"org.scalacheck" %% "scalacheck" % "1.15.4" % "test"
)
)

val jmockSettings = Seq(
Expand Down

0 comments on commit ad06366

Please sign in to comment.