Skip to content

Fix: type safety in Android build configuration for React Native directory resolution #9652

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

Open
benjaminpeters wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: type safety in Android build configuration for React Native directory resolution #9652

Show file tree
Hide file tree
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
10 changes: 7 additions & 3 deletions packages/react-native-reanimated/android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,13 @@ fun safeAppExtGet(prop: String, fallback: Any?): Any? {
}

fun resolveReactNativeDirectory(): File {
val reactNativeLocation = safeAppExtGet("REACT_NATIVE_NODE_MODULES_DIR", null) as String?
if (reactNativeLocation != null) {
return file(reactNativeLocation)
val reactNativeLocationProperty = safeAppExtGet("REACT_NATIVE_NODE_MODULES_DIR", null)
if (reactNativeLocationProperty != null) {
return when (reactNativeLocationProperty) {
is File -> reactNativeLocationProperty
is String -> file(reactNativeLocationProperty)
else -> file(reactNativeLocationProperty.toString())
}
}

// Fallback to node resolver for custom directory structures like monorepos.
Expand Down
10 changes: 7 additions & 3 deletions packages/react-native-worklets/android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,13 @@ fun safeAppExtGet(prop: String, fallback: Any?): Any? {
}

fun resolveReactNativeDirectory(): File {
val reactNativeLocation = safeAppExtGet("REACT_NATIVE_NODE_MODULES_DIR", null) as String?
if (reactNativeLocation != null) {
return file(reactNativeLocation)
val reactNativeLocationProperty = safeAppExtGet("REACT_NATIVE_NODE_MODULES_DIR", null)
if (reactNativeLocationProperty != null) {
return when (reactNativeLocationProperty) {
is File -> reactNativeLocationProperty
is String -> file(reactNativeLocationProperty)
else -> file(reactNativeLocationProperty.toString())
}
}

// Fallback to node resolver for custom directory structures like monorepos.
Expand Down