From 70d0ec7b81e7a1fa4f6ad9de9b0b38c98e34611b Mon Sep 17 00:00:00 2001
From: Vsevolod Tolstopyatov <qwwdfsad@gmail.com>
Date: Fri, 11 Feb 2022 02:36:27 -0800
Subject: [PATCH] Update Dokka to 1.6.10 (#3184)

* Update Dokka to 1.6.10
---
 build.gradle                 | 2 --
 buildSrc/build.gradle.kts    | 1 -
 buildSrc/settings.gradle.kts | 1 -
 gradle.properties            | 2 +-
 gradle/dokka.gradle.kts      | 6 +-----
 5 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index d07f4767d9..bbf24f21d8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,7 +46,6 @@ buildscript {
         mavenCentral()
         maven { url "https://plugins.gradle.org/m2/" }
         maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" }
-        maven { url 'https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev' }
         mavenLocal()
     }
 
@@ -128,7 +127,6 @@ allprojects {
         google()
         mavenCentral()
         maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" }
-        maven { url 'https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev' }
     }
 }
 
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 2637980a24..f4b64b3560 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -19,7 +19,6 @@ repositories {
         maven("https://plugins.gradle.org/m2")
     }
     maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
-    maven("https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev")
     if (buildSnapshotTrain) {
         mavenLocal()
     }
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
index e30c3ee597..c2e859f65d 100644
--- a/buildSrc/settings.gradle.kts
+++ b/buildSrc/settings.gradle.kts
@@ -4,7 +4,6 @@
 pluginManagement {
     val build_snapshot_train: String? by settings
     repositories {
-        maven(url = "https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev/")
         val cacheRedirectorEnabled = System.getenv("CACHE_REDIRECTOR")?.toBoolean() == true
         if (cacheRedirectorEnabled) {
             println("Redirecting repositories for buildSrc buildscript")
diff --git a/gradle.properties b/gradle.properties
index 922f786fb1..7794ba71aa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,7 +14,7 @@ atomicfu_version=0.17.0
 knit_version=0.3.0
 html_version=0.7.2
 lincheck_version=2.14
-dokka_version=1.6.0-dev-138
+dokka_version=1.6.10
 byte_buddy_version=1.10.9
 reactor_version=3.4.1
 reactive_streams_version=1.0.3
diff --git a/gradle/dokka.gradle.kts b/gradle/dokka.gradle.kts
index a4926f7e61..8be4fbe231 100644
--- a/gradle/dokka.gradle.kts
+++ b/gradle/dokka.gradle.kts
@@ -37,7 +37,7 @@ tasks.withType(DokkaTaskPartial::class).configureEach {
             packageListUrl.set(rootProject.projectDir.toPath().resolve("site/stdlib.package.list").toUri().toURL())
         }
 
-        if (project.name != "kotlinx-coroutines-core" && project.name != "kotlinx-coroutines-test") {
+        if (!project.isMultiplatform) {
             dependsOn(project.configurations["compileClasspath"])
             doFirst {
                 // resolve classpath only during execution
@@ -66,10 +66,6 @@ if (project.name == "kotlinx-coroutines-core") {
             val jvmMain by getting {
                 makeLinkMapping(project.file("jvm"))
             }
-
-            configureEach {
-                classpath.from(project.configurations["jvmCompileClasspath"].files)
-            }
         }
     }
 }