Port #2943

Author: freya022

buildSrc/src/main/kotlin/net/dv8tion/jda/tasks/javadocs.kt

@@ -27,25 +27,9 @@ fun Project.configureJavadoc(
         val effectiveJdkDocsVersion = max(11, targetVersion.majorVersion.toInt())
         links("https://docs.oracle.com/en/java/javase/${effectiveJdkDocsVersion}/docs/api/", "https://takahikokawasaki.github.io/nv-websocket-client/")
 
-        val javaVersion = JavaVersion.current()
-        if (JavaVersion.VERSION_1_8 < javaVersion) {
-            addBooleanOption("html5", true) // Adds search bar
-            addStringOption("-release", targetVersion.majorVersion)
-        }
-
-        // Fix for https://stackoverflow.com/questions/52326318/maven-javadoc-search-redirects-to-undefined-url
-        if (javaVersion in JavaVersion.VERSION_11..JavaVersion.VERSION_12) {
-            addBooleanOption("-no-module-directories", true)
-        }
-
-        // Java 13 changed accessibility rules.
-        // On versions less than Java 13, we simply ignore the errors.
-        // Both of these remove "no comment" warnings.
-        if (javaVersion >= JavaVersion.VERSION_13) {
-            addBooleanOption("Xdoclint:all,-missing", true)
-        } else {
-            addBooleanOption("Xdoclint:all,-missing,-accessibility", true)
-        }
+        addBooleanOption("html5", true) // Adds search bar
+        addStringOption("-release", targetVersion.majorVersion)
+        addBooleanOption("Xdoclint:all,-missing", true)
 
         overview = overviewFile
     }

opus-jna/build.gradle.kts

@@ -38,9 +38,6 @@ base {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-
     withSourcesJar()
 }
 
@@ -108,10 +105,7 @@ tasks.withType<JavaCompile> {
 
     val args = mutableListOf("-Xlint:deprecation", "-Xlint:unchecked")
 
-    if (JavaVersion.current().isJava9Compatible) {
-        args.add("--release")
-        args.add("8")
-    }
+    options.release = 8
 
     options.compilerArgs.addAll(args)
 }