diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinNpmInstallTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinNpmInstallTask.kt index 4d9816b5f50..6ebb72354d6 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinNpmInstallTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinNpmInstallTask.kt @@ -68,17 +68,15 @@ abstract class KotlinNpmInstallTask : @get:IgnoreEmptyDirectories @get:NormalizeLineEndings @get:InputFiles - val packageJsonFiles: FileCollection = project.objects.fileCollection().from( - { - rootResolver.projectResolvers.values - .flatMap { it.compilationResolvers } - .map { it.compilationNpmResolution } - .map { resolution -> - val name = resolution.npmProjectName - packagesDir.map { it.dir(name).file(NpmProject.PACKAGE_JSON) } - } - } - ) + val packageJsonFiles: List by lazy { + rootResolver.projectResolvers.values + .flatMap { it.compilationResolvers } + .map { it.compilationNpmResolution } + .map { resolution -> + val name = resolution.npmProjectName + packagesDir.map { it.dir(name).file(NpmProject.PACKAGE_JSON) }.get() + } + } @get:OutputFiles val additionalFiles: FileCollection by lazy { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/RootPackageJsonTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/RootPackageJsonTask.kt index 3e3e8170023..cc65e1b601e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/RootPackageJsonTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/RootPackageJsonTask.kt @@ -68,17 +68,15 @@ abstract class RootPackageJsonTask : @get:IgnoreEmptyDirectories @get:NormalizeLineEndings @get:InputFiles - val packageJsonFiles: FileCollection = project.objects.fileCollection().from( - { - rootResolver.projectResolvers.values - .flatMap { it.compilationResolvers } - .map { it.compilationNpmResolution } - .map { resolution -> - val name = resolution.npmProjectName - packagesDir.map { it.dir(name).file(NpmProject.PACKAGE_JSON) } - } - } - ) + val packageJsonFiles: List by lazy { + rootResolver.projectResolvers.values + .flatMap { it.compilationResolvers } + .map { it.compilationNpmResolution } + .map { resolution -> + val name = resolution.npmProjectName + packagesDir.map { it.dir(name).file(NpmProject.PACKAGE_JSON) }.get() + } + } @TaskAction fun resolve() {