Skip to content

Remove isJava8Compatible() checks from Gradle files #2755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
8Keep wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove isJava8Compatible() checks from Gradle files #2755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ba1d2b
Remove obsolete isJava8Compatible() checks from Gradle files
8Keep May 9, 2026
acd8028
Merge branch 'master' into remove-isJava8Compatible
riccardobl May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,7 @@ tasks.register('mergedJavadoc', Javadoc) {
destinationDir = file("dist/javadoc")

options.encoding = 'UTF-8'
if (JavaVersion.current().isJava8Compatible()) {
options.addStringOption('Xdoclint:none', '-quiet')
}
options.addStringOption('Xdoclint:none', '-quiet')

options.overview = file("javadoc-overview.html")
source = mergedJavadocSubprojects.collect { project(it).sourceSets.main.allJava }
Expand Down
4 changes: 1 addition & 3 deletions common.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,7 @@ javadoc {
options.use = "true"
options.charSet = "UTF-8"
options.encoding = "UTF-8"
if (JavaVersion.current().isJava8Compatible()) {
options.addStringOption('Xdoclint:none', '-quiet')
}
options.addStringOption('Xdoclint:none', '-quiet')
source = sourceSets.main.allJava // main only, exclude tests
}

Expand Down
7 changes: 0 additions & 7 deletions jme3-lwjgl3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,3 @@ dependencies {
runtimeOnly(variantOf(libs.lwjgl3.sdl){ classifier('natives-macos-arm64') })

}

javadoc {
// Disable doclint for JDK8+.
if (JavaVersion.current().isJava8Compatible()){
options.addStringOption('Xdoclint:none', '-quiet')
}
}
7 changes: 0 additions & 7 deletions jme3-networking/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
dependencies {
api project(':jme3-core')
}

javadoc {
// Disable doclint for JDK8+.
if (JavaVersion.current().isJava8Compatible()){
options.addStringOption('Xdoclint:none', '-quiet')
}
}
7 changes: 0 additions & 7 deletions jme3-saferallocator/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,3 @@ dependencies {

implementation libs.bundles.saferalloc
}

javadoc {
// Disable doclint for JDK8+.
if (JavaVersion.current().isJava8Compatible()){
options.addStringOption('Xdoclint:none', '-quiet')
}
}
7 changes: 0 additions & 7 deletions jme3-terrain/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,3 @@ dependencies {
testRuntimeOnly project(':jme3-desktop')
testRuntimeOnly project(':jme3-testdata')
}

javadoc {
// Disable doclint for JDK8+.
if (JavaVersion.current().isJava8Compatible()){
options.addStringOption('Xdoclint:none', '-quiet')
}
}
6 changes: 2 additions & 4 deletions settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,8 @@ include 'jme3-terrain'
// Desktop dependent java classes
include 'jme3-desktop'
include 'jme3-lwjgl'
if (JavaVersion.current().isJava8Compatible()) {
include 'jme3-lwjgl3'
include 'jme3-saferallocator'
}
include 'jme3-lwjgl3'
include 'jme3-saferallocator'

// Other external dependencies
include 'jme3-jbullet'
Expand Down
Loading