diff --git a/build.gradle b/build.gradle index 3a1395207c..06cc37d79c 100644 --- a/build.gradle +++ b/build.gradle @@ -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 } diff --git a/common.gradle b/common.gradle index 7329969359..c8e57d896a 100644 --- a/common.gradle +++ b/common.gradle @@ -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 } diff --git a/jme3-lwjgl3/build.gradle b/jme3-lwjgl3/build.gradle index 164f692266..44f64d6f85 100644 --- a/jme3-lwjgl3/build.gradle +++ b/jme3-lwjgl3/build.gradle @@ -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') - } -} diff --git a/jme3-networking/build.gradle b/jme3-networking/build.gradle index 510ad429c5..9dd715218e 100644 --- a/jme3-networking/build.gradle +++ b/jme3-networking/build.gradle @@ -1,10 +1,3 @@ dependencies { api project(':jme3-core') } - -javadoc { - // Disable doclint for JDK8+. - if (JavaVersion.current().isJava8Compatible()){ - options.addStringOption('Xdoclint:none', '-quiet') - } -} diff --git a/jme3-saferallocator/build.gradle b/jme3-saferallocator/build.gradle index 4a93b39217..fff2d766e9 100644 --- a/jme3-saferallocator/build.gradle +++ b/jme3-saferallocator/build.gradle @@ -3,10 +3,3 @@ dependencies { implementation libs.bundles.saferalloc } - -javadoc { - // Disable doclint for JDK8+. - if (JavaVersion.current().isJava8Compatible()){ - options.addStringOption('Xdoclint:none', '-quiet') - } -} diff --git a/jme3-terrain/build.gradle b/jme3-terrain/build.gradle index d96200a187..a55bdd04b5 100644 --- a/jme3-terrain/build.gradle +++ b/jme3-terrain/build.gradle @@ -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') - } -} diff --git a/settings.gradle b/settings.gradle index 7a591ec461..2b542fec64 100644 --- a/settings.gradle +++ b/settings.gradle @@ -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'