Skip to content

Commit 2c0e57d

Browse files
authored
Merge pull request #195 from yandex/users/bacecek/dokka_2
Update dokka to 2.0.0
2 parents f0d68f8 + 2125fc4 commit 2c0e57d

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,10 +1,10 @@
11
import com.yandex.yatagan.gradle.isValidSemVerString
2-
import org.jetbrains.dokka.gradle.DokkaTask
32
import org.gradle.kotlin.dsl.registering
43

54
plugins {
65
id("yatagan.base-module")
76
id("org.jetbrains.dokka")
7+
id("org.jetbrains.dokka-javadoc")
88
`maven-publish`
99
signing
1010
}
@@ -42,14 +42,13 @@ java {
4242

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

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

4949
val javadocJar by tasks.registering(Jar::class) {
5050
archiveClassifier.set("javadoc")
51-
from(tasks.dokkaJavadoc.map { it.outputDirectory })
52-
dependsOn(tasks.dokkaJavadoc)
51+
from(tasks.dokkaGeneratePublicationJavadoc.map { it.outputDirectory })
5352
}
5453

5554
artifacts {
@@ -141,4 +140,4 @@ rootProject.tasks {
141140
mustRunAfter(rootPublish)
142141
}
143142
}
144-
}
143+
}

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)