From 65522547fd453127058b266e7b78aee2f326493b Mon Sep 17 00:00:00 2001 From: Anandraj Govindan Date: Tue, 1 Nov 2022 14:37:14 -0700 Subject: [PATCH 1/4] Fixing the paths to be windows friendly --- packages/cli-platform-android/src/config/index.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/cli-platform-android/src/config/index.ts b/packages/cli-platform-android/src/config/index.ts index 1dc0d1e0e..39cf6f3a0 100644 --- a/packages/cli-platform-android/src/config/index.ts +++ b/packages/cli-platform-android/src/config/index.ts @@ -132,10 +132,12 @@ export function dependencyConfig( const androidMkPath = userConfig.androidMkPath ? path.join(sourceDir, userConfig.androidMkPath) : path.join(sourceDir, 'build/generated/source/codegen/jni/Android.mk'); - const cmakeListsPath = userConfig.cmakeListsPath + let cmakeListsPath = userConfig.cmakeListsPath ? path.join(sourceDir, userConfig.cmakeListsPath) : path.join(sourceDir, 'build/generated/source/codegen/jni/CMakeLists.txt'); - + if(process.platform == "win32") { + cmakeListsPath = cmakeListsPath.replaceAll("\\", "/") + } return { sourceDir, packageImportPath, From 3e0a903a524eb329e74d7da3152749f261317e10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Fri, 4 Nov 2022 10:47:49 +0100 Subject: [PATCH 2/4] Update packages/cli-platform-android/src/config/index.ts Co-authored-by: Tommy Nguyen <4123478+tido64@users.noreply.github.com> --- packages/cli-platform-android/src/config/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli-platform-android/src/config/index.ts b/packages/cli-platform-android/src/config/index.ts index 39cf6f3a0..0de995106 100644 --- a/packages/cli-platform-android/src/config/index.ts +++ b/packages/cli-platform-android/src/config/index.ts @@ -136,7 +136,7 @@ export function dependencyConfig( ? path.join(sourceDir, userConfig.cmakeListsPath) : path.join(sourceDir, 'build/generated/source/codegen/jni/CMakeLists.txt'); if(process.platform == "win32") { - cmakeListsPath = cmakeListsPath.replaceAll("\\", "/") + cmakeListsPath = cmakeListsPath.replace(/\\/g, "/"); } return { sourceDir, From 1dde377158d2fd76716599f9b8955c33f5856bf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Fri, 4 Nov 2022 10:48:04 +0100 Subject: [PATCH 3/4] Update packages/cli-platform-android/src/config/index.ts --- packages/cli-platform-android/src/config/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli-platform-android/src/config/index.ts b/packages/cli-platform-android/src/config/index.ts index 0de995106..355e5aab7 100644 --- a/packages/cli-platform-android/src/config/index.ts +++ b/packages/cli-platform-android/src/config/index.ts @@ -135,7 +135,7 @@ export function dependencyConfig( let cmakeListsPath = userConfig.cmakeListsPath ? path.join(sourceDir, userConfig.cmakeListsPath) : path.join(sourceDir, 'build/generated/source/codegen/jni/CMakeLists.txt'); - if(process.platform == "win32") { + if (process.platform === "win32") { cmakeListsPath = cmakeListsPath.replace(/\\/g, "/"); } return { From 40819c055b17e1ced52b3bb421dfeef021ea48be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Fri, 4 Nov 2022 11:07:45 +0100 Subject: [PATCH 4/4] fix: lint --- packages/cli-platform-android/src/config/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/cli-platform-android/src/config/index.ts b/packages/cli-platform-android/src/config/index.ts index 355e5aab7..3ee3aac9f 100644 --- a/packages/cli-platform-android/src/config/index.ts +++ b/packages/cli-platform-android/src/config/index.ts @@ -135,8 +135,8 @@ export function dependencyConfig( let cmakeListsPath = userConfig.cmakeListsPath ? path.join(sourceDir, userConfig.cmakeListsPath) : path.join(sourceDir, 'build/generated/source/codegen/jni/CMakeLists.txt'); - if (process.platform === "win32") { - cmakeListsPath = cmakeListsPath.replace(/\\/g, "/"); + if (process.platform === 'win32') { + cmakeListsPath = cmakeListsPath.replace(/\\/g, '/'); } return { sourceDir,