mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-03-10 09:20:04 +01:00
Code Issues Projects Releases Packages Wiki Activity

graalvm.yml: add JDK 21 to the matrix

Browse source 
This also requires updating to the latest Gradle GraalVM Plugin,
which requires Gradle 7.4 or later.

Recent Gradle GraalVM Plugins don't require the `javaLauncher` setting (which
we had hardcoded to use JDK 17) so that setting is removed.
This commit is contained in:
Sean Gilligan 2023-09-20 09:23:23 -07:00 • committed by Andreas Schildbach
parent 1952d1cc7f
commit 64b5e02a5c
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/graalvm.yml vendored
View file

@ -9,7 +9,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macOS-latest]
java-version: [ '17' ]
java-version: [ '17', '21' ]
distribution: [ 'graalvm-community' ]
gradle: ['8.3']
fail-fast: false

12
wallettool/build.gradle
View file

@ -5,7 +5,7 @@ plugins {
id 'application'
id 'eclipse'
id 'org.asciidoctor.jvm.convert' version '3.3.2' apply false
id 'org.graalvm.buildtools.native' version '0.9.11' apply false
id 'org.graalvm.buildtools.native' version '0.9.27' apply false
}
def annotationProcessorMinVersion = GradleVersion.version("4.6")
@ -13,8 +13,8 @@ boolean hasAnnotationProcessor = (GradleVersion.current().compareTo(annotationPr
def junit5MinVersion = GradleVersion.version("4.6")
boolean hasJunit5 = (GradleVersion.current().compareTo(junit5MinVersion) >= 0)
def toolchainsMinVersion = GradleVersion.version("6.8") // Toolchains with selection by vendor
boolean hasToolchains = (GradleVersion.current().compareTo(toolchainsMinVersion) >= 0)
def graalVMMinVersion = GradleVersion.version("7.4") // Toolchains with selection by vendor
boolean hasGraalVM = (GradleVersion.current().compareTo(graalVMMinVersion) >= 0)
dependencies {
implementation project(':bitcoinj-core')
@ -76,7 +76,7 @@ asciidoctor {
}
}
if (hasToolchains) {
if (hasGraalVM) {
apply plugin: 'org.graalvm.buildtools.native'
@ -86,10 +86,6 @@ if (hasToolchains) {
imageName = applicationName
configurationFileDirectories.from(file('src/main/graal'))
buildArgs.add('--allow-incomplete-classpath')
javaLauncher = javaToolchains.launcherFor {
languageVersion = JavaLanguageVersion.of(17)
vendor = JvmVendorSpec.matching("GraalVM Community")
}
}
}
}