mirror of
https://github.com/bitcoinj/bitcoinj.git
synced 2025-02-22 22:25:41 +01:00
core/build.gradle,gradle.yml: test(On)Jdk11
Continue using Java Toolchain support in Gradle to test on an earlier JDK, but switch from JDK 8 to JDK 11.
This commit is contained in:
parent
a08f442d82
commit
d6ebac3ac4
2 changed files with 7 additions and 7 deletions
2
.github/workflows/gradle.yml
vendored
2
.github/workflows/gradle.yml
vendored
|
@ -31,7 +31,7 @@ jobs:
|
|||
with:
|
||||
gradle-version: ${{ matrix.gradle }}
|
||||
- name: Run Gradle
|
||||
run: gradle -PtestJdk8=true build --init-script build-scan-agree.gradle --scan --info --stacktrace
|
||||
run: gradle -PtestJdk11=true build --init-script build-scan-agree.gradle --scan --info --stacktrace
|
||||
- name: Upload Test Results and Reports
|
||||
uses: actions/upload-artifact@v4
|
||||
if: always()
|
||||
|
|
|
@ -84,19 +84,19 @@ def gradleVersionToolchains = GradleVersion.version("6.7")
|
|||
|
||||
if (GradleVersion.current().compareTo(gradleVersionToolchains) > 0) {
|
||||
// If the Gradle Java Toolchains feature is available, run tests on older JDKs
|
||||
System.err.println "Adding 'testOnJdk8' task, because ${GradleVersion.current()}"
|
||||
System.err.println "Adding 'testOnJdk11' task, because ${GradleVersion.current()}"
|
||||
|
||||
task('testOnJdk8', type: Test) {
|
||||
task('testOnJdk11', type: Test) {
|
||||
doFirst {
|
||||
logger.lifecycle("Testing with JDK ${javaLauncher.get().metadata.javaRuntimeVersion}")
|
||||
}
|
||||
javaLauncher = javaToolchains.launcherFor {
|
||||
languageVersion = JavaLanguageVersion.of(8)
|
||||
languageVersion = JavaLanguageVersion.of(11)
|
||||
}
|
||||
}
|
||||
// Activate if `testJdk8` is `true` in `gradle.properties` or `-PtestJdk8=true` is on command-line
|
||||
if (Boolean.valueOf(findProperty('testJdk8'))) {
|
||||
check.dependsOn testOnJdk8
|
||||
// Activate if `testJdk11` is `true` in `gradle.properties` or `-PtestJdk11=true` is on command-line
|
||||
if (Boolean.valueOf(findProperty('testJdk11'))) {
|
||||
check.dependsOn testOnJdk11
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue