From 23f5b3ad019e7cb56f5ec5c1f8dce5a1b147c8c0 Mon Sep 17 00:00:00 2001 From: David Bernard Date: Wed, 4 Mar 2015 11:38:25 +0100 Subject: [PATCH 1/2] build: quick fix to run javadoc with jdk < 1.8 --- common.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common.gradle b/common.gradle index eee3320ba..0208a5523 100644 --- a/common.gradle +++ b/common.gradle @@ -37,7 +37,9 @@ javadoc { options.author = "true" options.use = "true" //disable doclint for JDK8, more quiet output - options.addStringOption('Xdoclint:none', '-quiet') + if (Double.parseDouble(System.getProperty("java.specification.version")) > 1.7){ + options.addStringOption('Xdoclint:none', '-quiet') + } } task sourcesJar(type: Jar, dependsOn: classes, description: 'Creates a jar from the source files.') { From 4bdf682944060344bb8388837f0b442eaa137bc5 Mon Sep 17 00:00:00 2001 From: David Bernard Date: Wed, 4 Mar 2015 11:45:24 +0100 Subject: [PATCH 2/2] build:javadoc: use JavaVersion.current().isJava8Compatible() --- common.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.gradle b/common.gradle index 0208a5523..9d65f7338 100644 --- a/common.gradle +++ b/common.gradle @@ -37,7 +37,7 @@ javadoc { options.author = "true" options.use = "true" //disable doclint for JDK8, more quiet output - if (Double.parseDouble(System.getProperty("java.specification.version")) > 1.7){ + if (JavaVersion.current().isJava8Compatible()){ options.addStringOption('Xdoclint:none', '-quiet') } }