Upgrade Dokka to 1.5.31

Now publishes the html docs in the javadoc jar files as recommended by
dokka maintainers.

See: https://github.com/Kotlin/dokka/issues/1753
This commit is contained in:
Michael Bull 2021-10-26 12:31:27 +01:00
parent 98c8eaead3
commit 2fc9ba0d35
2 changed files with 3 additions and 7 deletions

View File

@ -45,17 +45,13 @@ subprojects {
plugins.withType<KotlinMultiplatformPluginWrapper> { plugins.withType<KotlinMultiplatformPluginWrapper> {
apply(plugin = "org.jetbrains.dokka") apply(plugin = "org.jetbrains.dokka")
val dokka by tasks.existing(DokkaTask::class) { val dokkaHtml by tasks.existing(DokkaTask::class)
outputFormat = "javadoc"
outputDirectory = "$buildDir/docs/javadoc"
}
val javadocJar by tasks.registering(Jar::class) { val javadocJar by tasks.registering(Jar::class) {
group = LifecycleBasePlugin.BUILD_GROUP group = LifecycleBasePlugin.BUILD_GROUP
description = "Assembles a jar archive containing the Javadoc API documentation." description = "Assembles a jar archive containing the Javadoc API documentation."
archiveClassifier.set("javadoc") archiveClassifier.set("javadoc")
dependsOn(dokka) from(dokkaHtml)
from(dokka.get().outputDirectory)
} }
configure<KotlinMultiplatformExtension> { configure<KotlinMultiplatformExtension> {

View File

@ -1,5 +1,5 @@
object Versions { object Versions {
const val dokka = "0.10.1" const val dokka = "1.5.31"
const val kotlin = "1.5.31" const val kotlin = "1.5.31"
const val kotlinBenchmark = "0.3.1" const val kotlinBenchmark = "0.3.1"
const val kotlinCoroutines = "1.5.0" const val kotlinCoroutines = "1.5.0"