Skip to content

Commit

Permalink
util|scrooge|finagle: Update to Scala 2.13.1
Browse files Browse the repository at this point in the history
Problem/Solution

Update util, scrooge, and finagle to all cross build
with Scala 2.13.1. We need to also update the
`scoverage` plugin here to deal with an issue where
plugins need to be specified to be fully cross versioned
(that is published with their full scala version, e.g., `2.13.0`
instead of just `2.13`) because Scala is not binary compatible
between minor releases and something changed between
2.13.0 and 2.13.1. The `scoverage` plugin version `1.6.1`
appears to work properly.

Differential Revision: https://phabricator.twitter.biz/D444211
  • Loading branch information
cacoco authored and jenkins committed Mar 4, 2020
1 parent ff3bbdc commit 35299b5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ before_cache:
scala:
- 2.11.12
- 2.12.8
- 2.13.1

jdk:
- openjdk8
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def jdk11GcJavaOptions: Seq[String] = {
}

val withTwoThirteen = Seq(
crossScalaVersions += "2.13.0",
crossScalaVersions += "2.13.1",
libraryDependencies += scalaCollectionCompat
)

Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ addSbtPlugin("com.twitter" % "scrooge-sbt-plugin" % releaseVersion)

addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.0")
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC13")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.4")

0 comments on commit 35299b5

Please sign in to comment.