Skip to content

Commit 53f9784

Browse files
committed
Remove obsolete isJava8Compatible() checks from Gradle files
Since the project now requires JDK 8+, the JavaVersion.current().isJava8Compatible() checks are no longer needed. This commit removes those checks and unconditionally includes jme3-lwjgl3 and jme3-saferallocator modules in settings.gradle, and unconditionally applies the Xdoclint:none javadoc option in all subprojects.
1 parent 33902ef commit 53f9784

6 files changed

Lines changed: 4 additions & 31 deletions

File tree

build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,7 @@ tasks.register('mergedJavadoc', Javadoc) {
174174
destinationDir = file("dist/javadoc")
175175

176176
options.encoding = 'UTF-8'
177-
if (JavaVersion.current().isJava8Compatible()) {
178-
options.addStringOption('Xdoclint:none', '-quiet')
179-
}
177+
options.addStringOption('Xdoclint:none', '-quiet')
180178

181179
options.overview = file("javadoc-overview.html")
182180
source = mergedJavadocSubprojects.collect { project(it).sourceSets.main.allJava }

common.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,7 @@ javadoc {
7979
options.use = "true"
8080
options.charSet = "UTF-8"
8181
options.encoding = "UTF-8"
82-
if (JavaVersion.current().isJava8Compatible()) {
83-
options.addStringOption('Xdoclint:none', '-quiet')
84-
}
82+
options.addStringOption('Xdoclint:none', '-quiet')
8583
source = sourceSets.main.allJava // main only, exclude tests
8684
}
8785

jme3-lwjgl3/build.gradle

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,3 @@ dependencies {
5858
runtimeOnly(variantOf(libs.lwjgl3.sdl){ classifier('natives-macos-arm64') })
5959

6060
}
61-
62-
javadoc {
63-
// Disable doclint for JDK8+.
64-
if (JavaVersion.current().isJava8Compatible()){
65-
options.addStringOption('Xdoclint:none', '-quiet')
66-
}
67-
}

jme3-saferallocator/build.gradle

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,3 @@ dependencies {
33

44
implementation libs.bundles.saferalloc
55
}
6-
7-
javadoc {
8-
// Disable doclint for JDK8+.
9-
if (JavaVersion.current().isJava8Compatible()){
10-
options.addStringOption('Xdoclint:none', '-quiet')
11-
}
12-
}

jme3-terrain/build.gradle

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,3 @@ dependencies {
55
testRuntimeOnly project(':jme3-desktop')
66
testRuntimeOnly project(':jme3-testdata')
77
}
8-
9-
javadoc {
10-
// Disable doclint for JDK8+.
11-
if (JavaVersion.current().isJava8Compatible()){
12-
options.addStringOption('Xdoclint:none', '-quiet')
13-
}
14-
}

settings.gradle

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,8 @@ include 'jme3-terrain'
2929
// Desktop dependent java classes
3030
include 'jme3-desktop'
3131
include 'jme3-lwjgl'
32-
if (JavaVersion.current().isJava8Compatible()) {
33-
include 'jme3-lwjgl3'
34-
include 'jme3-saferallocator'
35-
}
32+
include 'jme3-lwjgl3'
33+
include 'jme3-saferallocator'
3634

3735
// Other external dependencies
3836
include 'jme3-jbullet'

0 commit comments

Comments
 (0)