Skip to content

Commit 373c321

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. Also fixes the reference to be to java-json-tools/msg-simple.
1 parent b17a629 commit 373c321

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

project.gradle

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,17 @@ dependencies {
4141
testImplementation(group: "org.mockito", name: "mockito-core", version: "2.28.2");
4242
}
4343

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

0 commit comments

Comments
 (0)