diff --git a/build.gradle.kts b/build.gradle.kts
index 27de86aaafb..4c5e4b000a3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -32,7 +32,6 @@ buildscript {
classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.35")
classpath(kotlin("gradle-plugin", bootstrapKotlinVersion))
classpath(kotlin("serialization", bootstrapKotlinVersion))
- classpath("org.jetbrains.dokka:dokka-gradle-plugin:0.9.17")
}
}
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 1175807e5e7..2e75ddc7c33 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -151,6 +151,7 @@ dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.35")
implementation("com.gradle.publish:plugin-publish-plugin:0.14.0")
+ implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.6.10")
implementation("net.rubygrapefruit:native-platform:${property("versions.native-platform")}")
implementation("net.rubygrapefruit:native-platform-windows-amd64:${property("versions.native-platform")}")
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index e1d0d2c550d..89f4478adb1 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -1220,6 +1220,12 @@
+
+
+
+
+
+
@@ -1250,6 +1256,12 @@
+
+
+
+
+
+
@@ -1280,6 +1292,12 @@
+
+
+
+
+
+
@@ -1290,6 +1308,12 @@
+
+
+
+
+
+
@@ -1300,6 +1324,12 @@
+
+
+
+
+
+
@@ -1320,6 +1350,12 @@
+
+
+
+
+
+
@@ -1336,6 +1372,12 @@
+
+
+
+
+
+
@@ -2457,6 +2499,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6078,6 +6132,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6088,6 +6172,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6668,6 +6794,12 @@
+
+
+
+
+
+
@@ -6782,6 +6914,12 @@
+
+
+
+
+
+
@@ -7176,6 +7314,12 @@
+
+
+
+
+
+
diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
index d024c8868a2..aad1edb2833 100644
--- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
@@ -145,9 +145,13 @@ tasks {
dependsOn(named("validatePlugins"))
}
- named("dokka") {
- outputFormat = "markdown"
- includes = listOf("$projectDir/Module.md")
+ withType().configureEach {
+ dokkaSourceSets.configureEach {
+ includes.from("Module.md")
+ }
+ }
+ register("dokka") {
+ dependsOn(named("dokkaJavadoc"))
}
}