Skip to content

Commit

Permalink
Merge pull request #1974 from lift/version-bumps-🍂
Browse files Browse the repository at this point in the history
Bump sbt and Scala 2.12/13 minor versions
  • Loading branch information
Shadowfiend authored Oct 19, 2019
2 parents 31678e7 + 287bb2e commit d888b6d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ dist: trusty
sudo: false
scala:
- 2.11.12
- 2.12.9
- 2.13.0
- 2.12.10
- 2.13.1
cache:
directories:
- '$HOME/node_modules'
Expand All @@ -15,16 +15,16 @@ jdk:
- openjdk8
matrix:
include:
- scala: 2.12.9
- scala: 2.12.10
jdk: openjdk11
env: DISABLE_PUBLISH=true
- scala: 2.12.9
- scala: 2.12.10
jdk: openjdk12
env: DISABLE_PUBLISH=true
- scala: 2.13.0
- scala: 2.13.1
jdk: openjdk11
env: DISABLE_PUBLISH=true
- scala: 2.13.0
- scala: 2.13.1
jdk: openjdk12
env: DISABLE_PUBLISH=true
script: ./travis.sh
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ startYear in ThisBuild := Some(2006)
organizationName in ThisBuild := "WorldWide Conferencing, LLC"

val scala211Version = "2.11.12"
val scala212Version = "2.12.9"
val scala213Version = "2.13.0"
val scala212Version = "2.12.10"
val scala213Version = "2.13.1"

val crossUpTo212 = Seq(scala212Version, scala211Version)
val crossUpTo213 = scala213Version +: crossUpTo212
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.3.0
sbt.version=1.3.2

0 comments on commit d888b6d

Please sign in to comment.