From f285a31a5a1c3491b198ebd536275d792c62b024 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Fri, 5 Jun 2020 18:22:57 +0300 Subject: [PATCH] [Gradle, JS] Make default generate kotlin externals as false --- .../kotlin/org/jetbrains/kotlin/gradle/plugin/NpmConstants.kt | 2 +- .../org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt | 4 ++-- .../gradle/plugin/mpp/DefaultKotlinDependencyHandler.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/NpmConstants.kt b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/NpmConstants.kt index 1a9fb97f25f..dc87f450f16 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/NpmConstants.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/NpmConstants.kt @@ -5,4 +5,4 @@ package org.jetbrains.kotlin.gradle.plugin -const val DEFAULT_GENERATE_KOTLIN_EXTERNALS = true \ No newline at end of file +const val DEFAULT_GENERATE_KOTLIN_EXTERNALS = false \ No newline at end of file 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 8c31199eb65..29a277ba477 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 @@ -191,8 +191,8 @@ internal class PropertiesProvider private constructor(private val project: Proje /** * Generate kotlin/js external declarations from all .d.ts files found in npm modules */ - val jsGenerateExternals: Boolean? - get() = booleanProperty("kotlin.js.experimental.generateKotlinExternals") + val jsGenerateExternals: Boolean + get() = booleanProperty("kotlin.js.generate.externals") ?: DEFAULT_GENERATE_KOTLIN_EXTERNALS /** * Automaticaly discover external .d.ts declarations diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/DefaultKotlinDependencyHandler.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/DefaultKotlinDependencyHandler.kt index efc9957b160..69dc63d0ecc 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/DefaultKotlinDependencyHandler.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/DefaultKotlinDependencyHandler.kt @@ -249,7 +249,7 @@ class DefaultKotlinDependencyHandler( scope = NpmDependency.Scope.PEER ) - private fun defaultGenerateExternals() = + private fun defaultGenerateExternals(): Boolean = PropertiesProvider(project).jsGenerateExternals private fun directoryNpmDependency(