diff --git a/.circleci/config.yml b/.circleci/config.yml index 51219f645..80faef9d9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,6 +7,12 @@ executors: scala_jdk11_executor: docker: - image: circleci/openjdk:11-jdk + scala_jdk13_executor: + docker: + - image: circleci/openjdk:13.0.1-jdk-buster + scala_jdk14_executor: + docker: + - image: circleci/openjdk:14-ea-26-jdk-buster commands: sbt_cmd: @@ -98,6 +104,30 @@ workflows: name: jdk11_dotty java_version: jdk11 scala_version: 0.20.0-RC1 + - scala_job: + name: jdk13_2.12 + java_version: jdk13 + scala_version: 2.12.10 + - scala_job: + name: jdk13_2.13 + java_version: jdk13 + scala_version: 2.13.1 + - scala_job: + name: jdk13_dotty + java_version: jdk13 + scala_version: 0.20.0-RC1 + - scala_job: + name: jdk14_2.12 + java_version: jdk14 + scala_version: 2.12.10 + - scala_job: + name: jdk14_2.13 + java_version: jdk14 + scala_version: 2.13.1 + - scala_job: + name: jdk14_dotty + java_version: jdk14 + scala_version: 0.20.0-RC1 - scalajs_job: name: sjs0.6_2.12 scala_version: 2.12.10 diff --git a/.travis.yml b/.travis.yml index 8ee796989..3debe8338 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ env: - SCALAJS_VERSION=0.6.31 ADOPTOPENJDK=8 - SCALAJS_VERSION=1.0.0-RC2 ADOPTOPENJDK=8 - SCALAJS_VERSION= ADOPTOPENJDK=11 + - SCALAJS_VERSION= ADOPTOPENJDK=13 matrix: exclude: