Skip to content

Commit

Permalink
Bump scala version to 2.12.13
Browse files Browse the repository at this point in the history
Problem/Solution

Bumping scala version to 2.12.13

JIRA Issues: SCALA-25

Differential Revision: https://phabricator.twitter.biz/D632567
  • Loading branch information
Adam Singer authored and jenkins committed Mar 16, 2021
1 parent ec0097c commit b8e4e0a
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 5 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ Breaking API Changes
Runtime Behavior Changes
~~~~~~~~~~~~~~~~~~~~~~~~

* finagle: Bump scala version to 2.12.13 ``PHAB_ID=D632567``

* finagle-core: Move helper tracing methods like `traceLocal` in `Trace` into the `Tracing` class. This
allows cheaper use of these APIs by first capturing a Trace via `Trace#apply`, avoiding the extra lookups
that will add overhead on the request path. ``PHAB_ID=D633318``.
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ def jdk11GcJavaOptions: Seq[String] = {
val sharedSettings = Seq(
version := releaseVersion,
organization := "com.twitter",
scalaVersion := "2.12.11",
crossScalaVersions := Seq("2.12.11", "2.13.1"),
scalaVersion := "2.12.13",
crossScalaVersions := Seq("2.12.13", "2.13.1"),
fork in Test := true, // We have to fork to get the JavaOptions
libraryDependencies ++= Seq(
// See https://www.scala-sbt.org/0.13/docs/Testing.html#JUnit
Expand Down
2 changes: 1 addition & 1 deletion doc/src/sphinx/code/client-server-anatomy/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name := "client-server-anatomy"

version := "1.0"

scalaVersion := "2.12.11"
scalaVersion := "2.12.13"

libraryDependencies ++= Seq(
"com.twitter" %% "finagle-core" % "21.2.0"
Expand Down
2 changes: 1 addition & 1 deletion doc/src/sphinx/code/protocols/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name := "protocols"

version := "1.0"

scalaVersion := "2.12.11"
scalaVersion := "2.12.13"

libraryDependencies ++= Seq(
"com.twitter" %% "finagle-mysql" % "21.2.0"
Expand Down
2 changes: 1 addition & 1 deletion doc/src/sphinx/code/quickstart/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
settings(
inThisBuild(List(
organization := "com.twitter",
scalaVersion := "2.12.11",
scalaVersion := "2.12.13",
version := "1.0"
)),
name := "quickstart",
Expand Down

0 comments on commit b8e4e0a

Please sign in to comment.