Skip to content

Commit b4dacdd

Browse files
authored
fix(android): resolve dependencies through react-native path (#1569)
1 parent 0a0f1df commit b4dacdd

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

test-app.gradle

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ if (findNodeModulesPath("@expo/config-plugins", rootDir)) {
3333
applyConfigPlugins(testAppDir, rootDir)
3434
}
3535

36-
def cliAndroidDir = findNodeModulesPath("@react-native-community/cli-platform-android", rootDir)
36+
def reactNativeDir = file(findNodeModulesPath("react-native", rootDir))
37+
def cliAndroidDir = findNodeModulesPath("@react-native-community/cli-platform-android", reactNativeDir)
3738
apply(from: "${cliAndroidDir}/native_modules.gradle")
3839

3940
ext.applyTestAppSettings = { DefaultSettings settings ->
@@ -46,8 +47,8 @@ ext.applyTestAppSettings = { DefaultSettings settings ->
4647
.projectDir = file("${testAppDir}/android/support")
4748

4849
def reactNativeGradlePlugin =
49-
findNodeModulesPath("@react-native/gradle-plugin", settings.rootDir) // >= 0.72
50-
?: findNodeModulesPath("react-native-gradle-plugin", settings.rootDir) // < 0.72
50+
findNodeModulesPath("@react-native/gradle-plugin", reactNativeDir) // >= 0.72
51+
?: findNodeModulesPath("react-native-gradle-plugin", reactNativeDir) // < 0.72
5152
if (reactNativeGradlePlugin != null) {
5253
settings.includeBuild(reactNativeGradlePlugin)
5354
}
@@ -58,8 +59,6 @@ ext.applyTestAppSettings = { DefaultSettings settings ->
5859
def usePrefabs = reactNativeVersion == 0 || reactNativeVersion >= 7100
5960

6061
if (isNewArchitectureEnabled(settings) && !usePrefabs) {
61-
def reactNativeDir = findNodeModulesPath("react-native", settings.rootDir)
62-
6362
settings.include(":ReactAndroid")
6463
settings.project(":ReactAndroid")
6564
.projectDir = file("${reactNativeDir}/ReactAndroid")

0 commit comments

Comments
 (0)