Skip to content

Commit 1fbf837

Browse files
committed
Dokka 2.0.0.
1 parent 7c0e139 commit 1fbf837

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

build-logic/src/main/kotlin/io/github/reactivecircus/cache4k/buildlogic/convention/ConventionPlugin.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import org.gradle.kotlin.dsl.invoke
2121
import org.gradle.kotlin.dsl.register
2222
import org.gradle.kotlin.dsl.the
2323
import org.gradle.kotlin.dsl.withType
24-
import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
24+
import org.jetbrains.dokka.gradle.DokkaExtension
2525
import org.jetbrains.dokka.gradle.DokkaPlugin
2626
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
2727
import org.jetbrains.kotlin.gradle.dsl.JsModuleKind
@@ -44,11 +44,11 @@ internal class ConventionPlugin : Plugin<Project> {
4444
}
4545

4646
private fun Project.configureRootProject() {
47-
tasks.withType<DokkaMultiModuleTask>().configureEach {
48-
val apiDir = rootDir.resolve("docs/api")
49-
outputDirectory.set(apiDir)
50-
doLast {
51-
apiDir.resolve("-modules.html").renameTo(apiDir.resolve("index.html"))
47+
plugins.withId("org.jetbrains.dokka") {
48+
extensions.configure<DokkaExtension> {
49+
dokkaPublications.configureEach {
50+
outputDirectory.set(layout.buildDirectory.dir("docs/api"))
51+
}
5252
}
5353
}
5454

build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
plugins {
22
id("cache4k.convention")
33
}
4+
5+
dependencies {
6+
dokka(project(":cache4k"))
7+
}

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,5 @@ kotlin.code.style=official
2222
kotlin.native.binary.gc=cms
2323

2424
kotlin.incremental.native=true
25+
26+
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22
kotlin = "2.1.0"
3-
dokka = "1.9.20"
3+
dokka = "2.0.0"
44
binaryCompabilityValidator = "0.15.1"
55
toolchainsResolver = "0.8.0"
66
detekt = "1.23.7"

0 commit comments

Comments
 (0)