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 0bd026226aa..68c2b1221ca 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 @@ -60,7 +60,7 @@ interface KotlinDependencyHandler { fun npm( name: String, version: String, - generateKotlinExternals: Boolean + generateExternals: Boolean ): Dependency fun npm( @@ -69,13 +69,13 @@ interface KotlinDependencyHandler { ): Dependency = npm( name = name, version = version, - generateKotlinExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS + generateExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS ) fun npm( name: String, directory: File, - generateKotlinExternals: Boolean + generateExternals: Boolean ): Dependency fun npm( @@ -84,19 +84,19 @@ interface KotlinDependencyHandler { ): Dependency = npm( name = name, directory = directory, - generateKotlinExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS + generateExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS ) fun npm( directory: File, - generateKotlinExternals: Boolean + generateExternals: Boolean ): Dependency fun npm( directory: File ): Dependency = npm( directory = directory, - generateKotlinExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS + generateExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS ) fun devNpm( @@ -116,7 +116,7 @@ interface KotlinDependencyHandler { fun optionalNpm( name: String, version: String, - generateKotlinExternals: Boolean + generateExternals: Boolean ): Dependency fun optionalNpm( @@ -125,13 +125,13 @@ interface KotlinDependencyHandler { ): Dependency = optionalNpm( name = name, version = version, - generateKotlinExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS + generateExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS ) fun optionalNpm( name: String, directory: File, - generateKotlinExternals: Boolean + generateExternals: Boolean ): Dependency fun optionalNpm( @@ -140,19 +140,19 @@ interface KotlinDependencyHandler { ): Dependency = optionalNpm( name = name, directory = directory, - generateKotlinExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS + generateExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS ) fun optionalNpm( directory: File, - generateKotlinExternals: Boolean + generateExternals: Boolean ): Dependency fun optionalNpm( directory: File ): Dependency = optionalNpm( directory = directory, - generateKotlinExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS + generateExternals = DEFAULT_GENERATE_KOTLIN_EXTERNALS ) fun peerNpm( 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 50fea85cd3c..6dc36b2a80c 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 @@ -94,35 +94,35 @@ class DefaultKotlinDependencyHandler( override fun npm( name: String, version: String, - generateKotlinExternals: Boolean + generateExternals: Boolean ): NpmDependency = NpmDependency( project = project, name = name, version = version, - generateKotlinExternals = generateKotlinExternals + generateExternals = generateExternals ) override fun npm( name: String, directory: File, - generateKotlinExternals: Boolean + generateExternals: Boolean ): NpmDependency = directoryNpmDependency( name = name, directory = directory, scope = NpmDependency.Scope.NORMAL, - generateKotlinExternals = generateKotlinExternals + generateExternals = generateExternals ) override fun npm( directory: File, - generateKotlinExternals: Boolean + generateExternals: Boolean ): NpmDependency = npm( name = moduleName(directory), directory = directory, - generateKotlinExternals = generateKotlinExternals + generateExternals = generateExternals ) override fun devNpm( @@ -141,7 +141,7 @@ class DefaultKotlinDependencyHandler( name = name, directory = directory, scope = NpmDependency.Scope.DEV, - generateKotlinExternals = false + generateExternals = false ) override fun devNpm(directory: File): NpmDependency = @@ -153,36 +153,36 @@ class DefaultKotlinDependencyHandler( override fun optionalNpm( name: String, version: String, - generateKotlinExternals: Boolean + generateExternals: Boolean ): NpmDependency = NpmDependency( project = project, name = name, version = version, scope = NpmDependency.Scope.OPTIONAL, - generateKotlinExternals = generateKotlinExternals + generateExternals = generateExternals ) override fun optionalNpm( name: String, directory: File, - generateKotlinExternals: Boolean + generateExternals: Boolean ): NpmDependency = directoryNpmDependency( name, directory, NpmDependency.Scope.OPTIONAL, - generateKotlinExternals = generateKotlinExternals + generateExternals = generateExternals ) override fun optionalNpm( directory: File, - generateKotlinExternals: Boolean + generateExternals: Boolean ): NpmDependency = optionalNpm( name = moduleName(directory), directory = directory, - generateKotlinExternals = generateKotlinExternals + generateExternals = generateExternals ) override fun peerNpm( @@ -200,13 +200,13 @@ class DefaultKotlinDependencyHandler( name: String, directory: File, scope: NpmDependency.Scope, - generateKotlinExternals: Boolean + generateExternals: Boolean ): NpmDependency = directoryNpmDependency( project = project, name = name, directory = directory, scope = scope, - generateKotlinExternals = generateKotlinExternals + generateExternals = generateExternals ) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DtsResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DtsResolver.kt index 8763da09f89..06b00221c9c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DtsResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DtsResolver.kt @@ -21,7 +21,7 @@ class DtsResolver(val npmProject: NpmProject) { fun getAllDts(externalNpmDependencies: Collection): List { return externalNpmDependencies .asSequence() - .filter { it.generateKotlinExternals } + .filter { it.generateExternals } .filter { it.scope == NORMAL || it.scope == OPTIONAL } .mapNotNullTo(mutableSetOf()) { typeModules.resolve(it.key)?.let { file -> Dts(file.canonicalFile, it) } } .sortedBy { it.inputKey } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt index 5121df33a59..259d8d63da8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt @@ -25,7 +25,7 @@ data class NpmDependency( private val name: String, private val version: String, val scope: Scope = Scope.NORMAL, - val generateKotlinExternals: Boolean = false + val generateExternals: Boolean = false ) : SelfResolvingDependency, SelfResolvingDependencyInternal, ResolvableDependency, @@ -117,7 +117,7 @@ internal fun directoryNpmDependency( name: String, directory: File, scope: NpmDependency.Scope, - generateKotlinExternals: Boolean + generateExternals: Boolean ): NpmDependency { check(directory.isDirectory) { "Dependency on local path should point on directory but $directory found" @@ -128,7 +128,7 @@ internal fun directoryNpmDependency( name = name, version = fileVersion(directory), scope = scope, - generateKotlinExternals = generateKotlinExternals + generateExternals = generateExternals ) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt index 1025a2c6a05..9560a85cd14 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt @@ -31,7 +31,7 @@ interface NpmDependencyWithExternalsExtension : BaseNpmDependencyExtension { operator fun invoke( name: String, version: String, - generateKotlinExternals: Boolean + generateExternals: Boolean ): NpmDependency } @@ -39,12 +39,12 @@ interface NpmDirectoryDependencyWithExternalsExtension : NpmDirectoryDependencyE operator fun invoke( name: String, directory: File, - generateKotlinExternals: Boolean + generateExternals: Boolean ): NpmDependency operator fun invoke( directory: File, - generateKotlinExternals: Boolean + generateExternals: Boolean ): NpmDependency } @@ -106,13 +106,13 @@ private fun scopePrefix(scope: NpmDependency.Scope): String { private abstract class NpmDependencyExtensionDelegate( protected val project: Project, protected val scope: NpmDependency.Scope, - protected val _defaultGenerateKotlinExternals: Boolean? + protected val _defaultGenerateExternals: Boolean? ) : NpmDependencyExtension, DevNpmDependencyExtension, PeerNpmDependencyExtension, Closure(project.dependencies) { - protected val defaultGenerateKotlinExternals: Boolean - get() = _defaultGenerateKotlinExternals ?: false + protected val defaultGenerateExternals: Boolean + get() = _defaultGenerateExternals ?: false override fun invoke(name: String): NpmDependency = onlyNameNpmDependency(name) @@ -120,44 +120,44 @@ private abstract class NpmDependencyExtensionDelegate( override operator fun invoke( name: String, version: String, - generateKotlinExternals: Boolean + generateExternals: Boolean ): NpmDependency = NpmDependency( project = project, name = name, version = version, scope = scope, - generateKotlinExternals = generateKotlinExternals + generateExternals = generateExternals ) override fun invoke(name: String, version: String): NpmDependency = invoke( name = name, version = version, - generateKotlinExternals = defaultGenerateKotlinExternals + generateExternals = defaultGenerateExternals ) override fun invoke(name: String, directory: File): NpmDependency = invoke( name = name, directory = directory, - generateKotlinExternals = defaultGenerateKotlinExternals + generateExternals = defaultGenerateExternals ) override fun invoke(directory: File): NpmDependency = invoke( directory = directory, - generateKotlinExternals = defaultGenerateKotlinExternals + generateExternals = defaultGenerateExternals ) override operator fun invoke( directory: File, - generateKotlinExternals: Boolean + generateExternals: Boolean ): NpmDependency = invoke( name = moduleName(directory), directory = directory, - generateKotlinExternals = generateKotlinExternals + generateExternals = generateExternals ) override fun call(vararg args: Any?): NpmDependency { @@ -177,7 +177,7 @@ private abstract class NpmDependencyExtensionDelegate( private fun withName(name: String, vararg args: Any?): NpmDependency { val arg1 = if (args.size > 1) args[1] else null - val generateKotlinExternals = generateKotlinExternalsIfPossible(*args) + val generateExternals = generateExternalsIfPossible(*args) return when (arg1) { null -> invoke( @@ -186,12 +186,12 @@ private abstract class NpmDependencyExtensionDelegate( is String -> invoke( name = name, version = arg1, - generateKotlinExternals = generateKotlinExternals + generateExternals = generateExternals ) else -> processNamedNonStringSecondArgument( name, arg1, - generateKotlinExternals, + generateExternals, *args ) } @@ -200,7 +200,7 @@ private abstract class NpmDependencyExtensionDelegate( protected abstract fun processNamedNonStringSecondArgument( name: String, arg: Any?, - generateKotlinExternals: Boolean, + generateExternals: Boolean, vararg args: Any? ): NpmDependency @@ -218,27 +218,27 @@ private abstract class NpmDependencyExtensionDelegate( return listOf("${scopePrefix(scope)}('name', 'version')" to "name:version") } - protected fun generateKotlinExternalsIfPossible(vararg args: Any?): Boolean { + protected fun generateExternalsIfPossible(vararg args: Any?): Boolean { val arg2 = (if (args.size > 2) args[2] else null) as? Boolean - if (arg2 != null && _defaultGenerateKotlinExternals == null) { + if (arg2 != null && _defaultGenerateExternals == null) { npmDeclarationException(args) } - return arg2 ?: defaultGenerateKotlinExternals + return arg2 ?: defaultGenerateExternals } } private class DefaultNpmDependencyExtension( project: Project, scope: NpmDependency.Scope, - defaultGenerateKotlinExternals: Boolean? + defaultGenerateExternals: Boolean? ) : Closure(project.dependencies), NpmDependencyExtension { private val delegate = defaultNpmDependencyDelegate( project, scope, - defaultGenerateKotlinExternals + defaultGenerateExternals ) override fun invoke(name: String): NpmDependency = @@ -253,14 +253,14 @@ private class DefaultNpmDependencyExtension( override fun invoke(directory: File): NpmDependency = delegate.invoke(directory) - override fun invoke(name: String, version: String, generateKotlinExternals: Boolean): NpmDependency = - delegate.invoke(name, version, generateKotlinExternals) + override fun invoke(name: String, version: String, generateExternals: Boolean): NpmDependency = + delegate.invoke(name, version, generateExternals) - override fun invoke(name: String, directory: File, generateKotlinExternals: Boolean): NpmDependency = - delegate.invoke(name, directory, generateKotlinExternals) + override fun invoke(name: String, directory: File, generateExternals: Boolean): NpmDependency = + delegate.invoke(name, directory, generateExternals) - override fun invoke(directory: File, generateKotlinExternals: Boolean): NpmDependency = - delegate.invoke(directory, generateKotlinExternals) + override fun invoke(directory: File, generateExternals: Boolean): NpmDependency = + delegate.invoke(directory, generateExternals) override fun call(vararg args: Any?): NpmDependency = delegate.call(*args) @@ -295,33 +295,33 @@ private class DefaultDevNpmDependencyExtension( private fun defaultNpmDependencyDelegate( project: Project, scope: NpmDependency.Scope, - defaultGenerateKotlinExternals: Boolean? + defaultGenerateExternals: Boolean? ): NpmDependencyExtensionDelegate { return object : NpmDependencyExtensionDelegate( project, scope, - defaultGenerateKotlinExternals + defaultGenerateExternals ) { override operator fun invoke( name: String, directory: File, - generateKotlinExternals: Boolean + generateExternals: Boolean ): NpmDependency = directoryNpmDependency( project = project, name = name, directory = directory, scope = scope, - generateKotlinExternals = generateKotlinExternals + generateExternals = generateExternals ) override fun processNonStringFirstArgument(arg: Any?, vararg args: Any?): NpmDependency { - val generateKotlinExternals = generateKotlinExternalsIfPossible(args) + val generateExternals = generateExternalsIfPossible(args) return when (arg) { is File -> invoke( directory = arg, - generateKotlinExternals = generateKotlinExternals + generateExternals = generateExternals ) else -> npmDeclarationException(args) } @@ -330,14 +330,14 @@ private fun defaultNpmDependencyDelegate( override fun processNamedNonStringSecondArgument( name: String, arg: Any?, - generateKotlinExternals: Boolean, + generateExternals: Boolean, vararg args: Any? ): NpmDependency { return when (arg) { is File -> invoke( name = name, directory = arg, - generateKotlinExternals = generateKotlinExternals + generateExternals = generateExternals ) else -> npmDeclarationException(args) } @@ -349,13 +349,13 @@ private fun defaultNpmDependencyDelegate( "${scopePrefix(scope)}('name', File)" to "name:File" ) - if (_defaultGenerateKotlinExternals == null) { + if (_defaultGenerateExternals == null) { return result } return result .map { (first, second) -> - val value = first.replace(")", ", generateKotlinExternals = $defaultGenerateKotlinExternals)") + val value = first.replace(")", ", generateExternals = $defaultGenerateExternals)") value to second } } @@ -374,7 +374,7 @@ private class DefaultPeerNpmDependencyExtension( override fun invoke( name: String, directory: File, - generateKotlinExternals: Boolean + generateExternals: Boolean ): NpmDependency = npmDeclarationException(arrayOf(name, directory)) @@ -384,7 +384,7 @@ private class DefaultPeerNpmDependencyExtension( override fun processNamedNonStringSecondArgument( name: String, arg: Any?, - generateKotlinExternals: Boolean, + generateExternals: Boolean, vararg args: Any? ): NpmDependency = npmDeclarationException(args)