Skip to content

Commit f730509

Browse files
committed
Port #2957
1 parent 807c849 commit f730509

File tree

1 file changed

+3
-5
lines changed
  • buildSrc/src/main/kotlin/net/dv8tion/jda/tasks

1 file changed

+3
-5
lines changed

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ fun Project.configureJavadoc(
1313
failOnError: Boolean,
1414
overviewFile: String?,
1515
) = tasks.getting(Javadoc::class) {
16+
val currentJavaVersion = JavaVersion.current().majorVersion
17+
1618
isFailOnError = failOnError
1719

1820
(options as? StandardJavadocDocletOptions)?.apply {
@@ -21,11 +23,7 @@ fun Project.configureJavadoc(
2123

2224
author()
2325
tags("incubating:a:Incubating:")
24-
// We compile to Java 8 but JDK 8 docs don't seem to supply `element-list` anymore, failing the build
25-
// so we'll be using the closest valid link (JDK 11) instead.
26-
// Failing: https://docs.oracle.com/javase/8/docs/api/element-list
27-
val effectiveJdkDocsVersion = max(11, targetVersion.majorVersion.toInt())
28-
links("https://docs.oracle.com/en/java/javase/${effectiveJdkDocsVersion}/docs/api/", "https://takahikokawasaki.github.io/nv-websocket-client/")
26+
links("https://docs.oracle.com/en/java/javase/$currentJavaVersion/docs/api/", "https://takahikokawasaki.github.io/nv-websocket-client/")
2927

3028
addBooleanOption("html5", true) // Adds search bar
3129
addStringOption("-release", targetVersion.majorVersion)

0 commit comments

Comments
 (0)