Skip to content

Commit 186fcd5

Browse files
authored
Fix dokka templates (#399)
* Apply `kotlinx-io-dokka` in root * Share configuration for partial and multi-module via AbstractDokkaTask
1 parent e5cc404 commit 186fcd5

File tree

2 files changed

+7
-17
lines changed

2 files changed

+7
-17
lines changed

build-logic/src/main/kotlin/kotlinx/io/conventions/kotlinx-io-dokka.gradle.kts

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,25 @@
33
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENCE file.
44
*/
55

6-
import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
7-
import org.jetbrains.dokka.gradle.DokkaTaskPartial
6+
import org.jetbrains.dokka.gradle.*
87
import java.net.URL
98

109
plugins {
1110
id("org.jetbrains.dokka")
1211
}
1312

14-
tasks.withType<DokkaTaskPartial>().configureEach {
13+
// shared configuration for all dokka tasks (both partial and multi-module)
14+
tasks.withType<AbstractDokkaTask>().configureEach {
1515
pluginsMapConfiguration.set(
1616
mapOf(
1717
"org.jetbrains.dokka.base.DokkaBase" to """{ "templatesDir" : "${
18-
projectDir.resolveSibling("dokka-templates")
18+
rootDir.resolve("dokka-templates")
1919
}"""
2020
)
2121
)
22+
}
2223

24+
tasks.withType<DokkaTaskPartial>().configureEach {
2325
dokkaSourceSets.configureEach {
2426
includes.from("Module.md")
2527

@@ -43,15 +45,3 @@ tasks.withType<DokkaTaskPartial>().configureEach {
4345
)
4446
}
4547
}
46-
47-
tasks.withType(DokkaMultiModuleTask::class.java) {
48-
pluginsMapConfiguration.set(
49-
mapOf(
50-
"org.jetbrains.dokka.base.DokkaBase" to """{ "templatesDir" : "${
51-
projectDir.resolve(
52-
"dokka-templates"
53-
)
54-
}" }"""
55-
)
56-
)
57-
}

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import kotlinx.validation.ExperimentalBCVApi
88

99
plugins {
1010
id("kotlinx-io-publish") apply false
11+
id("kotlinx-io-dokka")
1112

1213
alias(libs.plugins.kover)
1314
alias(libs.plugins.bcv)
14-
alias(libs.plugins.dokka)
1515
}
1616

1717
allprojects {

0 commit comments

Comments
 (0)