From 0b3a58eb0ac6330b380e36147761b4dbe1c05281 Mon Sep 17 00:00:00 2001 From: Filip ZybaƂa Date: Wed, 25 Mar 2020 13:16:10 +0100 Subject: Fixed maven and CLI runners stdlib links bug --- runners/maven-plugin/src/main/kotlin/DokkaMojo.kt | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'runners/maven-plugin/src/main/kotlin') diff --git a/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt b/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt index cfe278ce..49c6fba6 100644 --- a/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt +++ b/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt @@ -185,6 +185,19 @@ abstract class AbstractDokkaMojo : AbstractMojo() { throw MojoExecutionException("Incorrect path property, only Unix based path allowed.") } } + fun defaultLinks(config: PassConfigurationImpl): List { + val links = mutableListOf() + if (!config.noJdkLink) + links += DokkaConfiguration.ExternalDocumentationLink + .Builder("https://docs.oracle.com/javase/${config.jdkVersion}/docs/api/") + .build() as ExternalDocumentationLinkImpl + + if (!config.noStdlibLink) + links += DokkaConfiguration.ExternalDocumentationLink + .Builder("https://kotlinlang.org/api/latest/jvm/stdlib/") + .build() as ExternalDocumentationLinkImpl + return links + } val passConfiguration = PassConfigurationImpl( classpath = classpath, @@ -218,7 +231,11 @@ abstract class AbstractDokkaMojo : AbstractMojo() { targets = targets, includeNonPublic = includeNonPublic, includeRootPackage = includeRootPackage - ) + ).let{ + it.copy( + externalDocumentationLinks = defaultLinks(it) + it.externalDocumentationLinks + ) + } val logger = MavenDokkaLogger(log) -- cgit