Merge remote-tracking branch 'origin/main'

Author: farfromrefug

lib/definitions/project.d.ts

@@ -104,6 +104,7 @@ interface INsConfigPlaform {
 interface INsConfigIOS extends INsConfigPlaform {
 	discardUncaughtJsExceptions?: boolean;
 	runtimePackageName?: string
+	cocoapodUseBundleExec?: boolean
 }
 
 interface INSConfigVisionOS extends INsConfigIOS {}

lib/services/cocoapods-service.ts

@@ -35,7 +35,8 @@ export class CocoaPodsService implements ICocoaPodsService {
 		private $logger: ILogger,
 		private $config: IConfiguration,
 		private $xcconfigService: IXcconfigService,
-		private $xcodeSelectService: XcodeSelectService
+		private $xcodeSelectService: XcodeSelectService,
+		private $projectData: IProjectData,
 	) {
 		this.getCocoaPodsFromPodfile = _.memoize(
 			this._getCocoaPodsFromPodfile,
@@ -59,8 +60,12 @@ export class CocoaPodsService implements ICocoaPodsService {
 		projectRoot: string,
 		xcodeProjPath: string
 	): Promise<ISpawnResult> {
-		this.$logger.info("Installing pods...");
+		const cocoapodUseBundleExec = this.$projectData.nsConfig.ios?.cocoapodUseBundleExec;
 		let podTool = this.$config.USE_POD_SANDBOX ? "sandbox-pod" : "pod";
+		if (cocoapodUseBundleExec === true) {
+			podTool = `bundle exec ${podTool}`
+		}
+		this.$logger.info(`Installing pods using "${podTool}"...`);
 		const args = ["install"];
 
 		if (process.platform === "darwin" && process.arch === "arm64") {
@@ -71,7 +76,7 @@ export class CocoaPodsService implements ICocoaPodsService {
 			// arch: posix_spawnp: pod: Bad CPU type in executable
 			// in which case, we should run it natively.
 			const res: string = await this.$childProcess
-				.exec("arch -x86_64 pod --version", null, {
+				.exec(`arch -x86_64 ${podTool} --version`, null, {
 					showStderr: true,
 				})
 				.then((res) => res.stdout + " " + res.stderr)

lib/services/project-data-service.ts

@@ -625,24 +625,21 @@ export class ProjectDataService implements IProjectDataService {
 		projectDir: string,
 		platform: constants.SupportedPlatform
 	): IBasePluginData {
+		console.log('getInstalledRuntimePackage');
+		let packageName: string[] = [];
+		if (platform === constants.PlatformTypes.ios) {
+			packageName.push(this.$projectData.nsConfig.ios?.runtimePackageName, constants.SCOPED_IOS_RUNTIME_NAME, constants.TNS_IOS_RUNTIME_NAME);
+			
+		} else if (platform === constants.PlatformTypes.android) {
+			packageName.push(this.$projectData.nsConfig.android?.runtimePackageName, constants.SCOPED_ANDROID_RUNTIME_NAME, constants.TNS_IOS_RUNTIME_NAME);
+		} else if (platform === constants.PlatformTypes.visionos) {
+			packageName.push(constants.SCOPED_VISIONOS_RUNTIME_NAME);
+		}
 		const runtimePackage = this.$pluginsService
 			.getDependenciesFromPackageJson(projectDir)
 			.devDependencies.find((d) => {
-				if (platform === constants.PlatformTypes.ios) {
-					const packageName = this.$projectData.nsConfig.ios?.runtimePackageName || constants.SCOPED_IOS_RUNTIME_NAME;
-					return [
-						packageName,
-						constants.TNS_IOS_RUNTIME_NAME,
-					].includes(d.name);
-				} else if (platform === constants.PlatformTypes.android) {
-					const packageName = this.$projectData.nsConfig.android?.runtimePackageName || constants.SCOPED_ANDROID_RUNTIME_NAME;
-					return [
-						packageName,
-						constants.TNS_ANDROID_RUNTIME_NAME,
-					].includes(d.name);
-				} else if (platform === constants.PlatformTypes.visionos) {
-					return d.name === constants.SCOPED_VISIONOS_RUNTIME_NAME;
-				}
+				return packageName.includes(d.name);
+				
 			});
 
 		if (runtimePackage) {