Skip to content

Commit 1c7df31

Browse files
authored
Fix Dokka jar generation for release (#793)
1 parent 6ad89b3 commit 1c7df31

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

build-logic/plugins/src/main/java/ch/srgssr/pillarbox/gradle/PillarboxAndroidLibraryPublishingPlugin.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,18 @@ class PillarboxAndroidLibraryPublishingPlugin : Plugin<Project> {
2727
pluginManager.apply("com.android.library")
2828
pluginManager.apply("org.gradle.maven-publish")
2929
pluginManager.apply("org.jetbrains.dokka")
30+
pluginManager.apply("org.jetbrains.dokka-javadoc")
3031

3132
val dokkaHtmlJar = tasks.register<Jar>("dokkaHtmlJar") {
32-
val dokkaHtmlTask = tasks.named("dokkaHtml")
33+
val dokkaHtmlTask = tasks.named("dokkaGeneratePublicationHtml")
3334

3435
dependsOn(dokkaHtmlTask)
3536
from(dokkaHtmlTask.map { it.outputs })
3637
archiveClassifier.set("html-docs")
3738
}
3839

3940
val dokkaJavadocJar = tasks.register<Jar>("dokkaJavadocJar") {
40-
val dokkaJavadocTask = tasks.named("dokkaJavadoc")
41+
val dokkaJavadocTask = tasks.named("dokkaGeneratePublicationJavadoc")
4142

4243
dependsOn(dokkaJavadocTask)
4344
from(dokkaJavadocTask.map { it.outputs })

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ plugins {
1313
alias(libs.plugins.detekt)
1414
alias(libs.plugins.dependency.analysis.gradle.plugin)
1515
alias(libs.plugins.dokka)
16+
alias(libs.plugins.dokka.javadoc)
1617
alias(libs.plugins.kotlinx.kover)
1718
alias(libs.plugins.pillarbox.detekt)
1819
}

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ android.useAndroidX=true
2828
kotlin.code.style=official
2929

3030
org.gradle.caching=true
31-
org.gradle.configuration-cache=true
31+
# Disable configuration cache until Dokka supports it: https://github.com/Kotlin/dokka/issues/1217
32+
org.gradle.configuration-cache=false
3233

3334
# Print dependency analysis report to the console
3435
dependency.analysis.print.build.health=true

gradle/libs.versions.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ android-library = { id = "com.android.library", version.ref = "android-gradle-pl
145145
dependency-analysis-gradle-plugin = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependency-analysis-gradle-plugin" }
146146
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
147147
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
148+
dokka-javadoc = { id = "org.jetbrains.dokka-javadoc", version.ref = "dokka" }
148149
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
149150
kotlin-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
150151
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }

0 commit comments

Comments
 (0)