From 0350533189c21ffe19efa9098896ef7a63235449 Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Tue, 30 Jan 2024 10:38:09 +0000
Subject: [PATCH] [Gradle, JS] Do not use project on execution phase

---
 .../js/npm/tasks/KotlinNpmInstallTask.kt      | 20 +++++++++----------
 .../js/npm/tasks/RootPackageJsonTask.kt       | 20 +++++++++----------
 2 files changed, 18 insertions(+), 22 deletions(-)

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<RegularFile> 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<RegularFile> 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() {