From 2ad8fa639b84ebcb2ff4cdc1a3ca4de485d969bc Mon Sep 17 00:00:00 2001 From: Antonio Salazar Cardozo Date: Thu, 10 Oct 2019 15:16:24 -0400 Subject: [PATCH 1/2] Bump sbt and Scala 2.12/13 minor versions --- .travis.yml | 4 ++-- build.sbt | 4 ++-- project/build.properties | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 773dda6660..803d9fd11e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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' diff --git a/build.sbt b/build.sbt index 1a6bf1a2f3..1324cee4b2 100644 --- a/build.sbt +++ b/build.sbt @@ -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 diff --git a/project/build.properties b/project/build.properties index 080a737edb..8522443ded 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.0 +sbt.version=1.3.2 From 287bb2e1cfb2f862824ddcc80a576162891eb891 Mon Sep 17 00:00:00 2001 From: Antonio Salazar Cardozo Date: Fri, 18 Oct 2019 07:57:54 -0400 Subject: [PATCH 2/2] Fix Scala minor versions for additional JDK builds These are set independently of the top-level Scala version builds. That could probably use some refactoring, but it will have to wait for another time. --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 803d9fd11e..3e1785403f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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