From 764dd84803d84fc52690439fb14534c9e5a46a11 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Mon, 8 Nov 2021 18:50:52 +0100
Subject: [PATCH] Update dokka plugin to 1.6.10 version

Move it into 'buildSrc' dependency, so it will be available to
precompiled script plugins.

^KT-49227 In Progress
---
 build.gradle.kts                              |   1 -
 buildSrc/build.gradle.kts                     |   1 +
 gradle/verification-metadata.xml              | 144 ++++++++++++++++++
 .../kotlin-gradle-plugin/build.gradle.kts     |  10 +-
 4 files changed, 152 insertions(+), 4 deletions(-)

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 @@
             <sha256 value="6fe85d62276e0c2b078b284391863ab9837ed8ee3847256469ae5ec06e8c528a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-annotations" version="2.12.4">
+         <artifact name="jackson-annotations-2.12.4.jar">
+            <md5 value="16c7a1094270a27013fd58df7f6800f7" origin="Generated by Gradle"/>
+            <sha256 value="f6aa3706a875689b66cdac3334f65dfdb795ccfad4117bf072893b196ed1ec8e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml.jackson.core" name="jackson-core" version="2.10.5">
          <artifact name="jackson-core-2.10.5.jar">
             <md5 value="467e771df80da5f50fadb399f78f4ce1" origin="Generated by Gradle"/>
@@ -1250,6 +1256,12 @@
             <sha256 value="caffed146e667de7344c210fe8eda0241bc187fc5606237e1835711d0c5667de" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-core" version="2.12.4">
+         <artifact name="jackson-core-2.12.4.jar">
+            <md5 value="58ffcb451f0bf6beb78e306cfe5d46f3" origin="Generated by Gradle"/>
+            <sha256 value="3506ce47ec2604ae2d80d79505f7cb374f718060639415c07d144adadd2d68a3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.10.5">
          <artifact name="jackson-databind-2.10.5.jar">
             <md5 value="40a3ee2381813fdcfc6ad026e914ab0c" origin="Generated by Gradle"/>
@@ -1280,6 +1292,12 @@
             <sha256 value="5cc5c656fd5fe56a9a1614323cf0f3edc73718392b8d1d8ecf2798045b53bbc7" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.12.4">
+         <artifact name="jackson-databind-2.12.4.jar">
+            <md5 value="7bf7ed4119602e8a7b23356dc0fba920" origin="Generated by Gradle"/>
+            <sha256 value="e99a7b4b89074bc689aabcd9eb1f2c1318b68cc5c34979daf3e34edc558c7a01" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-xml" version="2.11.4">
          <artifact name="jackson-dataformat-xml-2.11.4.jar">
             <md5 value="24a21a3e5fd29143b635249a1c273e01" origin="Generated by Gradle"/>
@@ -1290,6 +1308,12 @@
             <sha256 value="cbbfdddf5f08947c7f89607bb8f853ff9229f3f1cb8f28605d105c10e3172f40" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-xml" version="2.12.4">
+         <artifact name="jackson-dataformat-xml-2.12.4.jar">
+            <md5 value="d2b673a50c00821e79b44b870d5f1e00" origin="Generated by Gradle"/>
+            <sha256 value="4f9e98e3aaab049cfd67c410881031ccea2c2c289e8656499bc55187c80e5503" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml.jackson.module" name="jackson-module-jaxb-annotations" version="2.11.4">
          <artifact name="jackson-module-jaxb-annotations-2.11.4.jar">
             <md5 value="7721a76fc9750571ee1f90ec30d4ec42" origin="Generated by Gradle"/>
@@ -1300,6 +1324,12 @@
             <sha256 value="17db0ab19fbeaa8342495fa88c77dc5be74cc9c2b5dacadbc5c2a06f3a884ed7" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml.jackson.module" name="jackson-module-jaxb-annotations" version="2.12.4">
+         <artifact name="jackson-module-jaxb-annotations-2.12.4.jar">
+            <md5 value="29ff9647ec16c8e897b29c380b7e87d7" origin="Generated by Gradle"/>
+            <sha256 value="7a6063c76ba26f14f18b808ad50955f87fa20d2a5225a1d8dc5add63ce234f75" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml.jackson.module" name="jackson-module-kotlin" version="2.11.0">
          <artifact name="jackson-module-kotlin-2.11.0.jar">
             <md5 value="6a368bae5323ba5914b54f201a0c0612" origin="Generated by Gradle"/>
@@ -1320,6 +1350,12 @@
             <sha256 value="ef814f819a32acf518ed8e5c3324d9651d29a0fa3bc711da8f65c9b7429e5472" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml.jackson.module" name="jackson-module-kotlin" version="2.12.4">
+         <artifact name="jackson-module-kotlin-2.12.4.jar">
+            <md5 value="a29dfdb180d02de22d79b25c967a1e2b" origin="Generated by Gradle"/>
+            <sha256 value="73993e2bd00354a9dbcaef547f827cd8ab8a7ff0a1cbc3c5b72b585899fb6be4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml.jackson.module" name="jackson-modules-base" version="2.11.4">
          <artifact name="jackson-modules-base-2.11.4.pom">
             <md5 value="508438a84a3d8ef4ace3998f7ac12e29" origin="Generated by Gradle"/>
@@ -1336,6 +1372,12 @@
             <sha256 value="62f734a64b44254e1875d19f06b5a4ef644d649e807103e9d6b48353474aa80c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml.woodstox" name="woodstox-core" version="6.2.4">
+         <artifact name="woodstox-core-6.2.4.jar">
+            <md5 value="c72181f3fb82bda9aa724e6b0fed3395" origin="Generated by Gradle"/>
+            <sha256 value="5fa734d5050f097405a801022d09377bbc81e811ef9a17cd0279ed3279f495a5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.github.gundy" name="semver4j" version="0.16.4">
          <artifact name="semver4j-0.16.4-nodeps.jar">
             <md5 value="c52d66c488836f6ca5eb51a1bcd94684" origin="Generated by Gradle"/>
@@ -2457,6 +2499,18 @@
             <sha256 value="8851ead43e625511a99421015b5ed3185fae4c2af242779ca3d099a8b5cfd9ca" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.soywiz.korlibs.korte" name="korte-jvm" version="2.3.4">
+         <artifact name="korte-jvm-2.3.4.jar">
+            <md5 value="c7b40f0195936a4e094680e3e8b82985" origin="Generated by Gradle"/>
+            <sha256 value="a4b9f03af5851a644fec7e6c2f448399e3bcf8c18febec4971282fc496bbb01d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.soywiz.korlibs.korte" name="korte-jvm" version="2.4.6">
+         <artifact name="korte-jvm-2.4.6.jar">
+            <md5 value="2766b9621012e5be0d048c76106ca986" origin="Generated by Gradle"/>
+            <sha256 value="34ec6fe2da74a21b95ce70a660203c5379e382fed874f22bdc05736131812010" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.squareup" name="javapoet" version="1.10.0">
          <artifact name="javapoet-1.10.0.jar">
             <md5 value="58f542814fa3501790a57c212f20dafe" origin="Generated by Gradle"/>
@@ -6078,6 +6132,36 @@
             <sha256 value="9ccf0e520a7f39c8525d2990632f69b9df69c1601e629a934003766962c7bac2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains" name="markdown" version="0.2.4">
+         <artifact name="markdown-metadata-0.2.4.jar">
+            <md5 value="d815d271d9b5c9401f4f1a0fe086ba81" origin="Generated by Gradle"/>
+            <sha256 value="23955bb4bbc929f7a98d79eb63ae91ae430abf80123315310f7eb433cf7b90d4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains" name="markdown-jvm" version="0.2.4">
+         <artifact name="markdown-jvm-0.2.4.jar">
+            <md5 value="e041dee3d6e0f9d143d49677a6fd7a92" origin="Generated by Gradle"/>
+            <sha256 value="7892add3dfd58ce60876e81c458661639b8448992b42cf34fc96cbb4ad0d5967" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.dokka" name="dokka-analysis" version="1.6.10">
+         <artifact name="dokka-analysis-1.6.10.jar">
+            <md5 value="226ef17c8383d90d17aa40f0686ea715" origin="Generated by Gradle"/>
+            <sha256 value="ae55147eaf91a271509d3db9b60f8c0ebe66239eac34b157e90f68bc4f76baab" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.dokka" name="dokka-base" version="1.6.10">
+         <artifact name="dokka-base-1.6.10.jar">
+            <md5 value="4e10bc7e9516e5146da6e967e1e6ee19" origin="Generated by Gradle"/>
+            <sha256 value="e7947511d256a0225f7bdf6ef8192aca10a54f276ba097341ba39de229d2ce08" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.dokka" name="dokka-core" version="1.6.10">
+         <artifact name="dokka-core-1.6.10.jar">
+            <md5 value="18ab2c6525bf669351bc9b7acffdeb2a" origin="Generated by Gradle"/>
+            <sha256 value="3f01f1ad9c76265f0a2d48ba4b43af467bda0098a243ce95f94aa903e47dd3d1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.dokka" name="dokka-gradle-plugin" version="0.9.17">
          <artifact name="dokka-gradle-plugin-0.9.17.jar">
             <md5 value="242b446de98551dd77c8220ba0250974" origin="Generated by Gradle"/>
@@ -6088,6 +6172,48 @@
             <sha256 value="f41e2f85d75abe256ae3f522066ad40ff9b3dc90b0f6e455508a90ba78046871" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.dokka" name="dokka-gradle-plugin" version="1.6.10">
+         <artifact name="dokka-gradle-plugin-1.6.10.jar">
+            <md5 value="b65abaf22c95bf1890c4a5a4c8b205fa" origin="Generated by Gradle"/>
+            <sha256 value="2d3340712f91c35d58265ccf3cdcc2843460762fb8fb04dcfccc75885e5080c0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.dokka" name="gfm-plugin" version="1.6.10">
+         <artifact name="gfm-plugin-1.6.10.jar">
+            <md5 value="ddf85279ee58c83555027490b98a690d" origin="Generated by Gradle"/>
+            <sha256 value="e661f5a8ebd5fc32ee37150617f6d665e212cddb4aef0cd5a91f863e365563a8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.dokka" name="javadoc-plugin" version="1.6.10">
+         <artifact name="javadoc-plugin-1.6.10.jar">
+            <md5 value="8427abaacfa02af4db54c6d514856a24" origin="Generated by Gradle"/>
+            <sha256 value="ce86111356c4a07d085af9b8a72d3021ba01484388b3d7cd0c366a3c3df1b494" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.dokka" name="jekyll-plugin" version="1.6.10">
+         <artifact name="jekyll-plugin-1.6.10.jar">
+            <md5 value="59942a2ab067e1134a3e6d556b58d529" origin="Generated by Gradle"/>
+            <sha256 value="f7543117433735684186a045f23bc42c25e1829863694433e454360e85773b53" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.dokka" name="kotlin-analysis-compiler" version="1.6.10">
+         <artifact name="kotlin-analysis-compiler-1.6.10.jar">
+            <md5 value="4b1eca0f6e108d8b9647f76f4b4cbc7d" origin="Generated by Gradle"/>
+            <sha256 value="f268c465ac0caaefe1bf6490652b35513ebc69cd7d3b980e8df2c2983086708b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.dokka" name="kotlin-analysis-intellij" version="1.6.10">
+         <artifact name="kotlin-analysis-intellij-1.6.10.jar">
+            <md5 value="9e9c59cf4fbcb831c4501f333e72a862" origin="Generated by Gradle"/>
+            <sha256 value="1d204ade01e60d4dddf960012e1a11ebb17f7137396e1d542afb6ffa94bbaae7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.dokka" name="kotlin-as-java-plugin" version="1.6.10">
+         <artifact name="kotlin-as-java-plugin-1.6.10.jar">
+            <md5 value="96f143ac0612a8c11d40c89ff3b45afd" origin="Generated by Gradle"/>
+            <sha256 value="e0ff74f90811a25d6a998ac3623f0e6e0587ff752a0df995eb4c80ec19dc980f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.dukat" name="dukat" version="0.5.8-rc.4">
          <artifact name="dukat-0.5.8-rc.4.jar">
             <md5 value="90d7dddcdc45b7cf2f81ce4ccc625472" origin="Generated by Gradle"/>
@@ -6668,6 +6794,12 @@
             <sha256 value="78d6cc7135f84d692ff3752fcfd1fa1bbe0940d7df70652e4f1eaeec0c78afbb" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core-jvm" version="1.5.1">
+         <artifact name="kotlinx-coroutines-core-jvm-1.5.1.jar">
+            <md5 value="e1b6c24073e7ccf410249a8a534ca5ad" origin="Generated by Gradle"/>
+            <sha256 value="3ff82734ea5e9ba9ffd675c6abcc22a69f924be2486ecd79c280403fd4922e22" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core-metadata" version="1.3.8-native-mt-1.4.0-rc">
          <artifact name="kotlinx-coroutines-core-metadata-1.3.8-native-mt-1.4.0-rc-all.jar">
             <md5 value="f3a7316b16f20ad0440625e9fb301c34" origin="Generated by Gradle"/>
@@ -6782,6 +6914,12 @@
             <sha256 value="c13d68085ac43f39014cfebdd3903724df9f6a60ac7476b8e94ce7c28a6d8fd4" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-html-jvm" version="0.7.3">
+         <artifact name="kotlinx-html-jvm-0.7.3.jar">
+            <md5 value="f85c60cd33c99f793603a6d5a8890ba5" origin="Generated by Gradle"/>
+            <sha256 value="0a8ece5101253c3be2c3b851fe1da755f1e065b3ef254c7901bc973a7c1b7604" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-io" version="0.1.1">
          <artifact name="kotlinx-io-0.1.1.jar">
             <md5 value="b6c59897724991664fc33a9113432602" origin="Generated by Gradle"/>
@@ -7176,6 +7314,12 @@
             <sha256 value="4f961f68e47740dd7576c9685774a7b25b92f1017af24e2f707b30e893abade3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jsoup" name="jsoup" version="1.13.1">
+         <artifact name="jsoup-1.13.1.jar">
+            <md5 value="5ee148bf2db7c6d81edb7904e970e9db" origin="Generated by Gradle"/>
+            <sha256 value="e2b99c0d2fa39f69f27efb1c0016390713feb2f2e02d8ea7f1c36b780271598a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jsoup" name="jsoup" version="1.14.2">
          <artifact name="jsoup-1.14.2.jar">
             <md5 value="fbec0de500bd3b622b178706a3e0a35c" origin="Generated by Gradle"/>
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<DokkaTask>("dokka") {
-        outputFormat = "markdown"
-        includes = listOf("$projectDir/Module.md")
+    withType<DokkaTask>().configureEach {
+        dokkaSourceSets.configureEach {
+            includes.from("Module.md")
+        }
+    }
+    register("dokka") {
+        dependsOn(named("dokkaJavadoc"))
     }
 }