diff options
| author | Vadim Mishenev <vad-mishenev@yandex.ru> | 2022-02-21 23:06:59 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-21 23:06:59 +0300 |
| commit | c44bf5487bd32f90a4576859548f1db0e9355a07 (patch) | |
| tree | 2954c68d9247007ecc255d397fb207b1cb2d1be1 /integration-tests/gradle/projects | |
| parent | f54597c754c9be6afb4ea374dc959dcc9fd551ce (diff) | |
| download | dokka-c44bf5487bd32f90a4576859548f1db0e9355a07.tar.gz dokka-c44bf5487bd32f90a4576859548f1db0e9355a07.tar.bz2 dokka-c44bf5487bd32f90a4576859548f1db0e9355a07.zip | |
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
Diffstat (limited to 'integration-tests/gradle/projects')
| -rw-r--r-- | integration-tests/gradle/projects/stdlib/stdlib.diff | 18 |
1 files changed, 17 insertions, 1 deletions
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") ++ } + } + + |