azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle, JS] Make default generate kotlin externals as false

Browse Source
This commit is contained in:
Ilya Goncharov
2020-06-05 18:22:57 +03:00
parent 2ca0e37be7
commit f285a31a5a
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/NpmConstants.kt
+1 -1
View File
@@ -5,4 +5,4 @@
package org.jetbrains.kotlin.gradle.plugin package org.jetbrains.kotlin.gradle.plugin
const val DEFAULT_GENERATE_KOTLIN_EXTERNALS = true const val DEFAULT_GENERATE_KOTLIN_EXTERNALS = false
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt
+2 -2
View File
@@ -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 * Generate kotlin/js external declarations from all .d.ts files found in npm modules
*/ */
val jsGenerateExternals: Boolean? val jsGenerateExternals: Boolean
get() = booleanProperty("kotlin.js.experimental.generateKotlinExternals") get() = booleanProperty("kotlin.js.generate.externals") ?: DEFAULT_GENERATE_KOTLIN_EXTERNALS
/** /**
* Automaticaly discover external .d.ts declarations * Automaticaly discover external .d.ts declarations
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/DefaultKotlinDependencyHandler.kt
+1 -1
View File
@@ -249,7 +249,7 @@ class DefaultKotlinDependencyHandler(
scope = NpmDependency.Scope.PEER scope = NpmDependency.Scope.PEER
) )
private fun defaultGenerateExternals() = private fun defaultGenerateExternals(): Boolean =
PropertiesProvider(project).jsGenerateExternals PropertiesProvider(project).jsGenerateExternals
private fun directoryNpmDependency( private fun directoryNpmDependency(