From 69cb722ff415494fe89ddad42e8d51a5d7301a74 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Wed, 16 Aug 2023 04:54:48 +0200 Subject: [PATCH] Add js compiler disambiguation attribute to fix docs build --- .../kotlin-stdlib-docs-legacy/kotlin_big/build.gradle | 7 +++++-- .../tools/kotlin-stdlib-docs/kotlin_big/build.gradle.kts | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-stdlib-docs-legacy/kotlin_big/build.gradle b/libraries/tools/kotlin-stdlib-docs-legacy/kotlin_big/build.gradle index 48546832e75..4397c2d5b29 100644 --- a/libraries/tools/kotlin-stdlib-docs-legacy/kotlin_big/build.gradle +++ b/libraries/tools/kotlin-stdlib-docs-legacy/kotlin_big/build.gradle @@ -52,8 +52,11 @@ modules.forEach { module -> final Configuration lib_src = configurations.create(lib) - if (module == "kotlin-test-js") { - lib_src.attributes {attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage, "kotlin-runtime")) } + if (module == "kotlin-test-js" || module == "kotlin-stdlib-js") { + lib_src.attributes { + attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage, "kotlin-runtime")) + attribute(Attribute.of("org.jetbrains.kotlin.js.compiler", String), "ir") + } } dependencies { diff --git a/libraries/tools/kotlin-stdlib-docs/kotlin_big/build.gradle.kts b/libraries/tools/kotlin-stdlib-docs/kotlin_big/build.gradle.kts index 767fe76977e..05b213c5162 100644 --- a/libraries/tools/kotlin-stdlib-docs/kotlin_big/build.gradle.kts +++ b/libraries/tools/kotlin-stdlib-docs/kotlin_big/build.gradle.kts @@ -34,8 +34,11 @@ modules.forEach { module -> val library = configurations.create("kotlin_lib_$module") - if (module == "kotlin-test-js") { - library.attributes { attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage::class, "kotlin-runtime")) } + if (module == "kotlin-test-js" || module == "kotlin-stdlib-js") { + library.attributes { + attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage::class, "kotlin-runtime")) + attribute(Attribute.of("org.jetbrains.kotlin.js.compiler", String::class.java), "ir") + } } dependencies {