diff --git a/build.gradle.kts b/build.gradle.kts index 3c213c4..14a0c99 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -76,17 +76,14 @@ tasks.test { } } -val dokkaHtml by tasks.getting(org.jetbrains.dokka.gradle.DokkaTask::class) - -val javadocJar: TaskProvider by tasks.registering(Jar::class) { - dependsOn(dokkaHtml) +val dokkaJavadocJar by tasks.register("dokkaJavadocJar") { + dependsOn(tasks.dokkaJavadoc) + from(tasks.dokkaJavadoc.flatMap { it.outputDirectory }) archiveClassifier.set("javadoc") - from(dokkaHtml.outputDirectory) } java { withSourcesJar() - withJavadocJar() } tasks.jar { @@ -101,7 +98,7 @@ tasks.jar { } tasks.assemble { - dependsOn(javadocJar) + dependsOn(dokkaJavadocJar) } publishing { @@ -122,8 +119,8 @@ publishing { developer { id.set("kpavlov") name.set("Konstantin Pavlov") - email.set("mail@KonstantinPavlov.net") - url.set("https://KonstantinPavlov.net?utm_source=jreactive8583") + email.set("mail@kpavlov.me") + url.set("https://kpavlov.me?utm_source=jreactive8583") roles.set(listOf("owner", "developer")) } } @@ -136,6 +133,7 @@ publishing { inceptionYear.set("2015") } from(components["java"]) + artifact(dokkaJavadocJar) } repositories { diff --git a/publish.sh b/publish.sh index b6b6b6c..5a87a33 100755 --- a/publish.sh +++ b/publish.sh @@ -3,7 +3,7 @@ # exit when any command fails set -e -GRADLE_ARGS="-Pversion=1.5.0" +GRADLE_ARGS="-Pversion=1.5.1" source build.sh