From b0fbbe54426859fa194d8bcc483ff98d047b4ff7 Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Sat, 22 Aug 2020 11:32:42 -0700
Subject: [PATCH] Codegen: execute JavaGenerator only after tasks are evaluated

Summary:
Instead of invoking JavaGenerator when the task is registered, do it when the task actually executes. This way, it will wait until the other task it depends on to finish executing.

Changelog: [Internal]

Reviewed By: mdvacca

Differential Revision: D23276359

fbshipit-source-id: 6aea98d97121f2dcfd83b299e38debc767f08240
---
 .../facebook/react/codegen/plugin/CodegenPlugin.java  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/plugin/CodegenPlugin.java b/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/plugin/CodegenPlugin.java
index 055bcff1b6f..4ea0a13e09f 100644
--- a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/plugin/CodegenPlugin.java
+++ b/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/plugin/CodegenPlugin.java
@@ -98,10 +98,13 @@ public class CodegenPlugin implements Plugin<Project> {
               task.getOutputs().dir(outputDir);
 
               if (extension.useJavaGenerator) {
-                generateJavaFromSchemaWithJavaGenerator(
-                    generatedSchemaFile,
-                    extension.codegenJavaPackageName,
-                    new File(generatedSrcDir, "java"));
+                task.doLast(
+                    s -> {
+                      generateJavaFromSchemaWithJavaGenerator(
+                          generatedSchemaFile,
+                          extension.codegenJavaPackageName,
+                          new File(generatedSrcDir, "java"));
+                    });
                 // TODO: generate JNI C++ files.
                 task.commandLine("echo");
               } else {