Skip to content

Commit becda55

Browse files
committed
Update dokka to 2.0.0
1 parent 1764ce6 commit becda55

3 files changed

Lines changed: 8 additions & 6 deletions

File tree

buildSrc/src/main/kotlin/yatagan.artifact.gradle.kts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import com.yandex.yatagan.gradle.isValidSemVerString
2-
import org.jetbrains.dokka.gradle.DokkaTask
32

43
plugins {
54
id("yatagan.base-module")
65
id("org.jetbrains.dokka")
6+
id("org.jetbrains.dokka-javadoc")
77
`maven-publish`
88
signing
99
}
@@ -41,14 +41,13 @@ java {
4141

4242
val artifactName = path.trim(':').replace(':', '-')
4343

44-
tasks.withType<DokkaTask>().configureEach {
44+
dokka {
4545
moduleName.set(artifactName)
4646
}
4747

4848
val javadocJar by tasks.creating(Jar::class) {
4949
archiveClassifier.set("javadoc")
50-
from(tasks.dokkaJavadoc.map { it.outputDirectory })
51-
dependsOn(tasks.dokkaJavadoc)
50+
from(tasks.dokkaGeneratePublicationJavadoc.map { it.outputDirectory })
5251
}
5352

5453
artifacts {
@@ -142,4 +141,4 @@ rootProject.tasks {
142141
mustRunAfter(rootPublish)
143142
}
144143
}
145-
}
144+
}

gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@ org.gradle.jvmargs=-Xmx2G
55
org.gradle.configureondemand=true
66
org.gradle.parallel=true
77
org.gradle.configuration-cache=true
8+
9+
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
10+
org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kotlin = "1.9.24"
55
# Must be in sync with 'kotlin'. Asserted in buildscript
66
ksp = "1.9.24-1.0.20"
77
# Must be compatible with 'kotlin'
8-
dokka = "1.9.20"
8+
dokka = "2.0.0"
99

1010
dagger = "2.51.1"
1111

0 commit comments

Comments
 (0)