From cea5f2ef395018603579fed20d8ce39577183e3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Fri, 15 Nov 2019 12:45:24 +0100 Subject: [PATCH 1/2] fix: jsAppDir on windows --- packages/platform-android/native_modules.gradle | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/platform-android/native_modules.gradle b/packages/platform-android/native_modules.gradle index 015d7b137..627003981 100644 --- a/packages/platform-android/native_modules.gradle +++ b/packages/platform-android/native_modules.gradle @@ -2,7 +2,11 @@ import groovy.json.JsonSlurper import org.gradle.initialization.DefaultSettings import org.apache.tools.ant.taskdefs.condition.Os -def jsAppDir = buildscript.sourceFile.toString().split("node_modules/@react-native-community/cli-platform-android")[0] +def sourceFile = buildscript.sourceFile.toString() +def platformAndroidDir = Os.isFamily(Os.FAMILY_WINDOWS) + ? "node_modules\\@react-native-community\\cli-platform-android" + : "node_modules/@react-native-community/cli-platform-android" +def jsAppDir = sourceFile.split(platformAndroidDir)[0] def generatedFileName = "PackageList.java" def generatedFilePackage = "com.facebook.react" def generatedFileContentsTemplate = """ From 49f1015eda1665339a0218c5336bdfba57c6b026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Fri, 15 Nov 2019 13:43:46 +0100 Subject: [PATCH 2/2] use regex --- packages/platform-android/native_modules.gradle | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/platform-android/native_modules.gradle b/packages/platform-android/native_modules.gradle index 627003981..85d65d7e6 100644 --- a/packages/platform-android/native_modules.gradle +++ b/packages/platform-android/native_modules.gradle @@ -2,11 +2,7 @@ import groovy.json.JsonSlurper import org.gradle.initialization.DefaultSettings import org.apache.tools.ant.taskdefs.condition.Os -def sourceFile = buildscript.sourceFile.toString() -def platformAndroidDir = Os.isFamily(Os.FAMILY_WINDOWS) - ? "node_modules\\@react-native-community\\cli-platform-android" - : "node_modules/@react-native-community/cli-platform-android" -def jsAppDir = sourceFile.split(platformAndroidDir)[0] +def jsAppDir = buildscript.sourceFile.toString().split("node_modules(/|\\\\)@react-native-community(/|\\\\)cli-platform-android")[0] def generatedFileName = "PackageList.java" def generatedFilePackage = "com.facebook.react" def generatedFileContentsTemplate = """