fix cli and gradle location for windows

flexn-io · Dec 19, 2023 · 3459de2 · 3459de2
1 parent d547ad2
commit 3459de2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/packages/sdk-android/src/deviceManager.ts b/packages/sdk-android/src/deviceManager.ts
@@ -55,7 +55,10 @@ export const launchAndroidSimulator = async (
     target: true | { name: string } | string,
     isIndependentThread = false
 ) => {
-    logTask('launchAndroidSimulator', `target:${target} independentThread:${!!isIndependentThread}`);
+    logTask(
+        'launchAndroidSimulator',
+        `target:${typeof target === 'object' ? target?.name : target} independentThread:${!!isIndependentThread}`
+    );
     let newTarget: { name: string } | string;
     if (target === true) {
         const {

diff --git a/packages/sdk-android/src/gradleParser.ts b/packages/sdk-android/src/gradleParser.ts
@@ -523,9 +523,9 @@ export const parseSettingsGradleSync = (c: Context) => {
     const rnCliLocation = doResolve('@react-native-community/cli-platform-android', true, { forceForwardPaths: true });
     const rnGradlePluginLocation = doResolve('@react-native/gradle-plugin', true, { forceForwardPaths: true });
 
-    const rnCliRelativePath = (!!rnCliLocation && path.relative(appFolder, rnCliLocation)) || '';
+    const rnCliRelativePath = (!!rnCliLocation && path.relative(appFolder, rnCliLocation).replace(/\\/g, '/')) || '';
     const rnGradlePluginRelativePath =
-        (!!rnGradlePluginLocation && path.relative(appFolder, rnGradlePluginLocation)) || '';
+        (!!rnGradlePluginLocation && path.relative(appFolder, rnGradlePluginLocation).replace(/\\/g, '/')) || '';
 
     const injects = [
         {