Skip to content

Commit

Permalink
Merge pull request twitter#520 from piyushnarang/develop
Browse files Browse the repository at this point in the history
Bump scala version
  • Loading branch information
johnynek committed Apr 26, 2016
2 parents 01ee2f0 + f841f5a commit 9f5f7b3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def isScala210x(scalaVersion: String) = scalaBinaryVersion(scalaVersion) == "2.1

val sharedSettings = Project.defaultSettings ++ scalariformSettings ++ Seq(
organization := "com.twitter",
scalaVersion := "2.10.5",
scalaVersion := "2.11.7",
crossScalaVersions := Seq("2.10.5", "2.11.7"),
ScalariformKeys.preferences := formattingPreferences,

Expand Down

0 comments on commit 9f5f7b3

Please # to comment.