Skip to content

Commit e9d81be

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 c940e6c commit e9d81be

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

project.gradle

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,15 @@ dependencies {
4040
testCompile(group: "org.mockito", name: "mockito-core", version: "2.28.2");
4141
}
4242

43-
// FIXME: For some reason, making this https causes OpenJDK 11 to fail.
44-
javadoc.options.links("http://docs.oracle.com/javase/6/docs/api/");
45-
javadoc.options.links("https://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.1/");
46-
javadoc.options.links("https://java-json-tools.github.io/btf/");
47-
43+
javadoc {
44+
options {
45+
def currentJavaVersion = org.gradle.api.JavaVersion.current()
46+
// FIXME: https://github.com/gradle/gradle/issues/11182
47+
if (currentJavaVersion.compareTo(org.gradle.api.JavaVersion.VERSION_1_9) >= 0) {
48+
addStringOption("-release", "7");
49+
}
50+
links("https://docs.oracle.com/javase/7/docs/api/");
51+
links("https://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.1/");
52+
links("https://java-json-tools.github.io/btf/");
53+
}
54+
}

0 commit comments

Comments
 (0)