From 6936d0543727f9fa3afe10b7ce1a5be24d5d30f5 Mon Sep 17 00:00:00 2001 From: "Aaron S. Hawley" Date: Fri, 25 May 2018 13:59:27 -0400 Subject: [PATCH 1/2] Drop Scala 2.11 from Travis Java 8 and 9 --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 11c3d500c..92163102e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,6 +35,10 @@ matrix: env: SCALAJS_VERSION=1.0.0-M3 - jdk: oraclejdk9 env: SCALAJS_VERSION=1.0.0-M3 + - scala: 2.11.12 + jdk: oraclejdk8 + - scala: 2.11.12 + jdk: oraclejdk9 - scala: 2.12.6 jdk: openjdk6 - scala: 2.13.0-M3 From c96b34e722c473c7e8ad6ef82ebfcda4d3a7771d Mon Sep 17 00:00:00 2001 From: "Aaron S. Hawley" Date: Tue, 29 May 2018 11:13:44 -0400 Subject: [PATCH 2/2] Build Scala.js 1.0 for Scala 2.11 and 2.13 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 92163102e..fbc46d984 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,8 +31,8 @@ env: matrix: exclude: - - scala: 2.13.0-M3 - env: SCALAJS_VERSION=1.0.0-M3 + - jdk: oraclejdk9 + env: SCALAJS_VERSION=0.6.23 - jdk: oraclejdk9 env: SCALAJS_VERSION=1.0.0-M3 - scala: 2.11.12