Update to Dokka 2.0.0

buildSrc/src/main/kotlin/Dokka.kt

@@ -1,21 +1,22 @@
 import org.gradle.api.*
+import org.gradle.api.publish.PublishingExtension
 import org.gradle.kotlin.dsl.*
-import org.jetbrains.dokka.gradle.*
+import org.jetbrains.dokka.gradle.DokkaExtension
 import java.io.*
 import java.net.*
 
 /**
  * Package-list by external URL for documentation generation.
  */
-fun Project.externalDocumentationLink(
+fun Project.configureExternalLinks(
     url: String,
     packageList: File = projectDir.resolve("package.list")
 ) {
-    tasks.withType<AbstractDokkaLeafTask>().configureEach {
+    extensions.configure<DokkaExtension> {
         dokkaSourceSets.configureEach {
-            externalDocumentationLink {
-                this.url = URL(url)
-                packageListUrl = packageList.toPath().toUri().toURL()
+            externalDocumentationLinks.register("api") {
+                this.url = URI.create(url)
+                this.packageListUrl = packageList.toURI()
             }
         }
     }

buildSrc/src/main/kotlin/UnpackAar.kt

@@ -16,13 +16,12 @@ import java.util.zip.ZipFile
 val artifactType = Attribute.of("artifactType", String::class.java)
 val unpackedAar = Attribute.of("unpackedAar", Boolean::class.javaObjectType)
 
-fun Project.configureAar() = configurations.configureEach {
-    afterEvaluate {
-        if (isCanBeResolved && !isCanBeConsumed) {
+fun Project.configureAar() =
+    configurations
+        .matching { it.isCanBeResolved && !it.isCanBeConsumed }
+        .configureEach {
             attributes.attribute(unpackedAar, true) // request all AARs to be unpacked
         }
-    }
-}
 
 fun DependencyHandlerScope.configureAarUnpacking() {
     attributesSchema {

buildSrc/src/main/kotlin/dokka-conventions.gradle.kts

@@ -1,4 +1,6 @@
+import org.gradle.api.Project
 import org.jetbrains.dokka.gradle.*
+import java.io.File
 import java.net.*
 
 
@@ -18,64 +20,58 @@ configure(subprojects.filterNot { projetsWithoutDokka.contains(it.name) }) {
     configureExternalLinks()
 }
 
-// Setup top-level 'dokkaHtmlMultiModule' with templates
-tasks.withType<DokkaMultiModuleTask>().named("dokkaHtmlMultiModule") {
-    setupDokkaTemplatesDir(this)
+// For top-level multimodule collection
+dokka {
+    setupDokkaTemplatesDir()
 }
-
 dependencies {
-    // Add explicit dependency between Dokka and Knit plugin
-    add("dokkaHtmlMultiModulePlugin", "org.jetbrains.kotlinx:dokka-pathsaver-plugin:$knit_version")
+    dokkaPlugin("org.jetbrains.kotlinx:dokka-pathsaver-plugin:$knit_version")
+
+    subprojects.forEach {
+        if (it.name !in projetsWithoutDokka) {
+            dokka(it)
+        }
+    }
 }
 
 // Dependencies for Knit processing: Knit plugin to work with Dokka
 private fun Project.configurePathsaver() {
-    tasks.withType(DokkaTaskPartial::class).configureEach {
-        dependencies {
-            plugins("org.jetbrains.kotlinx:dokka-pathsaver-plugin:$knit_version")
-        }
+    dependencies {
+        dokkaPlugin("org.jetbrains.kotlinx:dokka-pathsaver-plugin:$knit_version")
     }
 }
 
 // Configure Dokka setup
 private fun Project.condigureDokkaSetup() {
-    tasks.withType(DokkaTaskPartial::class).configureEach {
-        suppressInheritedMembers = true
-        setupDokkaTemplatesDir(this)
+    dokka {
+        dokkaPublications.configureEach {
+            suppressInheritedMembers = true
+        }
+
+        setupDokkaTemplatesDir()
 
         dokkaSourceSets.configureEach {
             jdkVersion = 11
             includes.from("README.md")
-            noStdlibLink = true
-
-            externalDocumentationLink {
-                url = URL("https://kotlinlang.org/api/latest/jvm/stdlib/")
-                packageListUrl = rootProject.projectDir.toPath().resolve("site/stdlib.package.list").toUri().toURL()
-            }
-
-            // Something suspicious to figure out, probably legacy of earlier days
-            if (!project.isMultiplatform) {
-                dependsOn(project.configurations["compileClasspath"])
-            }
-        }
-
-        // Source links
-        dokkaSourceSets.configureEach {
             sourceLink {
                 localDirectory = rootDir
-                remoteUrl = URL("https://github.com/kotlin/kotlinx.coroutines/tree/master")
-                remoteLineSuffix ="#L"
+                remoteUrl = URI("https://github.com/kotlin/kotlinx.coroutines/tree/master")
             }
         }
+
+        // TODO: WA for KT-71784
+        dokkaSourceSets.matching { it.name == "commonMain" }.configureEach {
+            suppress.set(true)
+        }
     }
 }
 
 private fun Project.configureExternalLinks() {
-    tasks.withType<DokkaTaskPartial>() {
+    dokka {
         dokkaSourceSets.configureEach {
-            externalDocumentationLink {
-                url = URL(coreModuleDocsUrl)
-                packageListUrl = File(coreModuleDocsPackageList).toURI().toURL()
+            externalDocumentationLinks.register("kotlinx-coroutines-core") {
+                url = URI(coreModuleDocsUrl)
+                packageListUrl = File(coreModuleDocsPackageList).toURI()
             }
         }
     }
@@ -90,10 +86,8 @@ private fun Project.configureExternalLinks() {
  * - Template setup: https://github.com/JetBrains/kotlin-web-site/blob/master/.teamcity/builds/apiReferences/kotlinx/coroutines/KotlinxCoroutinesPrepareDokkaTemplates.kt
  * - Templates repository: https://github.com/JetBrains/kotlin-web-site/tree/master/dokka-templates
  */
-private fun Project.setupDokkaTemplatesDir(dokkaTask: AbstractDokkaTask) {
-    dokkaTask.pluginsMapConfiguration = mapOf(
-        "org.jetbrains.dokka.base.DokkaBase" to """{ "templatesDir" : "${
-            project.rootProject.projectDir.toString().replace('\\', '/')
-        }/dokka-templates" }"""
-    )
+private fun DokkaExtension.setupDokkaTemplatesDir() {
+    pluginsConfiguration.html {
+        templatesDir = file(rootDir.toString().replace('\\', '/') + "/dokka-templates")
+    }
 }

buildSrc/src/main/kotlin/knit-conventions.gradle.kts

@@ -2,19 +2,14 @@ plugins {
     id("kotlinx-knit")
 }
 
+// TODO check that roots are correct
 knit {
     siteRoot = "https://kotlinlang.org/api/kotlinx.coroutines"
     moduleRoots = listOf(".", "integration", "reactive", "ui")
     moduleDocs = "build/dokka/htmlPartial"
     dokkaMultiModuleRoot = "build/dokka/htmlMultiModule/"
 }
 
-tasks.named("knitPrepare").configure {
-    val knitTask = this
-    // In order for knit to operate, it should depend on and collect
-    // all Dokka outputs from each module
-    allprojects {
-        val dokkaTasks = tasks.matching { it.name == "dokkaHtmlMultiModule" }
-        knitTask.dependsOn(dokkaTasks)
-    }
+tasks.named("knitPrepare") {
+    dependsOn("dokka")
 }

gradle.properties

@@ -11,7 +11,9 @@ junit_version=4.12
 junit5_version=5.7.0
 knit_version=0.5.0
 lincheck_version=2.18.1
-dokka_version=1.9.20
+dokka_version=2.0.0-Beta
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2EnabledWithHelpers
+
 byte_buddy_version=1.10.9
 reactor_version=3.4.1
 reactor_docs_version=3.4.5

integration/kotlinx-coroutines-guava/build.gradle.kts

@@ -9,6 +9,6 @@ java {
     sourceCompatibility = JavaVersion.VERSION_1_8
 }
 
-externalDocumentationLink(
+configureExternalLinks(
     url = "https://google.github.io/guava/releases/$guavaVersion/api/docs/"
 )

integration/kotlinx-coroutines-play-services/build.gradle.kts

@@ -13,6 +13,6 @@ dependencies {
     testImplementation("androidx.test:monitor:1.2.0")
 }
 
-externalDocumentationLink(
+configureExternalLinks(
     url = "https://developers.google.com/android/reference/"
 )

integration/kotlinx-coroutines-slf4j/build.gradle.kts

@@ -5,6 +5,6 @@ dependencies {
     testRuntimeOnly("ch.qos.logback:logback-core:1.2.7")
 }
 
-externalDocumentationLink(
+configureExternalLinks(
     url = "https://www.slf4j.org/apidocs/"
 )

kotlinx-coroutines-core/build.gradle.kts

@@ -1,5 +1,6 @@
 import org.gradle.api.tasks.testing.*
 import org.gradle.kotlin.dsl.*
+import org.jetbrains.dokka.gradle.tasks.DokkaBaseTask
 import org.jetbrains.kotlin.gradle.plugin.mpp.*
 import org.jetbrains.kotlin.gradle.targets.native.tasks.*
 import org.jetbrains.kotlin.gradle.tasks.*
@@ -303,6 +304,6 @@ artifacts {
 }
 
 // Workaround for https://github.com/Kotlin/dokka/issues/1833: make implicit dependency explicit
-tasks.named("dokkaHtmlPartial") {
+tasks.withType<DokkaBaseTask>() {
     dependsOn(jvmJar)
 }

reactive/kotlinx-coroutines-jdk9/build.gradle.kts

@@ -19,6 +19,6 @@ tasks {
     }
 }
 
-externalDocumentationLink(
+configureExternalLinks(
     url = "https://docs.oracle.com/javase/9/docs/api/java/util/concurrent/Flow.html"
 )

reactive/kotlinx-coroutines-reactive/build.gradle.kts

@@ -32,7 +32,7 @@ tasks.check {
     dependsOn(testNG)
 }
 
-externalDocumentationLink(
+configureExternalLinks(
     url = "https://www.reactive-streams.org/reactive-streams-$reactiveStreamsVersion-javadoc/"
 )
 

reactive/kotlinx-coroutines-reactor/build.gradle.kts

@@ -27,7 +27,7 @@ tasks {
 
 // the version of the docs can be different from the version of the Reactor
 // library itself: https://github.com/reactor/reactor-core/issues/3794
-externalDocumentationLink(
+configureExternalLinks(
     url = "https://projectreactor.io/docs/core/${version("reactor_docs")}/api/"
 )
 

ui/kotlinx-coroutines-android/build.gradle.kts

@@ -61,7 +61,7 @@ tasks.test {
     }
 }
 
-externalDocumentationLink(
+configureExternalLinks(
     url = "https://developer.android.com/reference/"
 )
 /*