aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsebastian.sellmair <sebastian.sellmair@jetbrains.com>2020-08-20 10:19:27 +0200
committerSebastian Sellmair <34319766+sellmair@users.noreply.github.com>2020-08-20 11:45:23 +0200
commita7dec28a206ffb7fdeede1743edfd318bd1e2920 (patch)
tree82526639816613dce42a820ba81d036e4cf9bb41
parentace3fe828e1b6db055ae5592c5c8c57c3c1aaa8f (diff)
downloaddokka-a7dec28a206ffb7fdeede1743edfd318bd1e2920.tar.gz
dokka-a7dec28a206ffb7fdeede1743edfd318bd1e2920.tar.bz2
dokka-a7dec28a206ffb7fdeede1743edfd318bd1e2920.zip
Fix convention for ExternalDocumentationLink#packageListUrl
-rw-r--r--integration-tests/gradle/projects/it-multiplatform-0/build.gradle.kts2
-rw-r--r--runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/GradleExternalDocumentationLinkBuilder.kt2
2 files changed, 3 insertions, 1 deletions
diff --git a/integration-tests/gradle/projects/it-multiplatform-0/build.gradle.kts b/integration-tests/gradle/projects/it-multiplatform-0/build.gradle.kts
index fb0e4b7c..9f93c2cd 100644
--- a/integration-tests/gradle/projects/it-multiplatform-0/build.gradle.kts
+++ b/integration-tests/gradle/projects/it-multiplatform-0/build.gradle.kts
@@ -27,7 +27,7 @@ tasks.withType<DokkaTask>().configureEach {
configureEach {
externalDocumentationLink {
url.set(URL("https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/"))
- packageListUrl.set(URL("https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/package-list"))
+ //packageListUrl.set(URL("https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/package-list"))
}
}
}
diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/GradleExternalDocumentationLinkBuilder.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/GradleExternalDocumentationLinkBuilder.kt
index 65e23654..19d150c3 100644
--- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/GradleExternalDocumentationLinkBuilder.kt
+++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/GradleExternalDocumentationLinkBuilder.kt
@@ -4,6 +4,7 @@ import org.gradle.api.Project
import org.gradle.api.provider.Property
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.Optional
import org.jetbrains.dokka.DokkaConfigurationBuilder
import org.jetbrains.dokka.ExternalDocumentationLink
import org.jetbrains.dokka.ExternalDocumentationLinkImpl
@@ -15,6 +16,7 @@ class GradleExternalDocumentationLinkBuilder(
@Input
val url: Property<URL?> = project.objects.safeProperty()
+ @Optional
@Input
val packageListUrl: Property<URL?> = project.objects.safeProperty()