From a447f03e700217bbd7c6e499302461441138f466 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 15 Jul 2021 14:45:26 -0400 Subject: [PATCH] CI: JDK 17 (was 16) the empty .jvmopts is to work around https://github.com/dwijnand/sbt-extras/issues/326 --- .circleci/config.yml | 16 ++++++++-------- .jvmopts | 0 .travis.yml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 .jvmopts diff --git a/.circleci/config.yml b/.circleci/config.yml index 1759491bd..51dfb564c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,9 +7,9 @@ executors: scala_jdk11_executor: docker: - image: circleci/openjdk:11-jdk - scala_jdk16_executor: + scala_jdk17_executor: docker: - - image: circleci/openjdk:16-buster + - image: circleci/openjdk:17-buster commands: sbt_cmd: @@ -127,16 +127,16 @@ workflows: java_version: jdk11 scala_version: 3.0.1 - scala_job: - name: jdk16_2.12 - java_version: jdk16 + name: jdk17_2.12 + java_version: jdk17 scala_version: 2.12.14 - scala_job: - name: jdk16_2.13 - java_version: jdk16 + name: jdk17_2.13 + java_version: jdk17 scala_version: 2.13.6 - scala_job: - name: jdk16_3.0 - java_version: jdk16 + name: jdk17_3.0 + java_version: jdk17 scala_version: 3.0.1 - scalajs_job: name: sjs1.0_2.12 diff --git a/.jvmopts b/.jvmopts new file mode 100644 index 000000000..e69de29bb diff --git a/.travis.yml b/.travis.yml index cbddb8f23..9385cc935 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ env: - SCALAJS_VERSION=1.6.0 ADOPTOPENJDK=8 - SCALANATIVE_VERSION=0.4.0 ADOPTOPENJDK=8 - SCALAJS_VERSION= ADOPTOPENJDK=11 - - SCALAJS_VERSION= ADOPTOPENJDK=16 + - SCALAJS_VERSION= ADOPTOPENJDK=17 jobs: exclude: