From c44bf5487bd32f90a4576859548f1db0e9355a07 Mon Sep 17 00:00:00 2001
From: Vadim Mishenev <vad-mishenev@yandex.ru>
Date: Mon, 21 Feb 2022 23:06:59 +0300
Subject: Add option to merge implicit expect-actual declarations (#2316)

* Add option to merge implicit expect-actual declarations

* Merge entries, constructors

* Fix StdLib integration test

* Add doc
---
 integration-tests/gradle/projects/stdlib/stdlib.diff   | 18 +++++++++++++++++-
 .../it/gradle/kotlin/StdlibGradleIntegrationTest.kt    |  4 ++--
 2 files changed, 19 insertions(+), 3 deletions(-)

(limited to 'integration-tests/gradle')

diff --git a/integration-tests/gradle/projects/stdlib/stdlib.diff b/integration-tests/gradle/projects/stdlib/stdlib.diff
index 71d27c99..20404297 100644
--- a/integration-tests/gradle/projects/stdlib/stdlib.diff
+++ b/integration-tests/gradle/projects/stdlib/stdlib.diff
@@ -37,7 +37,7 @@ diff --git a/build.gradle b/build.gradle
 index aa8f21b..dd6a2ae 100644
 --- a/build.gradle
 +++ b/build.gradle
-@@ -1,80 +1,428 @@
+@@ -1,80 +1,444 @@
 +import org.jetbrains.dokka.Platform
 +
  plugins {
@@ -163,6 +163,7 @@ index aa8f21b..dd6a2ae 100644
 +    task dokkaStdlib(type: org.jetbrains.dokka.gradle.DokkaTask) {
 +        outputDirectory.set(new File(outputDir, "/kotlin-stdlib"))
 +        moduleName.set("kotlin-stdlib")
++        pluginsMapConfiguration.set(["org.jetbrains.dokka.base.DokkaBase": """{ "mergeImplicitExpectActualDeclarations": "true" }"""])
 +        dokkaSourceSets {
 +            register("kotlin-stdlib-common") {
 +                skipDeprecated.set(false)
@@ -179,6 +180,16 @@ index aa8f21b..dd6a2ae 100644
 +                sourceRoots.from("$kotlin_root/core/builtins/native")
 +                sourceRoots.from("$kotlin_root/core/builtins/src")
 +                sourceRoots.from("$kotlin_sources/kotlin-stdlib-common")
++                sourceLink {
++                    localDirectory.set(file("$kotlin_sources/kotlin-stdlib-common"))
++                    remoteUrl.set(new URL("https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib/common/src"))
++                    remoteLineSuffix.set("#L")
++                }
++                sourceLink {
++                    localDirectory.set(file("$kotlin_root/core/builtins/src"))
++                    remoteUrl.set(new URL("https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib/src"))
++                    remoteLineSuffix.set("#L")
++                }
 +            }
 +
 +            register("kotlin-stdlib-java-common") {
@@ -220,6 +231,11 @@ index aa8f21b..dd6a2ae 100644
 +                    matchingRegex.set("kotlin.coroutines.experimental.migration(\$|\\.).*")
 +                    suppress.set(true)
 +                }
++               sourceLink {
++                   localDirectory.set(file("$kotlin_sources/kotlin-stdlib"))
++                   remoteUrl.set(new URL("https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib/jvm/src"))
++                   remoteLineSuffix.set("#L")
++               }
 +            }
 +
 +
diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/StdlibGradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/StdlibGradleIntegrationTest.kt
index a5b61b1d..ba51a1ce 100644
--- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/StdlibGradleIntegrationTest.kt
+++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/StdlibGradleIntegrationTest.kt
@@ -52,8 +52,8 @@ class StdlibGradleIntegrationTest(override val versions: BuildVersions) : Abstra
 
         projectOutputLocation.allHtmlFiles().forEach { file ->
             assertContainsNoErrorClass(file)
-//            assertNoUnresolvedLinks(file)
-//            assertNoHrefToMissingLocalFileOrDirectory(file)
+            assertNoUnresolvedLinks(file)
+            assertNoHrefToMissingLocalFileOrDirectory(file)
             assertNoEmptyLinks(file)
             assertNoEmptySpans(file)
             assertNoUnsubstitutedTemplatesInHtml(file)
-- 
cgit