From 729362b672c92dc035f81e6f9dcb924829a4bff9 Mon Sep 17 00:00:00 2001 From: Kamil Doległo Date: Thu, 2 Jul 2020 11:45:19 +0200 Subject: Replace direct creation of ExternalDocumentationLink with ExternalDocumentationLink.Builder --- runners/cli/src/main/kotlin/cli/main.kt | 3 +++ .../kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/runners/cli/src/main/kotlin/cli/main.kt b/runners/cli/src/main/kotlin/cli/main.kt index 37c13442..b0fb45b2 100644 --- a/runners/cli/src/main/kotlin/cli/main.kt +++ b/runners/cli/src/main/kotlin/cli/main.kt @@ -105,6 +105,9 @@ class GlobalArguments(args: Array) : DokkaConfiguration { sourceSets.forEach { it.externalDocumentationLinks.cast>().addAll(defaultLinks(it)) + it.externalDocumentationLinks.cast>().replaceAll { link -> + ExternalDocumentationLink.Builder(link.url, link.packageListUrl).build() + } } } } diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt index c5169ef8..a28416d6 100644 --- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt +++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt @@ -126,13 +126,13 @@ open class GradleDokkaSourceSet(@Transient val name: String = "") : DokkaSourceS fun externalDocumentationLink(c: Closure) { val link = ConfigureUtil.configure(c, GradleExternalDocumentationLinkImpl()) - externalDocumentationLinks.add(link) + externalDocumentationLinks.add(ExternalDocumentationLink.Builder(link.url, link.packageListUrl).build()) } fun externalDocumentationLink(action: Action) { val link = GradleExternalDocumentationLinkImpl() action.execute(link) - externalDocumentationLinks.add(link) + externalDocumentationLinks.add(ExternalDocumentationLink.Builder(link.url, link.packageListUrl).build()) } } -- cgit