diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootPlugin.kt index 8a442e217eb..1c32e438a5c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootPlugin.kt @@ -126,8 +126,7 @@ open class NodeJsRootPlugin : Plugin { YarnPlugin.apply(project) npmInstall.configure { - it.npmResolutionManager.set(npmResolutionManager) - it.npmResolutionManager.disallowChanges() + it.npmResolutionManager.value(npmResolutionManager).disallowChanges() } project.tasks.register("node" + CleanDataTask.NAME_SUFFIX, CleanDataTask::class.java) { 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 a545eebdd0c..d65c098eefa 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 @@ -71,10 +71,8 @@ class KotlinCompilationNpmResolver( it.compilationDisambiguatedName.set(compilation.disambiguatedName) - it.npmResolutionManager.apply { - set(npmResolutionManager) - disallowChanges() - } + it.npmResolutionManager.value(npmResolutionManager) + .disallowChanges() it.jsIrCompilation.set(compilation is KotlinJsIrCompilation) it.npmProjectName.set(npmProject.name) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt index 40c67a035e9..72d6cd8f456 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt @@ -111,20 +111,14 @@ abstract class KotlinPackageJsonTask : task.description = "Create package.json file for $compilation" task.group = NodeJsRootPlugin.TASKS_GROUP_NAME - task.npmResolutionManager.apply { - set(npmResolutionManager) - disallowChanges() - } + task.npmResolutionManager.value(npmResolutionManager) + .disallowChanges() - task.gradleNodeModules.apply { - set(gradleNodeModules) - disallowChanges() - } + task.gradleNodeModules.value(gradleNodeModules) + .disallowChanges() - task.compositeNodeModules.apply { - set(compositeNodeModules) - disallowChanges() - } + task.compositeNodeModules.value(compositeNodeModules) + .disallowChanges() task.packageJson.set(compilation.npmProject.packageJsonFile) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnPlugin.kt index 0f614669ea9..162bce153f4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnPlugin.kt @@ -55,10 +55,8 @@ open class YarnPlugin : Plugin { task.group = NodeJsRootPlugin.TASKS_GROUP_NAME task.description = "Create root package.json" - task.npmResolutionManager.apply { - set(kotlinNpmResolutionManager) - disallowChanges() - } + task.npmResolutionManager.value(kotlinNpmResolutionManager) + .disallowChanges() task.onlyIf { it as RootPackageJsonTask