Skip to content

Commit

Permalink
Update CI to Java 21 and Gradle 8.4 (#152)
Browse files Browse the repository at this point in the history
* Update gradle.yml

* Update javadocs.yml

* Update gradle.yml

* updated to gradle `8.3`

* updated to gradle `8.4`

* fixed javadocs generation
DenuxPlays authored Oct 15, 2023
1 parent 01a68b2 commit 4e4f69f
Showing 6 changed files with 14 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ '11', '17', '20' ]
java: [ '11', '21' ]

steps:
- uses: actions/checkout@v4
4 changes: 2 additions & 2 deletions .github/workflows/javadocs.yml
Original file line number Diff line number Diff line change
@@ -22,10 +22,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
java-version: 17
java-version: 21
distribution: 'temurin'
- name: Grant execute permission for gradlew
run: chmod +x gradlew
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -120,8 +120,8 @@ To find all missing javadocs / all javadocs warnings execute this command:
javadoc.apply {
isFailOnError = isCI

//Javadocs are scuffed on these version I don't know and care why.
if (javaVersion <= JavaVersion.VERSION_13) {
//Fixes the error where the executor could not be found and the build fails.
if (javaVersion <= JavaVersion.VERSION_20) {
isFailOnError = false
}

@@ -141,7 +141,7 @@ javadoc.apply {
if (javaVersion >= JavaVersion.VERSION_13) {
opt.addBooleanOption("Xdoclint:all", true)
} else {
//Can be ignored because JavaDocs are generated using Java 17.
//Can be ignored because JavaDocs are generated using Java 21.
opt.addBooleanOption("Xdoclint:all,-missing,-accessibility", true)
}
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
8 changes: 6 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
@@ -83,7 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
@@ -130,10 +131,13 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.

0 comments on commit 4e4f69f

Please sign in to comment.