From 90b1f90486801e819153dafc5d96795fb7740f7c Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Thu, 26 Mar 2020 12:49:37 -0700 Subject: [PATCH] Fix javadoc generation for the `_ext`jars. --- CHANGES.md | 2 ++ gradle/java-publish.gradle | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 6f119b2b42..dc7d61765c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,6 +10,8 @@ This document is intended for Spotless developers. We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`). ## [Unreleased] +### Fixed +* Javadoc for the `ext/eclipse-*` projects. ## [1.28.0] - 2020-03-20 ### Added diff --git a/gradle/java-publish.gradle b/gradle/java-publish.gradle index 214fb3fa22..dc2e35c968 100644 --- a/gradle/java-publish.gradle +++ b/gradle/java-publish.gradle @@ -22,6 +22,7 @@ def makeLink = { url, text -> "' +String dotdotGradle = project.name.startsWith('eclipse-') ? '../../gradle' : '../gradle' apply plugin: 'org.jdrupes.mdoclet' javadoc { // Where it's possible to name parameters and methods clearly enough @@ -33,12 +34,12 @@ javadoc { options.header javadocInfo options.footer javadocInfo // setup links - options.linksOffline('https://docs.oracle.com/javase/8/docs/api/', '../gradle/javadoc/java8') - options.linksOffline('https://docs.gradle.org/2.14/javadoc/', '../gradle/javadoc/gradle') + options.linksOffline('https://docs.oracle.com/javase/8/docs/api/', "${dotdotGradle}/javadoc/java8") + options.linksOffline('https://docs.gradle.org/2.14/javadoc/', "${dotdotGradle}/javadoc/gradle") // links to javadoc from the other versions - options.linksOffline("https://javadoc.io/static/com.diffplug.spotless/spotless-lib/${rootProject.spotlessChangelog.versionLast}", "../gradle/javadoc/spotless-lib") - options.linksOffline("https://javadoc.io/static/com.diffplug.spotless/spotless-lib-extra/${rootProject.spotlessChangelog.versionLast}", "../gradle/javadoc/spotless-lib-extra") + options.linksOffline("https://javadoc.io/static/com.diffplug.spotless/spotless-lib/${rootProject.spotlessChangelog.versionLast}", "${dotdotGradle}/javadoc/spotless-lib") + options.linksOffline("https://javadoc.io/static/com.diffplug.spotless/spotless-lib-extra/${rootProject.spotlessChangelog.versionLast}", "${dotdotGradle}/javadoc/spotless-lib-extra") } task javadocJar(type: Jar, dependsOn: javadoc) {