From 9f45ef8df50abce99b818955929fd79434e51ba6 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 8 Jun 2020 12:47:25 +0300 Subject: [PATCH] [Gradle, JS] Rename DEFAULT_GENERATE_EXTERNALS --- .../kotlin/gradle/plugin/HasKotlinDependencies.kt | 12 ++++++------ .../jetbrains/kotlin/gradle/plugin/NpmConstants.kt | 2 +- .../kotlin/gradle/plugin/KotlinProperties.kt | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/HasKotlinDependencies.kt b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/HasKotlinDependencies.kt index 68c2b1221ca..756f1ecf239 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/HasKotlinDependencies.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/HasKotlinDependencies.kt @@ -69,7 +69,7 @@ interface KotlinDependencyHandler { ): Dependency = npm( name = name, version = version, - generateExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS + generateExternals = DEFAULT_GENERATE_EXTERNALS ) fun npm( @@ -84,7 +84,7 @@ interface KotlinDependencyHandler { ): Dependency = npm( name = name, directory = directory, - generateExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS + generateExternals = DEFAULT_GENERATE_EXTERNALS ) fun npm( @@ -96,7 +96,7 @@ interface KotlinDependencyHandler { directory: File ): Dependency = npm( directory = directory, - generateExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS + generateExternals = DEFAULT_GENERATE_EXTERNALS ) fun devNpm( @@ -125,7 +125,7 @@ interface KotlinDependencyHandler { ): Dependency = optionalNpm( name = name, version = version, - generateExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS + generateExternals = DEFAULT_GENERATE_EXTERNALS ) fun optionalNpm( @@ -140,7 +140,7 @@ interface KotlinDependencyHandler { ): Dependency = optionalNpm( name = name, directory = directory, - generateExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS + generateExternals = DEFAULT_GENERATE_EXTERNALS ) fun optionalNpm( @@ -152,7 +152,7 @@ interface KotlinDependencyHandler { directory: File ): Dependency = optionalNpm( directory = directory, - generateExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS + generateExternals = DEFAULT_GENERATE_EXTERNALS ) fun peerNpm( 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 dc87f450f16..96b18592ecf 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 = false \ No newline at end of file +const val DEFAULT_GENERATE_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 29a277ba477..144174f41f3 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 @@ -192,7 +192,7 @@ 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.generate.externals") ?: DEFAULT_GENERATE_KOTLIN_EXTERNALS + get() = booleanProperty("kotlin.js.generate.externals") ?: DEFAULT_GENERATE_EXTERNALS /** * Automaticaly discover external .d.ts declarations