Skip to content

Commit

Permalink
[util,scrooge,twitter-server,finagle,finatra]: Upgrade sbt to 1.7.1
Browse files Browse the repository at this point in the history 
Problem / Solution

Upgrade SBT to 1.7.1 for CSL libraries and upgrade some plugins as well.

JIRA Issues: CSL-12170

Differential Revision: https://phabricator.twitter.biz/D938280
  • Loading branch information
@aliciavargas
aliciavargas authored and jenkins committed Jul 26, 2022
1 parent 0b11e3a commit 8d06d68
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: continuous integration
env:
JAVA_OPTS: "-Dsbt.log.noformat=true"
TRAVIS: "true" # pretend we're TravisCI
SBT_VERSION: 1.6.1
SBT_VERSION: 1.7.1
BUILD_VERSION: "v1" # bump this if builds are failing due to a bad cache

defaults:
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.6.1
sbt.version=1.7.1
4 changes: 2 additions & 2 deletions project/plugins.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ resolvers += Classpaths.sbtPluginReleases
resolvers += Resolver.sonatypeRepo("snapshots")

addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.1")

This comment has been minimized.

Sign in to view

Copy link
@pjfanning

pjfanning Jul 28, 2022

Contributor

this change to scoverage version is causing build problems - can this upgrade be reverted?
it clashes with scalatest 3.1 (an old out of date version) - both scoverage 2.0.0 and scalatest 3.1 use incompatible versions of scala-xml - see https://pipelines.actions.githubusercontent.com/serviceHosts/a9380272-989d-434a-87fd-c3400fd73bc6/_apis/pipelines/1/runs/319/signedlogcontent/3?urlExpires=2022-07-28T11%3A31%3A08.5154464Z&urlSigningMethod=HMACV1&urlSignature=ph05lG%2FI8ZAvM%2FRUwox8L0I2%2BjB8KobSbO%2Fz8vKrpbA%3D

This comment has been minimized.

Sign in to view

Copy link
@pjfanning

pjfanning Jul 28, 2022

Contributor

looks like there are some PRs for this now
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.0")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.31")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.1")
2 changes: 1 addition & 1 deletion project/unidoc.sbt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3")
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
4 changes: 2 additions & 2 deletions sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

set -eo pipefail

sbtver="1.6.1"
sbtver="1.7.1"
sbtjar="sbt-launch-$sbtver.jar"
sbtsha128="b69ab7f114d09d859b5e349acdb05d32c9d49072"
sbtsha128="468efdd45baf58dbb575f9b4369c5234f8cd54ba"

sbtrepo="https://repo1.maven.org/maven2/org/scala-sbt/sbt-launch"

Expand Down

0 comments on commit 8d06d68

Please sign in to comment.