From d5047b7cf88e472c052e49c470df4bf8d64dd426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ignacy=20=C5=81=C4=85tka?= Date: Wed, 15 Jan 2025 12:20:49 +0100 Subject: [PATCH 1/3] removed unused project lookup --- android/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index cbd62e9ea4..42f48724d2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -119,7 +119,6 @@ android { buildConfigField "int", "REACT_NATIVE_MINOR_VERSION", REACT_NATIVE_MINOR_VERSION.toString() if (isNewArchitectureEnabled()) { - var appProject = rootProject.allprojects.find {it.plugins.hasPlugin('com.android.application')} externalNativeBuild { cmake { cppFlags "-O2", "-frtti", "-fexceptions", "-Wall", "-Werror", "-std=c++20", "-DANDROID" From 72eb32c0ce867cb7c8284546b411bae38d8baf3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ignacy=20=C5=81=C4=85tka?= Date: Wed, 15 Jan 2025 12:32:40 +0100 Subject: [PATCH 2/3] make task configuration lazy --- android/build.gradle | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 42f48724d2..1e68c5daf3 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -186,16 +186,18 @@ android { } if (isGHExampleApp()) { - tasks.withType(ExternalNativeBuildJsonTask) { - compileTask -> - compileTask.doLast { - def rootDir = new File("${project.projectDir}/..") - def generated = new File("${compileTask.abi.getCxxBuildFolder()}/compile_commands.json") - def output = new File("${rootDir}/compile_commands.json") - output.text = generated.text - - println("Generated clangd metadata.") - } + tasks.withType(ExternalNativeBuildJsonTask).tap { + configureEach { + compileTask -> + compileTask.doLast { + def rootDir = new File("${project.projectDir}/..") + def generated = new File("${compileTask.abi.getCxxBuildFolder()}/compile_commands.json") + def output = new File("${rootDir}/compile_commands.json") + output.text = generated.text + + println("Generated clangd metadata.") + } + } } } } From 5992c3b1701198246e28bf9b220a26d234a59ff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ignacy=20=C5=81=C4=85tka?= Date: Wed, 15 Jan 2025 13:52:24 +0100 Subject: [PATCH 3/3] switch to a gradle-specific syntax --- android/build.gradle | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 1e68c5daf3..bf8b35a5b6 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -186,18 +186,16 @@ android { } if (isGHExampleApp()) { - tasks.withType(ExternalNativeBuildJsonTask).tap { - configureEach { - compileTask -> - compileTask.doLast { - def rootDir = new File("${project.projectDir}/..") - def generated = new File("${compileTask.abi.getCxxBuildFolder()}/compile_commands.json") - def output = new File("${rootDir}/compile_commands.json") - output.text = generated.text - - println("Generated clangd metadata.") - } - } + tasks.withType(ExternalNativeBuildJsonTask).configureEach { + compileTask -> + compileTask.doLast { + def rootDir = new File("${project.projectDir}/..") + def generated = new File("${compileTask.abi.getCxxBuildFolder()}/compile_commands.json") + def output = new File("${rootDir}/compile_commands.json") + output.text = generated.text + + println("Generated clangd metadata.") + } } } }