Skip to content

fix: use relative paths for gradle exec invocations#36076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
shivenmian wants to merge 1 commit into from
Closed

fix: use relative paths for gradle exec invocations #36076

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions .../react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/BundleHermesCTask.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,7 @@ abstract class BundleHermesCTask : DefaultTask() {
runCommand(bundleCommand)

if (hermesEnabled.get()) {
val detectedHermesCommand = detectOSAwareHermesCommand(root.get().asFile, hermesCommand.get())
val detectedHermesCommand = File(detectOSAwareHermesCommand(root.get().asFile, hermesCommand.get())).relativeTo(root.get().asFile).path
val bytecodeFile = File("${bundleFile}.hbc")
val outputSourceMap = resolveOutputSourceMap(bundleAssetFilename)
val compilerSourceMap = resolveCompilerSourceMap(bundleAssetFilename)
Expand DownExpand Up@@ -136,24 +136,24 @@ abstract class BundleHermesCTask : DefaultTask() {
windowsAwareCommandLine(
buildList {
addAll(nodeExecutableAndArgs.get())
add(cliFile.get().asFile.absolutePath)
add(cliFile.get().asFile.relativeTo(root.get().asFile).path)
add(bundleCommand.get())
add("--platform")
add("android")
add("--dev")
add(devEnabled.get().toString())
add("--reset-cache")
add("--entry-file")
add(entryFile.get().asFile.toString())
add(entryFile.get().asFile.relativeTo(root.get().asFile).path)
add("--bundle-output")
add(bundleFile.toString())
add(bundleFile.relativeTo(root.get().asFile).path)
add("--assets-dest")
add(resourcesDir.get().asFile.toString())
add(resourcesDir.get().asFile.relativeTo(root.get().asFile).path)
add("--sourcemap-output")
add(sourceMapFile.toString())
add(sourceMapFile.relativeTo(root.get().asFile).path)
if (bundleConfig.isPresent) {
add("--config")
add(bundleConfig.get().asFile.absolutePath)
add(bundleConfig.get().asFile.relativeTo(root.get().asFile).path)
}
add("--minify")
add(minifyEnabled.get().toString())
Expand All@@ -170,8 +170,8 @@ abstract class BundleHermesCTask : DefaultTask() {
hermesCommand,
"-emit-binary",
"-out",
bytecodeFile.absolutePath,
bundleFile.absolutePath,
bytecodeFile.relativeTo(root.get().asFile).path,
bundleFile.relativeTo(root.get().asFile).path,
*hermesFlags.get().toTypedArray())

internal fun getComposeSourceMapsCommand(
Expand All@@ -182,9 +182,9 @@ abstract class BundleHermesCTask : DefaultTask() {
): List<Any> =
windowsAwareCommandLine(
*nodeExecutableAndArgs.get().toTypedArray(),
composeScript.absolutePath,
packagerSourceMap.toString(),
compilerSourceMap.toString(),
composeScript.relativeTo(root.get().asFile).path,
packagerSourceMap.relativeTo(root.get().asFile).path,
compilerSourceMap.relativeTo(root.get().asFile).path,
"-o",
outputSourceMap.toString())
outputSourceMap.relativeTo(root.get().asFile).path)
}