From 7a402d8c486b2439e78d1d86eafefcd76a09cfd2 Mon Sep 17 00:00:00 2001 From: Nathan Herring Date: Wed, 30 Oct 2019 16:08:21 +0100 Subject: [PATCH] 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. --- build.gradle | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 96ba0416e..8fbe002a2 100644 --- a/build.gradle +++ b/build.gradle @@ -69,17 +69,25 @@ dependencies { testCompile(group: "org.easytesting", name: "fest-assert", version: "1.4"); } -// FIXME: For some reason, making this https causes OpenJDK 11 to fail. -javadoc.options.links("http://docs.oracle.com/javase/7/docs/api/"); -javadoc.options.links("https://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.1/"); -javadoc.options.links("https://fasterxml.github.io/jackson-databind/javadoc/2.2.0/"); -javadoc.options.links("https://fasterxml.github.io/jackson-core/javadoc/2.2.0/"); -javadoc.options.links("https://www.javadoc.io/doc/com.google.guava/guava/25.1-android/"); -javadoc.options.links("https://java-json-tools.github.io/btf/"); -javadoc.options.links("https://java-json-tools.github.io/msg-simple/"); -javadoc.options.links("https://java-json-tools.github.io/jackson-coreutils/"); -javadoc.options.links("https://java-json-tools.github.io/uri-template/"); -javadoc.options.links("https://java-json-tools.github.io/json-schema-core/1.2.x/"); +javadoc { + options { + def currentJavaVersion = org.gradle.api.JavaVersion.current() + // FIXME: https://github.com/gradle/gradle/issues/11182 + if (currentJavaVersion.compareTo(org.gradle.api.JavaVersion.VERSION_1_9) >= 0) { + addStringOption("-release", "7"); + } + links("https://docs.oracle.com/javase/7/docs/api/"); + links("https://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.1/"); + links("https://fasterxml.github.io/jackson-databind/javadoc/2.2.0/"); + links("https://fasterxml.github.io/jackson-core/javadoc/2.2.0/"); + links("https://www.javadoc.io/doc/com.google.guava/guava/25.1-android/"); + links("https://java-json-tools.github.io/btf/"); + links("https://java-json-tools.github.io/msg-simple/"); + links("https://java-json-tools.github.io/jackson-coreutils/"); + links("https://java-json-tools.github.io/uri-template/"); + links("https://java-json-tools.github.io/json-schema-core/1.2.x/"); + } +} /* * Necessary! Otherwise TestNG will not be used...