From 0ba1d2b8c58f4d8627d31dbc5a6d9ffdb20f2da7 Mon Sep 17 00:00:00 2001
From: Davis Rollman <drollma@hotmail.com>
Date: Sat, 9 May 2026 13:13:53 -0700
Subject: [PATCH] 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.
---
 build.gradle                     | 4 +---
 common.gradle                    | 4 +---
 jme3-lwjgl3/build.gradle         | 7 -------
 jme3-networking/build.gradle     | 7 -------
 jme3-saferallocator/build.gradle | 6 ------
 jme3-terrain/build.gradle        | 7 -------
 settings.gradle                  | 6 ++----
 7 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8dade8c48e..dff6ed4f6e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -151,9 +151,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 05400cdaac..a4d697f879 100644
--- a/common.gradle
+++ b/common.gradle
@@ -77,9 +77,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 98199a5117..49912fbb1d 100644
--- a/jme3-lwjgl3/build.gradle
+++ b/jme3-lwjgl3/build.gradle
@@ -50,10 +50,3 @@ dependencies {
     runtimeOnly(variantOf(libs.lwjgl3.sdl){ classifier('natives-macos') })
     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 aafe17cb1b..1613c2dca9 100644
--- a/jme3-saferallocator/build.gradle
+++ b/jme3-saferallocator/build.gradle
@@ -9,9 +9,3 @@ dependencies {
     implementation 'org.ngengine:saferalloc-natives-macos-aarch64:0.0.7'
     implementation 'org.ngengine:saferalloc-natives-android:0.0.7'
 }
-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 6866a6d250..324915c35c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -20,10 +20,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'