Fix destination in buildProject (#2706)

* Fix destination in buildProject

Fix: Fix destination in buildProject when running with device arg but no specific UDID or args.destination

* Fix: Add missing device build flag

* Fix: Remove migrated device build flag

* Fix: JS copy-paste

* Update buildProject.ts

Review comment

* Update buildProject.ts

newline

* Update buildProject.ts

space

* Update buildProject.ts

fix lint

* Update getBuildSettings.ts

fix lint

* Update getBuildSettings.ts

fix lint

Author: jenskuhrjorgensen

packages/cli-platform-apple/src/commands/buildCommand/buildOptions.ts

@@ -13,6 +13,7 @@ export type BuildFlags = {
   extraParams?: string[];
   forcePods?: boolean;
   onlyPods?: boolean;
+  device?: string | true;
 };
 
 export const getBuildOptions = ({platformName}: BuilderCommand) => {

packages/cli-platform-apple/src/commands/buildCommand/buildProject.ts

@@ -52,6 +52,22 @@ export function buildProject(
       return;
     }
 
+    const isDevice = args.device;
+    let destination = '';
+    if (udid) {
+      destination = `id=${udid}`;
+    } else if (isDevice) {
+      destination = 'generic/platform=iOS';
+    } else if (mode === 'Debug') {
+      destination = `generic/platform=${simulatorDest}`;
+    } else {
+      destination = `generic/platform=${platform}`;
+    }
+
+    if (args.destination) {
+      destination += `,${args.destination}`;
+    }
+
     const xcodebuildArgs = [
       xcodeProject.isWorkspace ? '-workspace' : '-project',
       xcodeProject.name,
@@ -62,12 +78,7 @@ export function buildProject(
       '-scheme',
       scheme,
       '-destination',
-      (udid
-        ? `id=${udid}`
-        : mode === 'Debug'
-        ? `generic/platform=${simulatorDest}`
-        : `generic/platform=${platform}`) +
-        (args.destination ? ',' + args.destination : ''),
+      destination,
     ];
 
     if (args.extraParams) {

packages/cli-platform-apple/src/commands/runCommand/createRun.ts

@@ -39,7 +39,6 @@ import openApp from './openApp';
 
 export interface FlagsT extends BuildFlags {
   simulator?: string;
-  device?: string | true;
   udid?: string;
   binaryPath?: string;
   listDevices?: boolean;

packages/cli-platform-apple/src/commands/runCommand/getBuildSettings.ts

@@ -38,17 +38,13 @@ export async function getBuildSettings(
 
   // Find all 'app' targets in the build settings
   const applicationTargets = settings
-    .filter(
-      (setting: any) =>
-        setting.buildSettings.WRAPPER_EXTENSION ===
-        'app',
-    )
+    .filter((setting: any) => setting.buildSettings.WRAPPER_EXTENSION === 'app')
     .map(({target: settingsTarget}: any) => settingsTarget);
 
-  if (applicationTargets.length === 0) return null
-  
+  if (applicationTargets.length === 0) return null;
+
   let selectedTarget = applicationTargets[0];
-  
+
   if (target) {
     if (!applicationTargets.includes(target)) {
       logger.info(
@@ -60,7 +56,7 @@ export async function getBuildSettings(
       selectedTarget = target;
     }
   }
-  
+
   const targetIndex = applicationTargets.indexOf(selectedTarget);
   return settings[targetIndex].buildSettings;
 }