Skip to content

Commit 269f234

Browse files
committed
Use https for JDK javadoc links.
Conditionally adds a `--release=7` flag to tell javadoc the source compatibility. This inhibits javadoc in later JDKs erroring out expecting modules when there are none. See java-json-tools/btf/issues/7.
1 parent 99c660c commit 269f234

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

project.gradle

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,17 @@ dependencies {
4747
/*
4848
* External javadoc links
4949
*/
50-
// FIXME: For some reason, making this https causes OpenJDK 11 to fail.
51-
javadoc.options.links("http://docs.oracle.com/javase/7/docs/api/");
52-
javadoc.options.links("https://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.1/");
53-
javadoc.options.links("https://fasterxml.github.io/jackson-databind/javadoc/2.2.0/");
54-
javadoc.options.links("https://www.javadoc.io/doc/com.google.guava/guava/25.1-jre/");
55-
javadoc.options.links("https://fge.github.io/msg-simple/");
50+
javadoc {
51+
options {
52+
def currentJavaVersion = org.gradle.api.JavaVersion.current()
53+
// FIXME: https://github.com/gradle/gradle/issues/11182
54+
if (currentJavaVersion.compareTo(org.gradle.api.JavaVersion.VERSION_1_9) >= 0) {
55+
addStringOption("-release", "7");
56+
}
57+
links("https://docs.oracle.com/javase/7/docs/api/");
58+
links("https://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.1/");
59+
links("https://fasterxml.github.io/jackson-databind/javadoc/2.2.0/");
60+
links("https://www.javadoc.io/doc/com.google.guava/guava/25.1-jre/");
61+
links("https://java-json-tools.github.io/msg-simple/");
62+
}
63+
}

0 commit comments

Comments
 (0)