diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/PropertiesProvider.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/PropertiesProvider.kt index 9308a22e8d7..5f32466bafd 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/PropertiesProvider.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/PropertiesProvider.kt @@ -373,11 +373,8 @@ internal class PropertiesProvider private constructor(private val project: Proje val ignoreTcsmOverflow: Boolean get() = booleanProperty(IGNORE_TCSM_OVERFLOW) ?: false - /** - * Automaticaly discover external .d.ts declarations - */ - val jsDiscoverTypes: Boolean? - get() = booleanProperty("kotlin.js.experimental.discoverTypes") + val errorJsGenerateExternals: Boolean? + get() = booleanProperty("kotlin.js.generate.externals") /** * Use Kotlin/JS backend compiler type diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt index 96f4d53ac30..80217233edd 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt @@ -31,8 +31,10 @@ open class NodeJsRootExtension(@Transient val rootProject: Project) : Configurat check(rootProject.rootProject == rootProject) } + private val logger = rootProject.logger + private val gradleHome = rootProject.gradle.gradleUserHomeDir.also { - rootProject.logger.kotlinInfo("Storing cached files in $it") + logger.kotlinInfo("Storing cached files in $it") } var installationDir by Property(gradleHome.resolve("nodejs")) @@ -49,13 +51,21 @@ open class NodeJsRootExtension(@Transient val rootProject: Project) : Configurat @Transient private val projectProperties = PropertiesProvider(rootProject) - inner class Experimental { - val discoverTypes: Boolean - get() = projectProperties.jsDiscoverTypes == true + private val errorGenerateExternals = run { + if (projectProperties.errorJsGenerateExternals != null) { + logger.warn( + """ + | + |========== + |Please note, Dukat integration in Gradle plugin does not work now, it was removed. + |We rethink how we can integrate properly. + |========== + | + """.trimMargin() + ) + } } - val experimental = Experimental() - val taskRequirements: TasksRequirements = TasksRequirements() val nodeJsSetupTaskProvider: TaskProvider diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt index bf2cb714980..09dc8b1c5d5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt @@ -398,7 +398,6 @@ internal class KotlinCompilationNpmResolver( ) : Serializable { private val projectPackagesDir by lazy { compilationResolver.nodeJs_.projectPackagesDir } private val rootDir by lazy { compilationResolver.nodeJs_.rootProject.rootDir } - private val dukatPackageVersion by lazy { compilationResolver.nodeJs_.versions.dukat } @Transient internal lateinit var compilationResolver: KotlinCompilationNpmResolver