Skip to content

Commit 4913cfc

Browse files
committed
Updated to java setup v2 and jdk 16.
1 parent 6f9c38e commit 4913cfc

File tree

6 files changed

+12
-11
lines changed

6 files changed

+12
-11
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
# https://circleci.com/docs/2.0/circleci-images/#openjdk
4444
# https://hub.docker.com/r/circleci/openjdk/
4545
# adoptopenjdk/openjdk15
46-
- image: cimg/openjdk:15.0.1
46+
- image: cimg/openjdk:16
4747
environment:
4848
CC_TEST_REPORTER_ID: $CC_TEST_REPORTER_ID
4949
COVERALLS_REPO_TOKEN: $COVERALLS_REPO_TOKEN

.github/workflows/main.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ jobs:
1212
- uses: actions/checkout@v2
1313
- name: Checkout submodules
1414
run: make git
15-
- uses: actions/setup-java@v1
15+
- uses: actions/setup-java@v2
1616
with:
17-
java-version: '15.0.0'
17+
distribution: 'adopt'
18+
java-version: '16.0.0'
1819
architecture: x64
1920
- run: java -version
2021
- name: Make java-code

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
include:
99
- stage: build-test
1010
language: java
11-
jdk: openjdk15
11+
jdk: openjdk16
1212
before_install:
1313
- chmod +x gradlew
1414
script:

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ image:
1010
- Visual Studio 2019
1111
- Ubuntu
1212

13-
stack: node 14, jdk 15, python 3.9 x64
13+
stack: node 14, jdk 16, python 3.9 x64
1414

1515
install:
16-
- cmd: "SET JAVA_HOME=C:\\Program Files\\Java\\jdk15"
16+
- cmd: "SET JAVA_HOME=C:\\Program Files\\Java\\jdk16"
1717
- cmd: "SET PATH=%JAVA_HOME%\\bin;%path%"
1818
- cmd: "SET PYTHON3=C:\\Python39-x64"
1919
- cmd: "SET PATH=%PYTHON3%;%PYTHON3%\\Scripts;%path%"

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ repositories {
2323
mavenCentral()
2424
}
2525

26-
ext.junit4Version = '4.13.1'
26+
ext.junit4Version = '4.13.2'
2727
ext.junitVintageVersion = '4.12.1'
2828
ext.junitPlatformVersion = '1.5.2'
2929
ext.junitJupiterVersion = '5.7.1'
30-
ext.log4jVersion = '2.14.0'
30+
ext.log4jVersion = '2.14.1'
3131

3232
apply plugin: 'java'
3333
apply plugin: 'eclipse'
@@ -49,8 +49,8 @@ jacocoTestCoverageVerification {
4949
}
5050
}
5151

52-
sourceCompatibility = JavaVersion.VERSION_15
53-
targetCompatibility = JavaVersion.VERSION_15
52+
sourceCompatibility = JavaVersion.VERSION_16
53+
targetCompatibility = JavaVersion.VERSION_16
5454

5555
compileJava {
5656
options.compilerArgs += ["--enable-preview"]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)