From 2125fc40c26f8bff42e0c1ac9145f92c0cb33980 Mon Sep 17 00:00:00 2001
From: Denis Buzmakov <me@bacecek.dev>
Date: Sat, 22 Mar 2025 15:42:35 +0100
Subject: [PATCH] Update dokka to 2.0.0

---
 buildSrc/src/main/kotlin/yatagan.artifact.gradle.kts | 9 ++++-----
 gradle.properties                                    | 3 +++
 gradle/libs.versions.toml                            | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/buildSrc/src/main/kotlin/yatagan.artifact.gradle.kts b/buildSrc/src/main/kotlin/yatagan.artifact.gradle.kts
index 5d564c09..83304df6 100644
--- a/buildSrc/src/main/kotlin/yatagan.artifact.gradle.kts
+++ b/buildSrc/src/main/kotlin/yatagan.artifact.gradle.kts
@@ -1,10 +1,10 @@
 import com.yandex.yatagan.gradle.isValidSemVerString
-import org.jetbrains.dokka.gradle.DokkaTask
 import org.gradle.kotlin.dsl.registering
 
 plugins {
     id("yatagan.base-module")
     id("org.jetbrains.dokka")
+    id("org.jetbrains.dokka-javadoc")
     `maven-publish`
     signing
 }
@@ -42,14 +42,13 @@ java {
 
 val artifactName = path.trim(':').replace(':', '-')
 
-tasks.withType<DokkaTask>().configureEach {
+dokka {
     moduleName.set(artifactName)
 }
 
 val javadocJar by tasks.registering(Jar::class) {
     archiveClassifier.set("javadoc")
-    from(tasks.dokkaJavadoc.map { it.outputDirectory })
-    dependsOn(tasks.dokkaJavadoc)
+    from(tasks.dokkaGeneratePublicationJavadoc.map { it.outputDirectory })
 }
 
 artifacts {
@@ -141,4 +140,4 @@ rootProject.tasks {
             mustRunAfter(rootPublish)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/gradle.properties b/gradle.properties
index 0a10175b..93385acf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,3 +5,6 @@ org.gradle.jvmargs=-Xmx2G
 org.gradle.configureondemand=true
 org.gradle.parallel=true
 org.gradle.configuration-cache=true
+
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
+org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 195d447f..ec6738ba 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ kotlin = "1.9.24"
 # Must be in sync with 'kotlin'. Asserted in buildscript
 ksp = "1.9.24-1.0.20"
 # Must be compatible with 'kotlin'
-dokka = "1.9.20"
+dokka = "2.0.0"
 
 dagger = "2.51.1"