From a758e0bae702511453006e7333a1f0c6818ff304 Mon Sep 17 00:00:00 2001 From: vmishenev Date: Wed, 11 Jan 2023 03:18:24 +0200 Subject: [PATCH] Disable `ignoreCommonBuiltIns` in kotlin.test --- libraries/tools/kotlin-stdlib-docs/build.gradle | 12 +++++++----- .../dokka/kotlinlang/StdLibAnalysisConfiguration.kt | 5 +++++ .../dokka/kotlinlang/StdLibConfigurationPlugin.kt | 4 +++- 3 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 libraries/tools/kotlin-stdlib-docs/plugins/dokka-stdlib-configuration-plugin/src/main/kotlin/org/jetbrains/dokka/kotlinlang/StdLibAnalysisConfiguration.kt diff --git a/libraries/tools/kotlin-stdlib-docs/build.gradle b/libraries/tools/kotlin-stdlib-docs/build.gradle index f9f55aa4124..11bfd0f583d 100644 --- a/libraries/tools/kotlin-stdlib-docs/build.gradle +++ b/libraries/tools/kotlin-stdlib-docs/build.gradle @@ -79,13 +79,15 @@ TaskProvider createStdLibVersionedDocTask(String version, Boolean isL moduleName.set("stdlib") if (isLatest) { outputDirectory.set(new File(outputDir, "/kotlin-stdlib/latest")) - pluginsMapConfiguration.set(["org.jetbrains.dokka.base.DokkaBase" : """{ "mergeImplicitExpectActualDeclarations": "true", "templatesDir": "$templatesDir" }""", - "org.jetbrains.dokka.versioning.VersioningPlugin": """{ "version": "$version", "olderVersionsDir": "${outputDir.toString().replace('\\', '/')}//kotlin-stdlib/old" }"""]) + pluginsMapConfiguration.set(["org.jetbrains.dokka.base.DokkaBase" : """{ "mergeImplicitExpectActualDeclarations": "true", "templatesDir": "$templatesDir" }""", + "org.jetbrains.dokka.kotlinlang.StdLibConfigurationPlugin": """{ "ignoreCommonBuiltIns": "true" }""", + "org.jetbrains.dokka.versioning.VersioningPlugin" : """{ "version": "$version", "olderVersionsDir": "${outputDir.toString().replace('\\', '/')}//kotlin-stdlib/old" }"""]) } else { outputDirectory.set(new File(outputDir, "/kotlin-stdlib/old/" + version)) - pluginsMapConfiguration.set(["org.jetbrains.dokka.base.DokkaBase" : """{ "mergeImplicitExpectActualDeclarations": "true", "templatesDir": "$templatesDir" }""", - "org.jetbrains.dokka.kotlinlang.VersionFilterPlugin": """{ "targetVersion": "$version" }""", - "org.jetbrains.dokka.versioning.VersioningPlugin" : """{ "version": "$version" }"""]) + pluginsMapConfiguration.set(["org.jetbrains.dokka.base.DokkaBase" : """{ "mergeImplicitExpectActualDeclarations": "true", "templatesDir": "$templatesDir" }""", + "org.jetbrains.dokka.kotlinlang.StdLibConfigurationPlugin": """{ "ignoreCommonBuiltIns": "true" }""", + "org.jetbrains.dokka.kotlinlang.VersionFilterPlugin" : """{ "targetVersion": "$version" }""", + "org.jetbrains.dokka.versioning.VersioningPlugin" : """{ "version": "$version" }"""]) } dokkaSourceSets { if (version != "1.0" && version != "1.1") { // Common platform since Kotlin 1.2 diff --git a/libraries/tools/kotlin-stdlib-docs/plugins/dokka-stdlib-configuration-plugin/src/main/kotlin/org/jetbrains/dokka/kotlinlang/StdLibAnalysisConfiguration.kt b/libraries/tools/kotlin-stdlib-docs/plugins/dokka-stdlib-configuration-plugin/src/main/kotlin/org/jetbrains/dokka/kotlinlang/StdLibAnalysisConfiguration.kt new file mode 100644 index 00000000000..6ac0244cfc5 --- /dev/null +++ b/libraries/tools/kotlin-stdlib-docs/plugins/dokka-stdlib-configuration-plugin/src/main/kotlin/org/jetbrains/dokka/kotlinlang/StdLibAnalysisConfiguration.kt @@ -0,0 +1,5 @@ +package org.jetbrains.dokka.kotlinlang + +import org.jetbrains.dokka.plugability.ConfigurableBlock + +data class StdLibAnalysisConfiguration(val ignoreCommonBuiltIns: Boolean) : ConfigurableBlock \ No newline at end of file diff --git a/libraries/tools/kotlin-stdlib-docs/plugins/dokka-stdlib-configuration-plugin/src/main/kotlin/org/jetbrains/dokka/kotlinlang/StdLibConfigurationPlugin.kt b/libraries/tools/kotlin-stdlib-docs/plugins/dokka-stdlib-configuration-plugin/src/main/kotlin/org/jetbrains/dokka/kotlinlang/StdLibConfigurationPlugin.kt index f68b0a07c55..7ac2c5fbcf2 100644 --- a/libraries/tools/kotlin-stdlib-docs/plugins/dokka-stdlib-configuration-plugin/src/main/kotlin/org/jetbrains/dokka/kotlinlang/StdLibConfigurationPlugin.kt +++ b/libraries/tools/kotlin-stdlib-docs/plugins/dokka-stdlib-configuration-plugin/src/main/kotlin/org/jetbrains/dokka/kotlinlang/StdLibConfigurationPlugin.kt @@ -4,6 +4,7 @@ import org.jetbrains.dokka.base.DokkaBase import org.jetbrains.dokka.plugability.DokkaPlugin import org.jetbrains.dokka.analysis.DokkaAnalysisConfiguration import org.jetbrains.dokka.analysis.KotlinAnalysis +import org.jetbrains.dokka.plugability.configuration class StdLibConfigurationPlugin : DokkaPlugin() { private val dokkaBase by lazy { plugin() } @@ -11,10 +12,11 @@ class StdLibConfigurationPlugin : DokkaPlugin() { @Suppress("unused") val stdLibKotlinAnalysis by extending { dokkaBase.kotlinAnalysis providing { ctx -> + val ignoreCommonBuiltIns = configuration(ctx)?.ignoreCommonBuiltIns ?: false KotlinAnalysis( sourceSets = ctx.configuration.sourceSets, logger = ctx.logger, - analysisConfiguration = DokkaAnalysisConfiguration(ignoreCommonBuiltIns = true) + analysisConfiguration = DokkaAnalysisConfiguration(ignoreCommonBuiltIns = ignoreCommonBuiltIns) ) } override dokkaBase.defaultKotlinAnalysis }