fixups

Author: thymikee

packages/platform-apple-helpers/src/lib/commands/run/createRun.ts

@@ -107,7 +107,8 @@ export const createRun = async (
   );
 
   if (platformName === 'macos') {
-    if (!args.binaryPath) {
+    let appPath = args.binaryPath;
+    if (!appPath) {
       await buildProject({
         xcodeProject,
         sourceDir,
@@ -117,20 +118,21 @@ export const createRun = async (
         configuration,
         args,
       });
+      const buildSettings = await getBuildSettings(
+        xcodeProject,
+        sourceDir,
+        configuration,
+        getSimulatorPlatformSDK(platformName),
+        scheme
+      );
+      appPath = buildSettings.appPath;
     }
-    const buildSettings = await getBuildSettings(
-      xcodeProject,
-      sourceDir,
-      configuration,
-      getSimulatorPlatformSDK(platformName),
-      scheme
-    );
-    const appPath = args.binaryPath ?? buildSettings.appPath;
     await runOnMac(appPath);
     outro('Success 🎉.');
     return;
   } else if (args.catalyst) {
-    if (!args.binaryPath) {
+    let appPath = args.binaryPath;
+    if (!appPath) {
       await buildProject({
         xcodeProject,
         sourceDir,
@@ -140,15 +142,15 @@ export const createRun = async (
         configuration,
         args,
       });
+      const buildSettings = await getBuildSettings(
+        xcodeProject,
+        sourceDir,
+        configuration,
+        getSimulatorPlatformSDK(platformName),
+        scheme
+      );
+      appPath = buildSettings.appPath;
     }
-    const buildSettings = await getBuildSettings(
-      xcodeProject,
-      sourceDir,
-      configuration,
-      getSimulatorPlatformSDK(platformName),
-      scheme
-    );
-    const appPath = args.binaryPath ?? buildSettings.appPath;
     await runOnMacCatalyst(appPath, scheme);
     outro('Success 🎉.');
     return;
@@ -191,7 +193,8 @@ export const createRun = async (
       const infoPlistPath = buildSettings.infoPlistPath;
       await runOnSimulator(device, appPath, infoPlistPath);
     } else if (device.type === 'device') {
-      if (!args.binaryPath) {
+      let appPath = args.binaryPath;
+      if (!appPath) {
         await buildProject({
           xcodeProject,
           sourceDir,
@@ -201,15 +204,15 @@ export const createRun = async (
           configuration,
           args,
         });
+        const buildSettings = await getBuildSettings(
+          xcodeProject,
+          sourceDir,
+          configuration,
+          getDevicePlatformSDK(platformName),
+          scheme
+        );
+        appPath = buildSettings.appPath;
       }
-      const buildSettings = await getBuildSettings(
-        xcodeProject,
-        sourceDir,
-        configuration,
-        getDevicePlatformSDK(platformName),
-        scheme
-      );
-      const appPath = args.binaryPath ?? buildSettings.appPath;
       await runOnDevice(device, appPath, sourceDir);
     }
     outro('Success 🎉.');

packages/platform-apple-helpers/src/lib/commands/run/runOnSimulator.ts

@@ -41,7 +41,7 @@ export async function runOnSimulator(
   loader.stop(`Installed the app on "${device.name}".`);
 
   loader.start(`Launching the app on "${device.name}"`);
-  await launchAppOnSimulator(device.udid, infoPlistPath);
+  await launchAppOnSimulator(device.udid, binaryPath, infoPlistPath);
   loader.stop(`Launched the app on "${device.name}".`);
 }
 
@@ -65,9 +65,14 @@ export default async function installAppOnSimulator(
 
 export async function launchAppOnSimulator(
   udid: string,
+  binaryPath: string,
   infoPlistPath: string
 ) {
-  const bundleID = await readKeyFromPlist(infoPlistPath, 'CFBundleIdentifier');
+  const infoPlist = binaryPath
+    ? // @todo Info.plist is hardcoded when reading from binaryPath
+      path.join(binaryPath, 'Info.plist')
+    : infoPlistPath;
+  const bundleID = await readKeyFromPlist(infoPlist, 'CFBundleIdentifier');
   logger.debug(`Launching "${bundleID}"`);
   try {
     await spawn('xcrun', ['simctl', 'launch', udid, bundleID]);