From ad102deb1ffd2a62a3e9376b3266d72217cbc99e Mon Sep 17 00:00:00 2001 From: UNIDY2002 Date: Tue, 10 Oct 2023 09:16:54 +0800 Subject: [PATCH] Configure Java toolchains only when executing App configuration Fix #40560 --- .../src/main/kotlin/com/facebook/react/ReactPlugin.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 index 4c41e6a2373e07..f64aa685382766 100644 --- 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 { 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 { } // 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) {