Skip to content

Commit 49486a3

Browse files
committed
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 (#450) Also adds the `osgiBundle` task to CI to catch issues with it.
1 parent 45864ed commit 49486a3

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

.circleci/config.yml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ executors:
1010
scala_jdk15_executor:
1111
docker:
1212
- image: circleci/openjdk:15-buster
13+
scala_jdk16_executor:
14+
docker:
15+
- image: circleci/openjdk:16-buster
1316

1417
commands:
1518
sbt_cmd:
@@ -20,7 +23,7 @@ commands:
2023
default: 2.12.12
2124
sbt_tasks:
2225
type: string
23-
default: update compile test:compile test doc package
26+
default: update compile test:compile test doc package osgiBundle
2427
steps:
2528
- restore_cache:
2629
keys:
@@ -52,7 +55,7 @@ jobs:
5255
- run: java -version
5356
- sbt_cmd:
5457
scala_version: << parameters.scala_version >>
55-
sbt_tasks: xml/update xml/compile xml/test:compile xml/test xml/doc xml/package
58+
sbt_tasks: xml/update xml/compile xml/test:compile xml/test xml/doc xml/package xml/osgiBundle
5659
scalajs_job:
5760
executor: scala_jdk8_executor
5861
parameters:
@@ -113,6 +116,18 @@ workflows:
113116
name: jdk15_3.0
114117
java_version: jdk15
115118
scala_version: 3.0.0-M2
119+
- scala_job:
120+
name: jdk16_2.12
121+
java_version: jdk16
122+
scala_version: 2.12.12
123+
- scala_job:
124+
name: jdk16_2.13
125+
java_version: jdk16
126+
scala_version: 2.13.3
127+
- scala_job:
128+
name: jdk16_3.0
129+
java_version: jdk16
130+
scala_version: 3.0.0-M2
116131
- scalajs_job:
117132
name: sjs1.0_2.12
118133
scala_version: 2.12.12

0 commit comments

Comments
 (0)