From 1f8c5607b20c02e21c08dfc3cb88bcfc6cdd2244 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Thu, 12 Aug 2021 05:13:27 -0700 Subject: [PATCH] Flatten the `react-native-codegen` included build. (#32007) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/32007 This Diff simplifies the codegen Gradle build. Previously the build used to have a 2-level nesting of included build. Turns out that the `react-native-codegen/android/build.gradle` build is just providing a task and including an inner build that contains the codegen Gradle plugin. I've moved such plugin to the outer build. This will also make sure that the Gradle plugin files are properly index by the IDE when opening the build (as nested included build are not yet supported). Changelog: Internal - Flatten the `react-native-codegen` Gradle included build Reviewed By: fkgozali, ShikaSD Differential Revision: D30227784 fbshipit-source-id: af304afeeba1926f8b7b5b47cf69889d3f808f5f --- .gitignore | 1 - packages/react-native-codegen/BUCK | 3 +- .../react-native-codegen/android/build.gradle | 36 +++++++++++-------- .../android/gradlePlugin-build/build.gradle | 14 -------- .../gradlePlugin/build.gradle | 27 -------------- .../gradlePlugin-build/settings.gradle | 10 ------ .../android/settings.gradle | 6 +--- .../codegen/generator/JavaGenerator.java | 0 .../codegen/generator/SchemaJsonParser.java | 0 .../codegen/generator/model/AliasType.java | 0 .../codegen/generator/model/AnyType.java | 0 .../codegen/generator/model/ArrayType.java | 0 .../codegen/generator/model/BooleanType.java | 0 .../generator/model/CodegenException.java | 0 .../codegen/generator/model/DoubleType.java | 0 .../codegen/generator/model/FloatType.java | 0 .../codegen/generator/model/FunctionType.java | 0 .../generator/model/GenericObjectType.java | 0 .../codegen/generator/model/Int32Type.java | 0 .../generator/model/NativeModuleType.java | 0 .../codegen/generator/model/NullableType.java | 0 .../codegen/generator/model/NumberType.java | 0 .../codegen/generator/model/ObjectType.java | 0 .../codegen/generator/model/PromiseType.java | 0 .../model/ReservedFunctionValueType.java | 0 .../codegen/generator/model/StringType.java | 0 .../react/codegen/generator/model/Type.java | 0 .../codegen/generator/model/TypeData.java | 0 .../react/codegen/generator/model/TypeId.java | 0 .../codegen/generator/model/VoidType.java | 0 .../generator/resolver/AliasResolvedType.java | 0 .../generator/resolver/Annotations.java | 0 .../generator/resolver/AnyResolvedType.java | 0 .../generator/resolver/ArrayResolvedType.java | 0 .../resolver/BooleanResolvedType.java | 0 .../generator/resolver/ClassNames.java | 0 .../resolver/FunctionResolvedType.java | 0 .../resolver/GenericObjectResolvedType.java | 0 .../resolver/NativeModuleResolvedType.java | 0 .../resolver/NullableResolvedType.java | 0 .../resolver/NumberResolvedType.java | 0 .../resolver/ObjectResolvedType.java | 0 .../resolver/PromiseResolvedType.java | 0 .../generator/resolver/ReactClassNames.java | 0 .../ReservedFunctionValueResolvedType.java | 0 .../generator/resolver/ResolvedType.java | 0 .../resolver/StringResolvedType.java | 0 .../generator/resolver/TypeResolver.java | 0 .../codegen/generator/resolver/TypeUtils.java | 0 .../generator/resolver/VoidResolvedType.java | 0 .../react/codegen/plugin/CodegenPlugin.java | 0 .../plugin/CodegenPluginExtension.java | 0 52 files changed, 24 insertions(+), 73 deletions(-) delete mode 100644 packages/react-native-codegen/android/gradlePlugin-build/build.gradle delete mode 100644 packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/build.gradle delete mode 100644 packages/react-native-codegen/android/gradlePlugin-build/settings.gradle rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/JavaGenerator.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/SchemaJsonParser.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/AliasType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/AnyType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/ArrayType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/BooleanType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/CodegenException.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/DoubleType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/FloatType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/FunctionType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/GenericObjectType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/Int32Type.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/NativeModuleType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/NullableType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/NumberType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/ObjectType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/PromiseType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/ReservedFunctionValueType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/StringType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/Type.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/TypeData.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/TypeId.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/model/VoidType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/AliasResolvedType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/Annotations.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/AnyResolvedType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/ArrayResolvedType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/BooleanResolvedType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/ClassNames.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/FunctionResolvedType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/GenericObjectResolvedType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/NativeModuleResolvedType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/NullableResolvedType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/NumberResolvedType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/ObjectResolvedType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/PromiseResolvedType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/ReactClassNames.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/ReservedFunctionValueResolvedType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/ResolvedType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/StringResolvedType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/TypeResolver.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/TypeUtils.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/generator/resolver/VoidResolvedType.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/plugin/CodegenPlugin.java (100%) rename packages/react-native-codegen/android/{gradlePlugin-build/gradlePlugin => }/src/main/java/com/facebook/react/codegen/plugin/CodegenPluginExtension.java (100%) diff --git a/.gitignore b/.gitignore index 0f2d0c91d4..de6bcc3d45 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,6 @@ project.xcworkspace # Gradle /build/ /packages/react-native-codegen/android/build/ -/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/build /packages/react-native-gradle-plugin/build/ /packages/rn-tester/android/app/.cxx/ /packages/rn-tester/android/app/build/ diff --git a/packages/react-native-codegen/BUCK b/packages/react-native-codegen/BUCK index aa14286546..bc1c5d4528 100644 --- a/packages/react-native-codegen/BUCK +++ b/packages/react-native-codegen/BUCK @@ -36,8 +36,7 @@ rn_codegen_modules( rn_android_library( name = "rn_codegen_library_java", srcs = glob( - ["**/*.java"], - exclude = ["android/gradlePlugin-build/**/*"], + ["buck_tests/*.java"], ), autoglob = False, visibility = [ diff --git a/packages/react-native-codegen/android/build.gradle b/packages/react-native-codegen/android/build.gradle index f5940c1761..ddb8615512 100644 --- a/packages/react-native-codegen/android/build.gradle +++ b/packages/react-native-codegen/android/build.gradle @@ -7,22 +7,30 @@ import org.apache.tools.ant.taskdefs.condition.Os -buildscript { - repositories { - mavenLocal() - google() - mavenCentral() - } - dependencies { - classpath("com.android.tools.build:gradle:4.2.2") - } +plugins { + id 'java-gradle-plugin' } -allprojects { - repositories { - mavenLocal() - google() - mavenCentral() +repositories { + mavenLocal() + google() + mavenCentral() +} + +dependencies { + implementation 'com.android.tools.build:gradle:4.2.2' + // Use the same Gson version that `com.android.tools.build:gradle` depends on. + implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.guava:guava:29.0-jre' + implementation 'com.squareup:javapoet:1.13.0' +} + +gradlePlugin { + plugins { + codegen { + id = 'com.facebook.react.codegen' + implementationClass = 'com.facebook.react.codegen.plugin.CodegenPlugin' + } } } diff --git a/packages/react-native-codegen/android/gradlePlugin-build/build.gradle b/packages/react-native-codegen/android/gradlePlugin-build/build.gradle deleted file mode 100644 index 2688b327db..0000000000 --- a/packages/react-native-codegen/android/gradlePlugin-build/build.gradle +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -allprojects { - repositories { - mavenLocal() - google() - mavenCentral() - } -} diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/build.gradle b/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/build.gradle deleted file mode 100644 index 9a1ed28a7a..0000000000 --- a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/build.gradle +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -plugins { - id 'java-gradle-plugin' -} - -gradlePlugin { - plugins { - codegen { - id = 'com.facebook.react.codegen' - implementationClass = 'com.facebook.react.codegen.plugin.CodegenPlugin' - } - } -} - -dependencies { - implementation 'com.android.tools.build:gradle:4.2.2' - // Use the same Gson version that `com.android.tools.build:gradle` depends on. - implementation 'com.google.code.gson:gson:2.8.5' - implementation 'com.google.guava:guava:29.0-jre' - implementation 'com.squareup:javapoet:1.13.0' -} diff --git a/packages/react-native-codegen/android/gradlePlugin-build/settings.gradle b/packages/react-native-codegen/android/gradlePlugin-build/settings.gradle deleted file mode 100644 index b9fdc14c3e..0000000000 --- a/packages/react-native-codegen/android/gradlePlugin-build/settings.gradle +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -rootProject.name = 'react-native-codegen-gradlePlugin-build' - -include(":gradlePlugin") diff --git a/packages/react-native-codegen/android/settings.gradle b/packages/react-native-codegen/android/settings.gradle index 4beec1548b..f399ad57e3 100644 --- a/packages/react-native-codegen/android/settings.gradle +++ b/packages/react-native-codegen/android/settings.gradle @@ -13,8 +13,4 @@ pluginManagement { } } -rootProject.name = 'react-native-codegen' - -include(":generator") - -includeBuild("gradlePlugin-build") +rootProject.name = 'react-native-codegen-android' diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/JavaGenerator.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/JavaGenerator.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/JavaGenerator.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/JavaGenerator.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/SchemaJsonParser.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/SchemaJsonParser.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/SchemaJsonParser.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/SchemaJsonParser.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/AliasType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/AliasType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/AliasType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/AliasType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/AnyType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/AnyType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/AnyType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/AnyType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/ArrayType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/ArrayType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/ArrayType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/ArrayType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/BooleanType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/BooleanType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/BooleanType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/BooleanType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/CodegenException.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/CodegenException.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/CodegenException.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/CodegenException.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/DoubleType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/DoubleType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/DoubleType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/DoubleType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/FloatType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/FloatType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/FloatType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/FloatType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/FunctionType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/FunctionType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/FunctionType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/FunctionType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/GenericObjectType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/GenericObjectType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/GenericObjectType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/GenericObjectType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/Int32Type.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/Int32Type.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/Int32Type.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/Int32Type.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/NativeModuleType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/NativeModuleType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/NativeModuleType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/NativeModuleType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/NullableType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/NullableType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/NullableType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/NullableType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/NumberType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/NumberType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/NumberType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/NumberType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/ObjectType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/ObjectType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/ObjectType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/ObjectType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/PromiseType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/PromiseType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/PromiseType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/PromiseType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/ReservedFunctionValueType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/ReservedFunctionValueType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/ReservedFunctionValueType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/ReservedFunctionValueType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/StringType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/StringType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/StringType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/StringType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/Type.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/Type.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/Type.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/Type.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/TypeData.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/TypeData.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/TypeData.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/TypeData.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/TypeId.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/TypeId.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/TypeId.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/TypeId.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/VoidType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/VoidType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/VoidType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/model/VoidType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/AliasResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/AliasResolvedType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/AliasResolvedType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/AliasResolvedType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/Annotations.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/Annotations.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/Annotations.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/Annotations.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/AnyResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/AnyResolvedType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/AnyResolvedType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/AnyResolvedType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/ArrayResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/ArrayResolvedType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/ArrayResolvedType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/ArrayResolvedType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/BooleanResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/BooleanResolvedType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/BooleanResolvedType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/BooleanResolvedType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/ClassNames.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/ClassNames.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/ClassNames.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/ClassNames.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/FunctionResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/FunctionResolvedType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/FunctionResolvedType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/FunctionResolvedType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/GenericObjectResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/GenericObjectResolvedType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/GenericObjectResolvedType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/GenericObjectResolvedType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/NativeModuleResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/NativeModuleResolvedType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/NativeModuleResolvedType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/NativeModuleResolvedType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/NullableResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/NullableResolvedType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/NullableResolvedType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/NullableResolvedType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/NumberResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/NumberResolvedType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/NumberResolvedType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/NumberResolvedType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/ObjectResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/ObjectResolvedType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/ObjectResolvedType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/ObjectResolvedType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/PromiseResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/PromiseResolvedType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/PromiseResolvedType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/PromiseResolvedType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/ReactClassNames.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/ReactClassNames.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/ReactClassNames.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/ReactClassNames.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/ReservedFunctionValueResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/ReservedFunctionValueResolvedType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/ReservedFunctionValueResolvedType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/ReservedFunctionValueResolvedType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/ResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/ResolvedType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/ResolvedType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/ResolvedType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/StringResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/StringResolvedType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/StringResolvedType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/StringResolvedType.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/TypeResolver.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/TypeResolver.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/TypeResolver.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/TypeResolver.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/TypeUtils.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/TypeUtils.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/TypeUtils.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/TypeUtils.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/VoidResolvedType.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/VoidResolvedType.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/resolver/VoidResolvedType.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/generator/resolver/VoidResolvedType.java 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/src/main/java/com/facebook/react/codegen/plugin/CodegenPlugin.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/plugin/CodegenPlugin.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/plugin/CodegenPlugin.java diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/plugin/CodegenPluginExtension.java b/packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/plugin/CodegenPluginExtension.java similarity index 100% rename from packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/plugin/CodegenPluginExtension.java rename to packages/react-native-codegen/android/src/main/java/com/facebook/react/codegen/plugin/CodegenPluginExtension.java