Skip to content

Commit

Permalink
twitter-oss: Update to Scala 2.11.12 and 2.12.6 in SBT build
Browse files Browse the repository at this point in the history
Problem/Solution

We should update our SBT builds to Scala 2.11.12 and 2.12.6.

Additionally, the Slack credentials for each project are out-of-date
and need to be updated.

JIRA Issues: CSL-6972, CSL-6975

Differential Revision: https://phabricator.twitter.biz/D216930
  • Loading branch information
cacoco authored and jenkins committed Sep 19, 2018
1 parent e2aca99 commit 76a6089
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ before_cache:
- find $HOME/.sbt -name "*.lock" -delete

scala:
- 2.11.11
- 2.12.4
- 2.11.12
- 2.12.6

jdk:
- oraclejdk8

notifications:
slack:
secure: E0knpocRWQT1YI4TgAZGxS7Xoe15wWZ5fbJsi0nfMhxHSlngrnxAknN60qovPa2J8R/opryX/0jwaUF2/5RPYVxf6ARNI428WkrltxctQeCugN8j5XqpBqXLR/+GPetqFe9WwF6ycg3bmThsXnap6/xNB75zMWj+2E1CYTqwpA0=
secure: BFX2aB0sq5cMxmxlWIwgHwJOjI5W6WBn3YSPqHYYz6VAK6fzlX2VUKsfyQJTUnqMYox/0qGzPUB4TFhVMH3c78ocNZNj/9tPOPLkMfHjAqobnq/89+hp4Q6fmWCMKVAGTzVNq83OCykYkzITcYWxo0Pyc2eguW6tHaHIgqnbCRY=

before_script:
# default $SBT_OPTS is irrelevant to sbt lancher
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ val slf4jSimple = "org.slf4j" % "slf4j-simple" % slf4jVersion

val defaultProjectSettings = Seq(
scalaVersion := "2.12.6",
crossScalaVersions := Seq("2.11.11", "2.12.6")
crossScalaVersions := Seq("2.11.12", "2.12.6")
)

val baseSettings = Seq(
Expand Down Expand Up @@ -299,7 +299,7 @@ lazy val utilIntellij = Project(
baseSettings
).settings(
name := "util-intellij",
scalaVersion := "2.11.11"
scalaVersion := "2.11.12"
).dependsOn(utilCore % "test")

lazy val utilJvm = Project(
Expand Down

0 comments on commit 76a6089

Please sign in to comment.