From 35c681685b6300ffee3d954c0f33280281497864 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Fri, 24 Jan 2020 18:56:05 +0300 Subject: [PATCH] [Gradle, JS] Set only one attribute for ir target - Because if new library version can be consumed from old plugin, which doesn't know about new attribute We don't add attribute for legacy variant, and Gradle find necessary variant with less attribute count --- .../kotlin/gradle/plugin/KotlinTargetConfigurator.kt | 5 ----- .../org/jetbrains/kotlin/gradle/targets/js/KotlinJsTarget.kt | 1 - 2 files changed, 6 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt index d24c599e32f..51d7b067317 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt @@ -30,7 +30,6 @@ import org.jetbrains.kotlin.gradle.dsl.kotlinExtension import org.jetbrains.kotlin.gradle.plugin.mpp.* import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget.Companion.IR -import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget.Companion.LEGACY import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName import java.util.concurrent.Callable @@ -449,10 +448,6 @@ internal fun Project.usageByName(usageName: String): Usage = fun Configuration.usesPlatformOf(target: KotlinTarget): Configuration { attributes.attribute(KotlinPlatformType.attribute, target.platformType) - if (target is KotlinJsTarget) { - attributes.attribute(KotlinJsTarget.jsModeAttribute, LEGACY) - } - if (target is KotlinJsIrTarget) { attributes.attribute(KotlinJsTarget.jsModeAttribute, IR) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTarget.kt index 2f4b2643882..8509959db6c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTarget.kt @@ -155,7 +155,6 @@ constructor( String::class.java ) - const val LEGACY = "legacy" const val IR = "ir" fun setupAttributesMatchingStrategy(attributesSchema: AttributesSchema) {