From 49486a31000ce27a91ce6ee885088a7f338d8805 Mon Sep 17 00:00:00 2001 From: David Strawn Date: Sun, 20 Sep 2020 09:20:14 -0600 Subject: [PATCH] Add JDK 16 To The CircleCI Build Though JDK16 is not yet released, building with it now will give us warnings about issues such as failure to build on JDK15 (https://github.com/scala/scala-xml/pull/450) Also adds the `osgiBundle` task to CI to catch issues with it. --- .circleci/config.yml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c3a014c75..3921b19a6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,6 +10,9 @@ executors: scala_jdk15_executor: docker: - image: circleci/openjdk:15-buster + scala_jdk16_executor: + docker: + - image: circleci/openjdk:16-buster commands: sbt_cmd: @@ -20,7 +23,7 @@ commands: default: 2.12.12 sbt_tasks: type: string - default: update compile test:compile test doc package + default: update compile test:compile test doc package osgiBundle steps: - restore_cache: keys: @@ -52,7 +55,7 @@ jobs: - run: java -version - sbt_cmd: scala_version: << parameters.scala_version >> - sbt_tasks: xml/update xml/compile xml/test:compile xml/test xml/doc xml/package + sbt_tasks: xml/update xml/compile xml/test:compile xml/test xml/doc xml/package xml/osgiBundle scalajs_job: executor: scala_jdk8_executor parameters: @@ -113,6 +116,18 @@ workflows: name: jdk15_3.0 java_version: jdk15 scala_version: 3.0.0-M2 + - scala_job: + name: jdk16_2.12 + java_version: jdk16 + scala_version: 2.12.12 + - scala_job: + name: jdk16_2.13 + java_version: jdk16 + scala_version: 2.13.3 + - scala_job: + name: jdk16_3.0 + java_version: jdk16 + scala_version: 3.0.0-M2 - scalajs_job: name: sjs1.0_2.12 scala_version: 2.12.12