Skip to content

Commit 5733660

Browse files
committed
CI: drop JDK 13 and 14, add 15
1 parent 285327c commit 5733660

File tree

2 files changed

+9
-24
lines changed

2 files changed

+9
-24
lines changed

Diff for: .circleci/config.yml

+8-23
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,9 @@ executors:
77
scala_jdk11_executor:
88
docker:
99
- image: circleci/openjdk:11-jdk
10-
scala_jdk13_executor:
10+
scala_jdk15_executor:
1111
docker:
12-
- image: circleci/openjdk:13.0.1-jdk-buster
13-
scala_jdk14_executor:
14-
docker:
15-
- image: circleci/openjdk:14-ea-26-jdk-buster
12+
- image: circleci/openjdk:15-buster
1613

1714
commands:
1815
sbt_cmd:
@@ -105,28 +102,16 @@ workflows:
105102
java_version: jdk11
106103
scala_version: 3.0.0-M2
107104
- scala_job:
108-
name: jdk13_2.12
109-
java_version: jdk13
110-
scala_version: 2.12.12
111-
- scala_job:
112-
name: jdk13_2.13
113-
java_version: jdk13
114-
scala_version: 2.13.4
115-
- scala_job:
116-
name: jdk13_3.0
117-
java_version: jdk13
118-
scala_version: 3.0.0-M2
119-
- scala_job:
120-
name: jdk14_2.12
121-
java_version: jdk14
105+
name: jdk15_2.12
106+
java_version: jdk15
122107
scala_version: 2.12.12
123108
- scala_job:
124-
name: jdk14_2.13
125-
java_version: jdk14
109+
name: jdk15_2.13
110+
java_version: jdk15
126111
scala_version: 2.13.4
127112
- scala_job:
128-
name: jdk14_3.0
129-
java_version: jdk14
113+
name: jdk15_3.0
114+
java_version: jdk15
130115
scala_version: 3.0.0-M2
131116
- scalajs_job:
132117
name: sjs1.0_2.12

Diff for: .travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313
- SCALAJS_VERSION= ADOPTOPENJDK=8
1414
- SCALAJS_VERSION=1.3.1 ADOPTOPENJDK=8
1515
- SCALAJS_VERSION= ADOPTOPENJDK=11
16-
- SCALAJS_VERSION= ADOPTOPENJDK=13
16+
- SCALAJS_VERSION= ADOPTOPENJDK=15
1717

1818
install:
1919
- git fetch --tags # get all tags for sbt-dynver

0 commit comments

Comments
 (0)