RNGP - Do not access .project inside GenerateCodegenArtifactsTask (fa…

…cebook#49400) Summary: We should not invoke anything on the `project` property inside thet task. That will break Gradle Configuration Caching which is becoming the default in the next version of Gradle. This fixes it for the `GenerateCodegenArtifactsTask` task. Changelog: [Internal] [Changed] - Differential Revision: D69592464
cortinico · Feb 13, 2025 · 76c4b13 · 76c4b13
1 parent 953ae78
commit 76c4b13
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 18 deletions.
diff --git a/...radle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt b/...radle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt
@@ -176,14 +176,16 @@ class ReactPlugin : Plugin<Project> {
     // We create the task to generate Java code from schema.
     val generateCodegenArtifactsTask =
         project.tasks.register(
-            "generateCodegenArtifactsFromSchema", GenerateCodegenArtifactsTask::class.java) {
-              it.dependsOn(generateCodegenSchemaTask)
-              it.reactNativeDir.set(rootExtension.reactNativeDir)
-              it.nodeExecutableAndArgs.set(rootExtension.nodeExecutableAndArgs)
-              it.generatedSrcDir.set(generatedSrcDir)
-              it.packageJsonFile.set(findPackageJsonFile(project, rootExtension.root))
-              it.codegenJavaPackageName.set(localExtension.codegenJavaPackageName)
-              it.libraryName.set(localExtension.libraryName)
+            "generateCodegenArtifactsFromSchema", GenerateCodegenArtifactsTask::class.java) { task
+              ->
+              task.dependsOn(generateCodegenSchemaTask)
+              task.reactNativeDir.set(rootExtension.reactNativeDir)
+              task.nodeExecutableAndArgs.set(rootExtension.nodeExecutableAndArgs)
+              task.generatedSrcDir.set(generatedSrcDir)
+              task.packageJsonFile.set(findPackageJsonFile(project, rootExtension.root))
+              task.codegenJavaPackageName.set(localExtension.codegenJavaPackageName)
+              task.libraryName.set(localExtension.libraryName)
+              task.nodeWorkingDir.set(project.layout.projectDirectory.asFile.absolutePath)
 
               // Please note that appNeedsCodegen is triggering a read of the package.json at
               // configuration time as we need to feed the onlyIf condition of this task.
@@ -194,7 +196,7 @@ class ReactPlugin : Plugin<Project> {
               val parsedPackageJson = packageJson?.let { JsonUtils.fromPackageJson(it) }
               val includesGeneratedCode =
                   parsedPackageJson?.codegenConfig?.includesGeneratedCode ?: false
-              it.onlyIf { (isLibrary || needsCodegenFromPackageJson) && !includesGeneratedCode }
+              task.onlyIf { (isLibrary || needsCodegenFromPackageJson) && !includesGeneratedCode }
             }
 
     // We update the android configuration to include the generated sources.

diff --git a/...ve-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTask.kt b/...ve-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTask.kt
@@ -10,6 +10,7 @@ package com.facebook.react.tasks
 import com.facebook.react.utils.JsonUtils
 import com.facebook.react.utils.Os.cliPath
 import com.facebook.react.utils.windowsAwareCommandLine
+import java.io.File
 import org.gradle.api.file.Directory
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.RegularFile
@@ -31,6 +32,8 @@ abstract class GenerateCodegenArtifactsTask : Exec() {
 
   @get:InputFile abstract val packageJsonFile: RegularFileProperty
 
+  @get:Input abstract val nodeWorkingDir: Property<String>
+
   @get:Input abstract val nodeExecutableAndArgs: ListProperty<String>
 
   @get:Input abstract val codegenJavaPackageName: Property<String>
@@ -64,7 +67,7 @@ abstract class GenerateCodegenArtifactsTask : Exec() {
   }
 
   internal fun setupCommandLine(libraryName: String, codegenJavaPackageName: String) {
-    val workingDir = project.projectDir
+    val workingDir = File(nodeWorkingDir.get())
     commandLine(
         windowsAwareCommandLine(
             *nodeExecutableAndArgs.get().toTypedArray(),

diff --git a/...radle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTaskTest.kt b/...radle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTaskTest.kt
@@ -67,10 +67,11 @@ class GenerateCodegenArtifactsTaskTest {
     val outputDir = tempFolder.newFolder("output")
 
     val task =
-        createTestTask<GenerateCodegenArtifactsTask> {
-          it.reactNativeDir.set(reactNativeDir)
-          it.generatedSrcDir.set(outputDir)
-          it.nodeExecutableAndArgs.set(listOf("--verbose"))
+        createTestTask<GenerateCodegenArtifactsTask> { task ->
+          task.reactNativeDir.set(reactNativeDir)
+          task.generatedSrcDir.set(outputDir)
+          task.nodeExecutableAndArgs.set(listOf("--verbose"))
+          task.nodeWorkingDir.set(tempFolder.root.absolutePath)
         }
 
     task.setupCommandLine("example-test", "com.example.test")
@@ -100,10 +101,11 @@ class GenerateCodegenArtifactsTaskTest {
 
     val project = createProject()
     val task =
-        createTestTask<GenerateCodegenArtifactsTask>(project) {
-          it.reactNativeDir.set(reactNativeDir)
-          it.generatedSrcDir.set(outputDir)
-          it.nodeExecutableAndArgs.set(listOf("--verbose"))
+        createTestTask<GenerateCodegenArtifactsTask>(project) { task ->
+          task.reactNativeDir.set(reactNativeDir)
+          task.generatedSrcDir.set(outputDir)
+          task.nodeExecutableAndArgs.set(listOf("--verbose"))
+          task.nodeWorkingDir.set(project.projectDir.absolutePath)
         }
 
     task.setupCommandLine("example-test", "com.example.test")