Skip to content

Commit 60bccad

Browse files
committed
Upgrade dependencies, Gradle and generated bytecode
We have to use a Java 17, as the Native Build Tools have a Java 17 baseline. Java 17 doesn't support generating Bytecode for Java 6 anymore, so we have to bump that up to 8.
1 parent 2eb7ad4 commit 60bccad

File tree

4 files changed

+19
-22
lines changed

4 files changed

+19
-22
lines changed

.github/workflows/build-and-test.yml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,35 +15,33 @@ jobs:
1515
matrix:
1616
os: [ ubuntu-latest ]
1717
# See CONTRIBUTING.md on JDK 11 build requirement
18-
java: [ '11' ]
18+
java: [ '17' ]
1919
architecture: [ 'x64' ] # ubuntu-latest has no support for x86
2020
distribution: [ 'zulu', 'adopt' ]
2121
runs-on: ${{ matrix.os }}
2222
steps:
23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v5
2424
- name: Set up JDK ${{ matrix.java }}
25-
uses: actions/setup-java@v4
25+
uses: actions/setup-java@v5
2626
with:
2727
java-version: ${{ matrix.java }}
2828
architecture: ${{ matrix.architecture }}
2929
distribution: ${{ matrix.distribution }}
30-
cache: 'gradle'
3130
- name: Setup Gradle
3231
uses: gradle/actions/setup-gradle@v4
3332
- name: Build with Gradle
3433
run: ./gradlew build
3534
build-on-linux-native:
3635
runs-on: 'ubuntu-latest'
3736
steps:
38-
- uses: actions/checkout@v4
37+
- uses: actions/checkout@v5
3938
- name: Set up GraalVM
4039
uses: graalvm/setup-graalvm@v1
4140
with:
4241
java-version: '17'
4342
distribution: 'graalvm-community'
4443
github-token: ${{ secrets.GITHUB_TOKEN }}
4544
native-image-job-reports: 'true'
46-
cache: 'gradle'
4745
- name: Setup Gradle
4846
uses: gradle/actions/setup-gradle@v4
4947
- name: Build with Gradle
@@ -53,20 +51,19 @@ jobs:
5351
matrix:
5452
os: [ macos-latest ]
5553
# See CONTRIBUTING.md on JDK 11 build requirement
56-
java: [ '11' ]
54+
java: [ '17' ]
5755
# MacOS has no support for x86 ("Error: No valid download found for version 11.x and package jdk.")
5856
architecture: [ 'x64' ]
5957
distribution: [ 'zulu', 'adopt' ]
6058
runs-on: ${{ matrix.os }}
6159
steps:
62-
- uses: actions/checkout@v4
60+
- uses: actions/checkout@v5
6361
- name: Set up JDK ${{ matrix.java }}
64-
uses: actions/setup-java@v4
62+
uses: actions/setup-java@v5
6563
with:
6664
java-version: ${{ matrix.java }}
6765
architecture: ${{ matrix.architecture }}
6866
distribution: ${{ matrix.distribution }}
69-
cache: 'gradle'
7067
- name: Setup Gradle
7168
uses: gradle/actions/setup-gradle@v4
7269
- name: Build with Gradle
@@ -77,19 +74,18 @@ jobs:
7774
matrix:
7875
os: [ windows-latest ]
7976
# See CONTRIBUTING.md on JDK 11 build requirement
80-
java: [ '11' ]
77+
java: [ '17' ]
8178
architecture: [ 'x86', 'x64' ]
8279
distribution: [ 'zulu', 'adopt' ]
8380
runs-on: ${{ matrix.os }}
8481
steps:
85-
- uses: actions/checkout@v4
82+
- uses: actions/checkout@v5
8683
- name: Set up JDK ${{ matrix.java }}
87-
uses: actions/setup-java@v4
84+
uses: actions/setup-java@v5
8885
with:
8986
java-version: ${{ matrix.java }}
9087
architecture: ${{ matrix.architecture }}
9188
distribution: ${{ matrix.distribution }}
92-
cache: 'gradle'
9389
- name: Setup Gradle
9490
uses: gradle/actions/setup-gradle@v4
9591
- name: Build with Gradle

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
55

66
## Unreleased
77

8-
TBD
8+
* Minimum required Java version is now Java 8
99

1010
## [2.12] - 2025-03-04
1111

build.gradle

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'org.graalvm.buildtools.native' version '0.10.5' apply false
2+
id 'org.graalvm.buildtools.native' version '0.11.0' apply false
33
id 'org.sonarqube' version '3.0' apply false
44
}
55

@@ -23,22 +23,23 @@ subprojects {
2323

2424
compileJava {
2525
// The generated bytecode is for a 1.6 JVM
26-
options.release = 6
26+
options.release = 8
2727
}
2828

2929
java {
3030
toolchain {
31-
// We need a JDK 11 to build argon2-jvm
32-
languageVersion.set(JavaLanguageVersion.of(11))
31+
// We need a JDK 17 to build argon2-jvm
32+
languageVersion.set(JavaLanguageVersion.of(17))
3333
}
3434

3535
withJavadocJar()
3636
withSourcesJar()
3737
}
3838

3939
dependencies {
40-
testImplementation 'org.junit.jupiter:junit-jupiter:5.12.0'
41-
testImplementation 'org.assertj:assertj-core:3.27.3'
40+
testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
41+
testImplementation 'org.assertj:assertj-core:3.27.4'
42+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.4'
4243
}
4344

4445
test {
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-7.4.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)