diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/HasKotlinDependencies.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/HasKotlinDependencies.kt index 0f5ddacdd8e..3e7f785f664 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/HasKotlinDependencies.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/HasKotlinDependencies.kt @@ -183,7 +183,7 @@ interface HasKotlinDependencies { get() = listOf(apiConfigurationName, implementationConfigurationName, compileOnlyConfigurationName, runtimeOnlyConfigurationName) } -internal fun warnNpmGenerateExternals(logger: Logger) { +fun warnNpmGenerateExternals(logger: Logger) { logger.warn( """ | diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt index e726abc3ff2..a556d84c143 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt @@ -10,6 +10,7 @@ import groovy.lang.GString import org.gradle.api.Project import org.gradle.api.plugins.ExtensionAware import org.gradle.api.reflect.TypeOf +import org.jetbrains.kotlin.gradle.plugin.warnNpmGenerateExternals import org.jetbrains.kotlin.gradle.targets.js.npm.NpmDependency.Scope.* import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName import java.io.File @@ -24,8 +25,34 @@ interface NpmDirectoryDependencyExtension : BaseNpmDependencyExtension { operator fun invoke(directory: File): NpmDependency } +interface NpmDependencyWithExternalsExtension : BaseNpmDependencyExtension { + @Deprecated("Dukat integration is in redesigning process. Now it does not work.") + operator fun invoke( + name: String, + version: String, + generateExternals: Boolean + ): NpmDependency +} + +interface NpmDirectoryDependencyWithExternalsExtension : NpmDirectoryDependencyExtension { + @Deprecated("Dukat integration is in redesigning process. Now it does not work.") + operator fun invoke( + name: String, + directory: File, + generateExternals: Boolean + ): NpmDependency + + @Deprecated("Dukat integration is in redesigning process. Now it does not work.") + operator fun invoke( + directory: File, + generateExternals: Boolean + ): NpmDependency +} + interface NpmDependencyExtension : BaseNpmDependencyExtension, + NpmDependencyWithExternalsExtension, + NpmDirectoryDependencyWithExternalsExtension, NpmDirectoryDependencyExtension interface DevNpmDependencyExtension : @@ -168,7 +195,7 @@ private abstract class NpmDependencyExtensionDelegate( } private class DefaultNpmDependencyExtension( - project: Project, + private val project: Project, scope: NpmDependency.Scope, ) : Closure(project.dependencies), NpmDependencyExtension { @@ -180,6 +207,24 @@ private class DefaultNpmDependencyExtension( override fun invoke(name: String, version: String): NpmDependency = delegate.invoke(name, version) + @Deprecated("Dukat integration is in redesigning process. Now it does not work.") + override fun invoke(name: String, version: String, generateExternals: Boolean): NpmDependency { + warnNpmGenerateExternals(project.logger) + return invoke(name, version) + } + + @Deprecated("Dukat integration is in redesigning process. Now it does not work.") + override fun invoke(name: String, directory: File, generateExternals: Boolean): NpmDependency { + warnNpmGenerateExternals(project.logger) + return invoke(name, directory) + } + + @Deprecated("Dukat integration is in redesigning process. Now it does not work.") + override fun invoke(directory: File, generateExternals: Boolean): NpmDependency { + warnNpmGenerateExternals(project.logger) + return invoke(directory) + } + override fun invoke(name: String, directory: File): NpmDependency = delegate.invoke(name, directory) @@ -220,6 +265,24 @@ private fun defaultNpmDependencyDelegate( project, scope, ) { + @Deprecated("Dukat integration is in redesigning process. Now it does not work.") + override fun invoke(directory: File, generateExternals: Boolean): NpmDependency { + warnNpmGenerateExternals(project.logger) + return invoke(directory) + } + + @Deprecated("Dukat integration is in redesigning process. Now it does not work.") + override fun invoke(name: String, version: String, generateExternals: Boolean): NpmDependency { + warnNpmGenerateExternals(project.logger) + return invoke(name, version) + } + + @Deprecated("Dukat integration is in redesigning process. Now it does not work.") + override fun invoke(name: String, directory: File, generateExternals: Boolean): NpmDependency { + warnNpmGenerateExternals(project.logger) + return invoke(name, directory) + } + override operator fun invoke( name: String, directory: File, @@ -273,6 +336,24 @@ private class DefaultPeerNpmDependencyExtension( project, PEER, ) { + @Deprecated("Dukat integration is in redesigning process. Now it does not work.") + override fun invoke(directory: File, generateExternals: Boolean): NpmDependency { + warnNpmGenerateExternals(project.logger) + return invoke(directory) + } + + @Deprecated("Dukat integration is in redesigning process. Now it does not work.") + override fun invoke(name: String, version: String, generateExternals: Boolean): NpmDependency { + warnNpmGenerateExternals(project.logger) + return invoke(name, version) + } + + @Deprecated("Dukat integration is in redesigning process. Now it does not work.") + override fun invoke(name: String, directory: File, generateExternals: Boolean): NpmDependency { + warnNpmGenerateExternals(project.logger) + return invoke(name, directory) + } + override fun invoke( name: String, directory: File,