From 351e9c75928310c0f64b8ee95b563a42cf004c77 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Thu, 6 Jul 2023 09:51:54 +0200
Subject: [PATCH] [repo] Update Dokka to 1.8.20 version

This release also fixes some problems with KGP-api documentation
publication.
---
 buildSrc/build.gradle.kts                |  2 +-
 buildSrc/src/main/kotlin/GradleCommon.kt |  2 +-
 gradle/verification-metadata.xml         | 82 +++++++++++++++++++++++-
 3 files changed, 82 insertions(+), 4 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 48e47f315c2..572d800686a 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -98,7 +98,7 @@ dependencies {
     implementation(kotlin("stdlib", embeddedKotlinVersion))
     implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${kotlinBuildProperties.buildGradlePluginVersion}")
     implementation("com.gradle.publish:plugin-publish-plugin:1.0.0")
-    implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.8.10")
+    implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.8.20")
 
     implementation("org.spdx:spdx-gradle-plugin:0.1.0-dev-7")
 
diff --git a/buildSrc/src/main/kotlin/GradleCommon.kt b/buildSrc/src/main/kotlin/GradleCommon.kt
index eb88afb541f..2a388aef713 100644
--- a/buildSrc/src/main/kotlin/GradleCommon.kt
+++ b/buildSrc/src/main/kotlin/GradleCommon.kt
@@ -698,7 +698,7 @@ fun Project.configureDokkaPublication(
 
             project.dependencies {
                 // Version is required due to https://github.com/Kotlin/dokka/issues/2812
-                "dokkaPlugin"("org.jetbrains.dokka:versioning-plugin:$dokkaVersioningPluginVersion")
+                "dokkaHtmlPlugin"("org.jetbrains.dokka:versioning-plugin:$dokkaVersioningPluginVersion")
             }
 
             tasks.register<DokkaTask>("dokkaKotlinlangDocumentation") {
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 7e471b22224..0f1050fa240 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -53,16 +53,16 @@
          <trust group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.9.2?[0-9](-.+)?" regex="true"/>
          <trust group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.9.2?[0-9](-.+)?" regex="true"/>
          <trust group="org.jetbrains.kotlin" name="kotlin-stdlib-js" version="1.9.2?[0-9](-.+)?" regex="true"/>
-         <trust group="org.jetbrains.kotlin" name="kotlin-stdlib-wasm" version="1.9.2?[0-9](-.+)?" regex="true"/>
          <trust group="org.jetbrains.kotlin" name="kotlin-stdlib-jvm-minimal-for-test" version="1.9.2?[0-9](-.+)?" regex="true"/>
+         <trust group="org.jetbrains.kotlin" name="kotlin-stdlib-wasm" version="1.9.2?[0-9](-.+)?" regex="true"/>
          <trust group="org.jetbrains.kotlin" name="kotlin-test" version="1.9.2?[0-9](-.+)?" regex="true"/>
          <trust group="org.jetbrains.kotlin" name="kotlin-test-annotations-common" version="1.9.2?[0-9](-.+)?" regex="true"/>
          <trust group="org.jetbrains.kotlin" name="kotlin-test-common" version="1.9.2?[0-9](-.+)?" regex="true"/>
          <trust group="org.jetbrains.kotlin" name="kotlin-test-js" version="1.9.2?[0-9](-.+)?" regex="true"/>
-         <trust group="org.jetbrains.kotlin" name="kotlin-test-wasm" version="1.9.2?[0-9](-.+)?" regex="true"/>
          <trust group="org.jetbrains.kotlin" name="kotlin-test-js-runner" version="1.9.2?[0-9](-.+)?" regex="true"/>
          <trust group="org.jetbrains.kotlin" name="kotlin-test-junit" version="1.9.2?[0-9](-.+)?" regex="true"/>
          <trust group="org.jetbrains.kotlin" name="kotlin-test-junit5" version="1.9.2?[0-9](-.+)?" regex="true"/>
+         <trust group="org.jetbrains.kotlin" name="kotlin-test-wasm" version="1.9.2?[0-9](-.+)?" regex="true"/>
          <trust group="org.jetbrains.kotlin" name="kotlin-tooling-core" version="1.9.2?[0-9](-.+)?" regex="true"/>
          <trust group="org.jetbrains.kotlin" name="kotlin-tooling-metadata" version="1.9.2?[0-9](-.+)?" regex="true"/>
          <trust group="org.jetbrains.kotlin" name="kotlin-util-io" version="1.9.2?[0-9](-.+)?" regex="true"/>
@@ -7359,12 +7359,24 @@
             <sha256 value="cbdd6ac53d808150a38125045856ba04a5ca45cd4f326a6020c32953456ce914" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.dokka" name="dokka-analysis" version="1.8.20">
+         <artifact name="dokka-analysis-1.8.20.jar">
+            <md5 value="f938e63dcfae367735f617ad75925541" origin="Generated by Gradle"/>
+            <sha256 value="e3b653cf8f327ac5f524d8a35c77aa18fd687be3458bc08d2db884b188ca3764" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.dokka" name="dokka-base" version="1.8.10">
          <artifact name="dokka-base-1.8.10.jar">
             <md5 value="1d3c292eaf0b1b445b2a16d675ea8a9c" origin="Generated by Gradle"/>
             <sha256 value="1040675f9850667805900aa4238bf341511baa2760e5632527493d23dd41b827" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.dokka" name="dokka-base" version="1.8.20">
+         <artifact name="dokka-base-1.8.20.jar">
+            <md5 value="6a47829508b62c63f2a66bfef76017fa" origin="Generated by Gradle"/>
+            <sha256 value="804b69f7e1cde512bea1c50898001db24f6e6901c64cac509e548a3c16d67d38" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.dokka" name="dokka-core" version="1.4.32">
          <artifact name="dokka-core-1.4.32.jar">
             <md5 value="423080130bf82e51ba29c0d13814adb0" origin="Generated by Gradle"/>
@@ -7377,48 +7389,96 @@
             <sha256 value="ad13600df2ed5f9e26bb1d4fe679fc0db1f45880d181fc1be630e11320529654" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.dokka" name="dokka-core" version="1.8.20">
+         <artifact name="dokka-core-1.8.20.jar">
+            <md5 value="c343d0ec1e8376185783cc710187d2bc" origin="Generated by Gradle"/>
+            <sha256 value="6e87b525a9dbb0144f63c1582c31ee9b220b2d90bb4330398c6e92b1a86ce9bb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.dokka" name="dokka-gradle-plugin" version="1.8.10">
          <artifact name="dokka-gradle-plugin-1.8.10.jar">
             <md5 value="3fb81036621b0f0793234ddc7de8f1e6" origin="Generated by Gradle"/>
             <sha256 value="fbe8cbfd671a350b03f977794ad3a909662bba118d0d26f15572cd6e80faa167" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.dokka" name="dokka-gradle-plugin" version="1.8.20">
+         <artifact name="dokka-gradle-plugin-1.8.20.jar">
+            <md5 value="5a40a79e2a53213e99633f09f32bb88a" origin="Generated by Gradle"/>
+            <sha256 value="b2712e5b405c555c4ff6a9ec0f72ac0dc8d13982dd5b7ecc9a2bec78dd418f25" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.dokka" name="gfm-plugin" version="1.8.10">
          <artifact name="gfm-plugin-1.8.10.jar">
             <md5 value="82f81e5b40c412abc35ba1a091f0fb54" origin="Generated by Gradle"/>
             <sha256 value="69c92f7d1db9cbe19dc300b9a85e7bf77e2fc6d6344f737bcc72cf04189e1a5f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.dokka" name="gfm-plugin" version="1.8.20">
+         <artifact name="gfm-plugin-1.8.20.jar">
+            <md5 value="7b69bb25e5c97cb2ff635787fe04cf6e" origin="Generated by Gradle"/>
+            <sha256 value="c756500f8ff88b09369d3a0dd93edde3de3e604ace5a8883be3d1af94fbdf678" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.dokka" name="javadoc-plugin" version="1.8.10">
          <artifact name="javadoc-plugin-1.8.10.jar">
             <md5 value="680166100b13f96e8f5883993dc244c1" origin="Generated by Gradle"/>
             <sha256 value="0c290796708c02d0fb8497fde558971dc1568309be1a5d0e9594ff9d3927bbda" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.dokka" name="javadoc-plugin" version="1.8.20">
+         <artifact name="javadoc-plugin-1.8.20.jar">
+            <md5 value="38958dbda985165be75bb9c657d0bfc8" origin="Generated by Gradle"/>
+            <sha256 value="8c0e2313a31082284f2b6158a6fdf8f2324b847bd45659641076c328a2cecf1a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.dokka" name="jekyll-plugin" version="1.8.10">
          <artifact name="jekyll-plugin-1.8.10.jar">
             <md5 value="6d7dacef7a65152a7c559e6e8d3a06fe" origin="Generated by Gradle"/>
             <sha256 value="4f3b666dd84b83e6b830a497ec0ceff78c8a2087d306dd75315f79872863b781" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.dokka" name="jekyll-plugin" version="1.8.20">
+         <artifact name="jekyll-plugin-1.8.20.jar">
+            <md5 value="d960afe813dca409fbb283792321ca34" origin="Generated by Gradle"/>
+            <sha256 value="e77eb0ee21fd871b7460addd620920da853c125319905107500809c0e544c007" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.dokka" name="kotlin-analysis-compiler" version="1.8.10">
          <artifact name="kotlin-analysis-compiler-1.8.10.jar">
             <md5 value="44a44903e750e59448d75e93b5b76d2f" origin="Generated by Gradle"/>
             <sha256 value="8170906ef923981d34486c0ef149245988c9477fbde1d77603e2f1629d664b69" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.dokka" name="kotlin-analysis-compiler" version="1.8.20">
+         <artifact name="kotlin-analysis-compiler-1.8.20.jar">
+            <md5 value="a1c38809c87293898db7984c359fb824" origin="Generated by Gradle"/>
+            <sha256 value="fab55a53e5fbd5211a9965403ad96b3df449badf57700ceddb1cfaad27d448bb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.dokka" name="kotlin-analysis-intellij" version="1.8.10">
          <artifact name="kotlin-analysis-intellij-1.8.10.jar">
             <md5 value="d4a699e25f12f0f765ee06d9e3b02e4e" origin="Generated by Gradle"/>
             <sha256 value="0f7e9fafc4ed5925d00239e96d7d471c67c7397ae783b1c4a78be62811369463" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.dokka" name="kotlin-analysis-intellij" version="1.8.20">
+         <artifact name="kotlin-analysis-intellij-1.8.20.jar">
+            <md5 value="eb01167055761dafe0cc45b1c2021978" origin="Generated by Gradle"/>
+            <sha256 value="26c90e9ee433b5fa90c5f73024f822ec4bc5842321b45e253748da22024ec28c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.dokka" name="kotlin-as-java-plugin" version="1.8.10">
          <artifact name="kotlin-as-java-plugin-1.8.10.jar">
             <md5 value="2fb069da8e04076f336421d892957cc2" origin="Generated by Gradle"/>
             <sha256 value="9c566b08c1caaf918708400d419878823547723d4e4a8035f439857f3a8d9dd6" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.dokka" name="kotlin-as-java-plugin" version="1.8.20">
+         <artifact name="kotlin-as-java-plugin-1.8.20.jar">
+            <md5 value="b4452afa73327b08f0e301c8ec762263" origin="Generated by Gradle"/>
+            <sha256 value="37df0f5f2602beef69e1d92f2a919ed44628244370e4df04216f4a0b6a341200" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.dokka" name="templating-plugin" version="1.8.10">
          <artifact name="templating-plugin-1.8.10.jar">
             <md5 value="ea6bfa4940c49ce1b7ec4d64ec2b3273" origin="Generated by Gradle"/>
@@ -7721,6 +7781,12 @@
             <sha256 value="99672410459045090d062a0194ed87008e2371f06946b6bfa7287c697f924bea" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-reflect" version="1.8.20">
+         <artifact name="kotlin-reflect-1.8.20.jar">
+            <md5 value="83da750e2159ed3369e5c0d3661146b7" origin="Generated by Gradle"/>
+            <sha256 value="531e3c3f9b0c45f9a21f1642174453066a1066bec0190254a6331b331814ab8b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-scripting-common" version="1.5.31">
          <artifact name="kotlin-scripting-common-1.5.31.jar">
             <md5 value="cd8df1fb849e6b366bd82ce67e21e037" origin="Generated by Gradle"/>
@@ -8093,6 +8159,12 @@
             <sha256 value="a843aae0b7232448afc6af05747cd4de416b9c2b76e100a1b07b1f788337b2ed" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.8.20">
+         <artifact name="kotlin-stdlib-jdk7-1.8.20.jar">
+            <md5 value="da3588af3bb0c9122dbae3d733dddf53" origin="Generated by Gradle"/>
+            <sha256 value="af1ec40c3b951afdcc0c2a0173c7b81763c5281c2d5bafbf0a8544a24c5dcc0c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.3.31">
          <artifact name="kotlin-stdlib-jdk8-1.3.31.jar">
             <md5 value="d7eea5e4d8892d4b99dd99d1529a1978" origin="Generated by Gradle"/>
@@ -8175,6 +8247,12 @@
             <sha256 value="9622f67cbe41e88ad257c1b8018054dd021a6044162474a78b1becd44f15a169" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.8.20">
+         <artifact name="kotlin-stdlib-jdk8-1.8.20.jar">
+            <md5 value="2097cb28602f5a6320bcc1bd74914db9" origin="Generated by Gradle"/>
+            <sha256 value="e398b67977622718bf18ff99b739c7d9da060f33fb458a2e25203221c16af010" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-tooling-core" version="1.8.20-dev-4242">
          <artifact name="kotlin-tooling-core-1.8.20-dev-4242.jar">
             <md5 value="3762be9ba7cdfc5e9e63dee28bab3515" origin="Generated by Gradle"/>