Configure Java toolchains only when executing App configuration (#40757)

UNIDY2002 · facebook-github-bot · commit c7d969f31b1d · 2023-10-17T05:46:53.000-07:00
Summary: Fix #40560 ## Changelog: [ANDROID] [FIXED] - Ensure that `configureJavaToolChains` is only executed once during configuration Pull Request resolved: #40757 Test Plan: - Create a fresh `react-native@0.73.0-rc.1` project - Install `react-native-webview` - Apply [this patch](https://github.com/react-native-webview/react-native-webview/pull/3175/files) for `react-native-webview` (caused by another issue #40559) - Edit `android/gradle.properties` and set `newArchEnabled` to true - Build application - (Expected) Application fail to build - Apply this PR - (Expected) Application build successfully **Additional explanation:** According to the implementation of `configureJavaToolChains`, all the subprojects (both the app and the libraries) will have their toolchains setup in one execution of the method. Therefore, it is okay for the method to be invoked only when configuring the plugin for the app. On the other hand, invoking the method for more than one time will cause the issue stated in #40560. Reviewed By: cipolleschi Differential Revision: D50361871 Pulled By: cortinico fbshipit-source-id: bd5e18df97988122788d0482dba954e517a0cb5c
diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt
@@ -70,6 +70,7 @@ class ReactPlugin : Plugin<Project> {
       configureBuildConfigFieldsForApp(project, extension)
       configureDevPorts(project)
       configureBackwardCompatibilityReactMap(project)
+      configureJavaToolChains(project)
 
       project.extensions.getByType(AndroidComponentsExtension::class.java).apply {
         onVariants(selector().all()) { variant ->
@@ -80,13 +81,10 @@ class ReactPlugin : Plugin<Project> {
     }
 
     // Library Only Configuration
+    configureBuildConfigFieldsForLibraries(project)
     project.pluginManager.withPlugin("com.android.library") {
       configureCodegen(project, extension, rootExtension, isLibrary = true)
     }
-
-    // Library and App Configurations
-    configureJavaToolChains(project)
-    configureBuildConfigFieldsForLibraries(project)
   }
 
   private fun checkJvmVersion(project: Project) {

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ class ReactPlugin : Plugin<Project> {`
`70`	`70`	`configureBuildConfigFieldsForApp(project, extension)`
`71`	`71`	`configureDevPorts(project)`
`72`	`72`	`configureBackwardCompatibilityReactMap(project)`
	`73`	`+ configureJavaToolChains(project)`
`73`	`74`
`74`	`75`	`project.extensions.getByType(AndroidComponentsExtension::class.java).apply {`
`75`	`76`	`onVariants(selector().all()) { variant ->`
`@@ -80,13 +81,10 @@ class ReactPlugin : Plugin<Project> {`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`// Library Only Configuration`
	`84`	`+ configureBuildConfigFieldsForLibraries(project)`
`83`	`85`	`project.pluginManager.withPlugin("com.android.library") {`
`84`	`86`	`configureCodegen(project, extension, rootExtension, isLibrary = true)`
`85`	`87`	`}`
`86`		`-`
`87`		`- // Library and App Configurations`
`88`		`- configureJavaToolChains(project)`
`89`		`- configureBuildConfigFieldsForLibraries(project)`
`90`	`88`	`}`
`91`	`89`
`92`	`90`	`private fun checkJvmVersion(project: Project) {`