From 61b5a738dabc5ef077da7f4ea7835258df2a26a1 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 20 Jul 2020 14:51:14 +0300 Subject: [PATCH] [Gradle, JS] Rename flag for legacy ^KT-40320 fixed --- .../org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt | 4 ++-- .../org/jetbrains/kotlin/gradle/targets/js/KotlinJsTarget.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt index f77e147c176..d4db594aa65 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt @@ -205,8 +205,8 @@ internal class PropertiesProvider private constructor(private val project: Proje /** * Use Kotlin/JS backend compiler type */ - val jsLegacyExecutableExplicitly: Boolean - get() = booleanProperty("kotlin.js.legacy.executable.explicitly") ?: false + val jsGenerateExecutableDefault: Boolean + get() = booleanProperty("kotlin.js.generate.executable.default") ?: true val stdlibDefaultDependency: Boolean get() = booleanProperty("kotlin.stdlib.default.dependency") ?: true 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 5006f1a105f..a5db306939a 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 @@ -136,7 +136,7 @@ constructor( project.objects.newInstance(KotlinBrowserJs::class.java, this).also { it.configure() - if (!PropertiesProvider(project).jsLegacyExecutableExplicitly) { + if (PropertiesProvider(project).jsGenerateExecutableDefault) { binaries.executable() } @@ -163,7 +163,7 @@ constructor( project.objects.newInstance(KotlinNodeJs::class.java, this).also { it.configure() - if (!PropertiesProvider(project).jsLegacyExecutableExplicitly) { + if (PropertiesProvider(project).jsGenerateExecutableDefault) { binaries.executable() }