detox 20.9.0 → 21.0.0-rc.0

package/src/devices/common/drivers/ios/tools/AppleSimUtils.js

@@ -140,6 +140,9 @@ class AppleSimUtils {
 
   async launch(udid, bundleId, launchArgs, languageAndLocale) {
     const frameworkPath = await environment.getFrameworkPath();
+
+    delete launchArgs.detoxServer;
+
     const result = await this._launchMagically(frameworkPath, udid, bundleId, launchArgs, languageAndLocale);
     await this._printLoggingHint(udid, bundleId);
 
@@ -156,18 +159,6 @@ class AppleSimUtils {
     );
   }
 
-  async sendToHome(udid) {
-    if (await this._isSpringBoardInaccessible(udid)) {
-      // SpringBoard is not directly accessible by Simctl on iOS 16.0 and above, therefore we launch and terminate the
-      // Settings app instead. This sends the currently open app to the background and brings the home screen to the
-      // foreground.
-      await this._launchAndTerminateSettings(udid);
-      return;
-    }
-
-    await this._launchSpringBoard(udid);
-  }
-
   async _isSpringBoardInaccessible(udid) {
     const device = await this._findDeviceByUDID(udid);
     const majorIOSVersion = parseInt(device.os.version.split('.')[0]);

package/src/devices/runtime/RuntimeDevice.js

@@ -53,6 +53,7 @@ class RuntimeDevice {
     traceMethods(log, this, methodNames);
     wrapWithStackTraceCutter(this, methodNames);
 
+    this._isTestRunnerConnected = false;
     this._appsConfig = appsConfig;
     this._behaviorConfig = behaviorConfig;
     this._deviceConfig = deviceConfig;
@@ -157,8 +158,11 @@ class RuntimeDevice {
       this._processes[bundleId] = await this.deviceDriver.waitForAppLaunch(bundleId, this._prepareLaunchArgs(baseLaunchArgs), params.languageAndLocale);
     } else {
       this._processes[bundleId] = await this.deviceDriver.launchApp(bundleId, this._prepareLaunchArgs(baseLaunchArgs), params.languageAndLocale);
+      console.log('Launched app process:', this._processes[bundleId]);
       await this.deviceDriver.waitUntilReady();
+      console.log('wait for active');
       await this.deviceDriver.waitForActive();
+      console.log('App launched. Running test...');
     }
 
     await this._emitter.emit('appReady', {
@@ -362,6 +366,7 @@ class RuntimeDevice {
     }
     return this._currentApp;
   }
+
   async _sendPayload(key, params) {
     const payloadFilePath = this.deviceDriver.createPayloadFile(params);
     const payload = {

package/src/devices/runtime/drivers/DeviceDriverBase.js

@@ -112,6 +112,7 @@ class DeviceDriverBase {
   }
 
   async waitUntilReady() {
+    console.warn('DeviceDriverBase.waitUntilReady()');
     return await this.client.waitUntilReady();
   }
 

package/src/devices/runtime/drivers/ios/SimulatorDriver.js

@@ -6,11 +6,14 @@ const _ = require('lodash');
 
 const temporaryPath = require('../../../../artifacts/utils/temporaryPath');
 const DetoxRuntimeError = require('../../../../errors/DetoxRuntimeError');
+const environment = require('../../../../utils/environment');
 const getAbsoluteBinaryPath = require('../../../../utils/getAbsoluteBinaryPath');
-const log = require('../../../../utils/logger').child({ cat: 'device' });
+const log = require('../../../../utils/logger').child({ cat: 'driver' });
 const pressAnyKey = require('../../../../utils/pressAnyKey');
 
 const IosDriver = require('./IosDriver');
+const { launchXCUITest } = require('./XCUITestUtils');
+
 
 /**
  * @typedef SimulatorDriverDeps { DeviceDriverDeps }
@@ -25,6 +28,19 @@ const IosDriver = require('./IosDriver');
  * @property bootArgs { Object }
  */
 
+let SingletonPortToUsageMap = (function () {
+  let instance;
+
+  return {
+    getInstance: function () {
+      if (!instance) {
+        instance = {};
+      }
+      return instance;
+    }
+  };
+})();
+
 class SimulatorDriver extends IosDriver {
   /**
    * @param deps { SimulatorDriverDeps }
@@ -75,19 +91,53 @@ class SimulatorDriver extends IosDriver {
   }
 
   async launchApp(bundleId, launchArgs, languageAndLocale) {
+    const xcuitestRunnerPath = await environment.getXCUITestRunnerPath();
+
     const { udid } = this;
+    launchArgs = this.enrichArgs(launchArgs);
+
     await this.emitter.emit('beforeLaunchApp', { bundleId, deviceId: udid, launchArgs });
+
+    log.debug({ event: 'CLIENT_CONNECTED', params: { connected: this.client.isConnected } }, 'client connected: ' + this.client.isConnected);
+    if (!this.client.isConnected) {
+      await launchXCUITest(
+        xcuitestRunnerPath,
+        this.udid,
+        launchArgs.detoxServer,
+        launchArgs.detoxSessionId,
+        bundleId,
+        launchArgs.detoxDebugVisibility,
+        launchArgs.detoxDisableHierarchyDump,
+        _.findLast(launchArgs.detoxTestTargetServer.split(':'))
+      );
+    }
+
     const pid = await this._applesimutils.launch(udid, bundleId, launchArgs, languageAndLocale);
     await this.emitter.emit('launchApp', { bundleId, deviceId: udid, launchArgs, pid });
 
     return pid;
   }
 
+  enrichArgs(args) {
+    const detoxServerPort = _.findLast(args.detoxServer.split(':'));
+    const portToUsagesCountMap = SingletonPortToUsageMap.getInstance();
+    const portUsagesCount = portToUsagesCountMap[detoxServerPort] = (portToUsagesCountMap[detoxServerPort] || 0) + 1;
+    const testTargetPort = Number(detoxServerPort) + 1000 * portUsagesCount;
+
+    return {
+      ...args,
+      detoxTestTargetServer: `ws://localhost:${testTargetPort}`,
+    };
+  }
+
   async waitForAppLaunch(bundleId, launchArgs, languageAndLocale) {
     const { udid } = this;
 
+    launchArgs = this.enrichArgs(launchArgs);
+
     await this.emitter.emit('beforeLaunchApp', { bundleId, deviceId: udid, launchArgs });
 
+    // print xcuitest launch hint
     this._applesimutils.printLaunchHint(udid, bundleId, launchArgs, languageAndLocale);
     await pressAnyKey();
 
@@ -109,6 +159,12 @@ class SimulatorDriver extends IosDriver {
   async terminate(bundleId) {
     const { udid } = this;
     await this.emitter.emit('beforeTerminateApp', { deviceId: udid, bundleId });
+
+    await this.client.terminateIfNeeded();
+
+    // Sleep for 200 ms to allow the XCUITest to terminate gracefully.
+    await new Promise(resolve => setTimeout(resolve, 200));
+
     await this._applesimutils.terminate(udid, bundleId);
     await this.emitter.emit('terminateApp', { deviceId: udid, bundleId });
   }
@@ -134,7 +190,7 @@ class SimulatorDriver extends IosDriver {
   }
 
   async sendToHome() {
-    await this._applesimutils.sendToHome(this.udid);
+    return await this.client.sendToHome();
   }
 
   async setLocation(lat, lon) {

package/src/devices/runtime/drivers/ios/XCUITestUtils.js

@@ -0,0 +1,209 @@
+const { exec } = require('child-process-promise');
+const osascript = require('node-osascript');
+
+const { execWithRetriesAndLogs } = require('../../../../utils/childProcess');
+const log = require('../../../../utils/logger').child({ cat: 'device,xcuitest' });
+
+async function launchXCUITest(
+  xcuitestRunnerPath,
+  simulatorId,
+  detoxServer,
+  detoxSessionId,
+  bundleId,
+  debugVisibility,
+  disableDumpViewHierarchy,
+  testTargetServerPort
+) {
+  log.debug('[XCUITest] Launch was called');
+
+  await _runLaunchCommand(
+    xcuitestRunnerPath,
+    simulatorId,
+    detoxServer,
+    detoxSessionId,
+    bundleId,
+    debugVisibility,
+    disableDumpViewHierarchy,
+    testTargetServerPort
+  );
+
+  log.debug('[XCUITest] Launch succeeded');
+}
+
+async function _runLaunchCommand(
+  xcuitestRunnerPath,
+  simulatorId,
+  detoxServer,
+  detoxSessionId,
+  bundleId,
+  debugVisibility,
+  disableDumpViewHierarchy,
+  testTargetServerPort
+) {
+  log.info(`Launching XUICTest runner. See target logs using:\n` +
+    `\t/usr/bin/xcrun simctl spawn ${simulatorId} log stream --level debug --style compact ` +
+    `--predicate 'process == "DetoxTester-Runner" && subsystem == "com.wix.DetoxTester.xctrunner"'`);
+
+  const spawnedProcess = runXCUITest(
+    xcuitestRunnerPath,
+    simulatorId,
+    detoxServer,
+    detoxSessionId,
+    testTargetServerPort,
+    bundleId,
+    debugVisibility,
+    disableDumpViewHierarchy
+  ).then(r => {
+    log.info(`[XCUITest] XCUITest runner execution finished`);
+  }).catch(e => {
+    log.error(`[XCUITest] xcodebuild error has occurred during XCUITest execution:\n${e}`);
+  });
+
+  // Get firewall global state (Firewall socketfilterfw):
+  const state = await exec(`/usr/libexec/ApplicationFirewall/socketfilterfw --getglobalstate`);
+  const isFirewallDisabled = state.stdout.toString().includes('Firewall is disabled');
+  if (!isFirewallDisabled) {
+    _allowNetworkPermissionsXCUITest();
+  }
+
+  const isServerUp = await _waitForTestTargetServerToStart(testTargetServerPort, spawnedProcess);
+  log.debug(`[XCUITest] Finished waiting for test target server to start, server is up: ${isServerUp}`);
+}
+
+function runXCUITest(
+  xcuitestRunnerPath,
+  simulatorId,
+  detoxServer,
+  detoxSessionId,
+  testTargetServerPort,
+  bundleId,
+  debugVisibility,
+  disableDumpViewHierarchy,
+) {
+  log.debug(`[XCUITest] Running xcodebuild test with bundle id: ${bundleId}`);
+  let xcodebuildBinary = 'xcodebuild';
+  const flags = [
+    '-xctestrun', xcuitestRunnerPath,
+    '-sdk', 'iphonesimulator',
+    '-allowProvisioningUpdates',
+    '-destination', `platform=iOS Simulator,id=${simulatorId}`,
+    'test-without-building'
+  ];
+
+  const env = {
+    TEST_RUNNER_IS_DETOX_ACTIVE: '1',
+    TEST_RUNNER_DETOX_SERVER: detoxServer,
+    TEST_RUNNER_DETOX_SESSION_ID: detoxSessionId,
+    TEST_RUNNER_TEST_TARGET_SERVER_PORT: testTargetServerPort,
+    TEST_RUNNER_BUNDLE_ID: bundleId,
+    TEST_RUNNER_DETOX_DEBUG_VISIBILITY: debugVisibility,
+    TEST_RUNNER_DETOX_DISABLE_VIEW_HIERARCHY_DUMP: disableDumpViewHierarchy
+  };
+
+  const options = {
+    maxBuffer: 1024 * 1024 * 1024,
+    retries: 1,
+    verbosity: 'high',
+  };
+
+  const command = `${env.TEST_RUNNER_IS_DETOX_ACTIVE ? Object.keys(env).map(key => `${key}=${env[key]}`).join(' ') : ''} ${xcodebuildBinary} ${flags.map(flag => flag.includes(' ') ? `"${flag}"` : flag).join(' ')}`;
+  log.debug(`[XCUITest] Running command: ${command}`);
+
+  // TODO: consider using this instead of the Terminal approach below.
+  // const isRunningOnTerminal = process.stdout.isTTY;
+  // if (isRunningOnTerminal === true) {
+  //   return execWithRetriesAndLogs(command, options);
+  // }
+  //
+  // log.info(`[XCUITest] Currently not running through the Terminal, will run the xcodebuild command on the Terminal`);
+  return _runCommandInTerminal(command, options);
+}
+
+function _runCommandInTerminal(command, options) {
+  const escapedCommand = command.replace(/"/g, '\\"'); // escape double quotes
+
+  // opens the Terminal app and runs the command in a new window, then closes the window when the command is done running.
+  const appleScript = `
+        tell application "Terminal"
+            if not running then
+                open
+            end if
+
+            activate
+            do script "${escapedCommand}; exit"
+
+            repeat
+                delay 1
+                if not busy of window 1 then
+                    close window 1
+                    exit repeat
+                end if
+            end repeat
+        end tell
+    `;
+
+  return execWithRetriesAndLogs(`osascript -e '${appleScript}'`, options);
+}
+
+function _allowNetworkPermissionsXCUITest() {
+  log.debug(`[XCUITest] Allowing network permissions`);
+  let didCallback = false;
+
+  const childProcess = osascript.executeFile(
+    `${__dirname}/allowNetworkPermissionsXCUITest.scpt`,
+    function(err, _, __) {
+      if (err) {
+        log.error(`[XCUITest] Failed to approve network permissions for XCUITest target:\n\t${err}`);
+      } else {
+        log.debug(`[XCUITest] Network permissions are allowed`);
+      }
+
+      didCallback = true;
+    });
+
+  setTimeout(() => {
+    if (didCallback || !childProcess) {
+      return;
+    }
+
+    log.debug(`[XCUITest] Killing the process that allows network permissions (timed-out)`);
+    childProcess.stdin.pause();
+    childProcess.kill('SIGTERM');
+
+  }, 30000);
+}
+
+async function _waitForTestTargetServerToStart(testTargetServerPort, cpPromise) {
+  log.debug(`[XCUITest] Waiting for test target server to start on port ${testTargetServerPort}...`);
+  let isServerUp = false;
+  let retries = 0;
+
+  while (!isServerUp && retries++ < 90) {
+    try {
+      await exec(`nc -z localhost ${testTargetServerPort}`);
+      isServerUp = true;
+    } catch (e) {
+      log.debug(`[XCUITest] Test target server is not up yet, waiting...`);
+      await new Promise(resolve => setTimeout(resolve, 1000));
+    }
+  }
+
+  if (!isServerUp) {
+    log.error(`[XCUITest] Test target server is not up after 90 seconds, aborting`);
+
+    if (cpPromise.childProcess.kill('SIGTERM')) {
+      log.debug(`[XCUITest] Test target process was killed`);
+    } else {
+      log.debug(`[XCUITest] Test target process was not killed`);
+    }
+
+    return false;
+  }
+
+  log.debug(`[XCUITest] Test target server is up and running`);
+  return true;
+}
+
+module.exports = {
+  launchXCUITest
+};

package/src/devices/runtime/drivers/ios/allowNetworkPermissionsXCUITest.scpt

@@ -0,0 +1,14 @@
+tell application "System Events"
+    set frontmost of process "UserNotificationCenter" to true
+    tell process "UserNotificationCenter"
+        repeat until (exists button "Allow" of window 1)
+            delay 1
+        end repeat
+
+        repeat while exists button "Allow" of window 1
+            if exists button "Allow" of window 1 then
+                click button "Allow" of window 1
+            end if
+        end repeat
+    end tell
+end tell

package/src/realms/DetoxPrimaryContext.js

@@ -51,7 +51,8 @@ class DetoxPrimaryContext extends DetoxContext {
     }
   }
 
-  async [symbols.resolveConfig](opts = {}) {
+  async [symbols.resolveConfig](opts = { argv: { configuration: process.env.DETOX_DBG_SELECTED_CFG } })
+  {
     const session = this[$sessionState];
     if (!session.detoxConfig) {
       const configuration = require('../configuration');

package/src/server/DetoxSession.js

@@ -61,6 +61,7 @@ class DetoxSession {
   }
 
   notify() {
+    console.log(`notify: pendingAppStatus=${this._pendingAppStatus}, pendingTesterStatus=${this._pendingTesterStatus}\n\n`);
     if (this._pendingTesterStatus === true) {
       this._notifyAboutTesterConnect();
     }
@@ -121,8 +122,10 @@ class DetoxSession {
 
   _notifyAboutAppConnect() {
     log.trace(`app joined session ${this.id}`);
+    console.log(`app joined session ${this.id}`);
 
     if (!this._tester) {
+      console.warn(`app joined session ${this.id} without a tester`);
       return;
     }
 

package/src/server/DetoxSessionManager.js

@@ -40,6 +40,7 @@ class DetoxSessionManager {
    * @returns {DetoxSession}
    */
   registerSession(connection, { role, sessionId }) {
+    console.log('registerSession', role, sessionId);
     let session;
 
     if (this._assertConnectionIsNotInSession(connection)) {

package/src/server/handlers/AnonymousConnectionHandler.js

@@ -23,6 +23,7 @@ class AnonymousConnectionHandler {
   }
 
   _handleLoginAction(action) {
+    console.log(`[DetoxServer.js/LOGIN] role=${action.params.role}, sessionId=${action.params.sessionId}`);
     if (!action.params) {
       throw new DetoxRuntimeError({
         message: `Invalid login action received, it has no .params`,

package/src/utils/childProcess/exec.js

@@ -17,6 +17,7 @@ async function execWithRetriesAndLogs(bin, options = {}) {
     timeout = 0,
     statusLogs = {},
     verbosity = 'normal',
+    maxBuffer = 1024 * 1024,
   } = options;
 
   const trackingId = execsCounter.inc();
@@ -35,7 +36,7 @@ async function execWithRetriesAndLogs(bin, options = {}) {
       } else if (statusLogs.retrying) {
         _logExecRetrying(logger, cmd, tryNumber, lastError);
       }
-      result = await exec(cmd, { timeout });
+      result = await exec(cmd, { timeout, maxBuffer });
     });
   } catch (err) {
     const failReason = err.code == null && timeout > 0
@@ -126,6 +127,7 @@ async function execAsync(command) {
   const result = await exec(command);
   return _.trim(result.stdout);
 }
+
 module.exports = {
   execWithRetriesAndLogs,
   execAsync

package/src/utils/environment.js

@@ -188,7 +188,30 @@ async function getFrameworkPath() {
 async function _doGetFrameworkPath() {
   const detoxVersion = getDetoxVersion();
   const sha1 = (await exec(`(echo "${detoxVersion}" && xcodebuild -version) | shasum | awk '{print $1}'`)).stdout.trim();
-  return `${DETOX_LIBRARY_ROOT_PATH}/ios/${sha1}/Detox.framework`;
+  return `${DETOX_LIBRARY_ROOT_PATH}/ios/framework/${sha1}/Detox.framework`;
+}
+
+let _iosXCUITestRunnerPath;
+async function getXCUITestRunnerPath() {
+  if (!_iosXCUITestRunnerPath) {
+    _iosXCUITestRunnerPath = _doGetXCUITestRunnerPath();
+  }
+
+  return _iosXCUITestRunnerPath;
+}
+
+async function _doGetXCUITestRunnerPath() {
+  const detoxVersion = getDetoxVersion();
+  const sha1 = (await exec(`(echo "${detoxVersion}" && xcodebuild -version) | shasum | awk '{print $1}'`)).stdout.trim();
+
+  const derivedDataPath = `${DETOX_LIBRARY_ROOT_PATH}/ios/xcuitest-runner/${sha1}`;
+
+  const xctestrunPath = (await exec(`find ${derivedDataPath} -name "*.xctestrun" -print -quit`)).stdout.trim();
+  if (!xctestrunPath) {
+    throw new DetoxRuntimeError(`Failed to find .xctestrun file in ${derivedDataPath}`);
+  }
+
+  return xctestrunPath;
 }
 
 function getDetoxLibraryRootPath() {
@@ -226,6 +249,7 @@ module.exports = {
   getGmsaasPath,
   getDetoxVersion,
   getFrameworkPath,
+  getXCUITestRunnerPath,
   getAndroidSDKPath,
   getAndroidEmulatorPath,
   getDetoxLibraryRootPath,

package/src/validation/ios/IosSimulatorEnvValidator.js

@@ -8,14 +8,17 @@ class IosSimulatorEnvValidator extends EnvironmentValidatorBase {
   async validate() {
     const detoxFrameworkPath = await environment.getFrameworkPath();
 
-    if (!this._frameworkPathExists(detoxFrameworkPath)) {
+    if (!fs.existsSync(detoxFrameworkPath)) {
       throw new DetoxRuntimeError(`${detoxFrameworkPath} could not be found, this means either you changed a version of Xcode or Detox postinstall script was unsuccessful.
         To attempt a fix try running 'detox clean-framework-cache && detox build-framework-cache'`);
     }
-  }
 
-  _frameworkPathExists(detoxFrameworkPath) {
-    return fs.existsSync(detoxFrameworkPath);
+    const detoxXCUITestRunnerPath = await environment.getXCUITestRunnerPath();
+
+    if (!fs.existsSync(detoxXCUITestRunnerPath)) {
+      throw new DetoxRuntimeError(`${detoxXCUITestRunnerPath} could not be found, this means either you changed a version of Xcode or Detox postinstall script was unsuccessful.
+        To attempt a fix try running 'detox clean-xcuitest-cache && detox build-xcuitest-cache'`);
+    }
   }
 }
 

package/Detox-android/com/wix/detox/20.9.0/detox-20.9.0-javadoc.jar.md5

@@ -1 +0,0 @@
-12d1a9cfa955008ce7e6e8f43ef74da1

package/Detox-android/com/wix/detox/20.9.0/detox-20.9.0-javadoc.jar.sha1

@@ -1 +0,0 @@
-4c7895239a15b9acae9679a26667e27631a2be19

package/Detox-android/com/wix/detox/20.9.0/detox-20.9.0-javadoc.jar.sha256

@@ -1 +0,0 @@
-93cee9902249260f8f05a2659650938f4164b90daca144fc81a70b9263b36fa9

package/Detox-android/com/wix/detox/20.9.0/detox-20.9.0-javadoc.jar.sha512

@@ -1 +0,0 @@
-b65a42554b5d9a2eeac7d3b9001811f1e7a633b708b4dd841849a91eb7118f7ada259bb58700a08ec2d659b7035afead27aa800a9311a1514b00a04202bde7cb

package/Detox-android/com/wix/detox/20.9.0/detox-20.9.0-sources.jar.md5

@@ -1 +0,0 @@
-09f94e47a00171571d1738b4a3f75bb2

package/Detox-android/com/wix/detox/20.9.0/detox-20.9.0-sources.jar.sha1

@@ -1 +0,0 @@
-8e9ec0a0059796344f457b77b4474039c976fdee

package/Detox-android/com/wix/detox/20.9.0/detox-20.9.0-sources.jar.sha256

@@ -1 +0,0 @@
-121c023a311947235b10d14987a0de078f3760f9264ebe20ac061d47a334a376

package/Detox-android/com/wix/detox/20.9.0/detox-20.9.0-sources.jar.sha512

@@ -1 +0,0 @@
-544a899292284a949f905f8c181236b39319980180f28b20d4e6827c9bfc1e1d01564d7ad44ca014f15e38aa572f528c9886b9e1d8825a577b86cc21235134db

package/Detox-android/com/wix/detox/20.9.0/detox-20.9.0.pom.md5

@@ -1 +0,0 @@
-acd9cc7c446bdbec5e2ed126330f8178

package/Detox-android/com/wix/detox/20.9.0/detox-20.9.0.pom.sha1

@@ -1 +0,0 @@
-ec0e48ff2b6fb3fa8a114a10fab451a8386a1528

package/Detox-android/com/wix/detox/20.9.0/detox-20.9.0.pom.sha256

@@ -1 +0,0 @@
-da04b622faa4f09ebc5395c8177812e905c42836f489147046d394e2f33aa7b3

package/Detox-android/com/wix/detox/20.9.0/detox-20.9.0.pom.sha512

@@ -1 +0,0 @@
-86b45511393ffa8d74be60e343701a364698a95c6f12135ee6fb207b9190ef611f14b7db0e90334b6ab53faac783ec46164a03e2ebde217c5d75e3e86e3075f6

package/scripts/build_universal_framework.sh

@@ -1,14 +0,0 @@
-#!/bin/bash -e
-
-SCRIPTPATH="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
-
-XCODEVERSION=$(xcodebuild -version | grep -oEi "([0-9]*(\.[0-9]*)+)")
-if [ "${XCODEVERSION}" == "`echo -e "${XCODEVERSION}\n12.0" | sort --version-sort -r | head -n1`" ]; then
-  echo "Xcode 12 and above; using modern script for building the framework to support Apple Silicon"
-  FRAMEWORK_SCRIPT="build_universal_framework_modern.sh"
-else
-  echo "Xcode 11 and below; using legacy script for building"
-  FRAMEWORK_SCRIPT="build_universal_framework_legacy.sh"
-fi
-
-"${SCRIPTPATH}/${FRAMEWORK_SCRIPT}" "$@"

package/scripts/build_universal_framework_legacy.sh

@@ -1,76 +0,0 @@
-#!/bin/bash -e
-
-PROJECT=$1
-OUTPUT_DIR=$2
-CONFIGURATION=Release
-PROJECT_NAME=Detox
-
-set -e
-
-function remove_arch() {
-    lipo -create "${1}" "${2}" -output "${3}"
-}
-
-# Make sure the output directory exists
-
-mkdir -p "${OUTPUT_DIR}"
-rm -fr "${OUTPUT_DIR}/${PROJECT_NAME}.framework"
-
-TEMP_DIR=$(mktemp -d "$TMPDIR"DetoxBuild.XXXX)
-echo TEMP_DIR = "${TEMP_DIR}"
-
-# Step 0. Xcode version
-
-XCODEVERSION=$(xcodebuild -version | grep -oEi "([0-9]*(\.[0-9]*)+)")
-echo "Xcode ${XCODEVERSION}"
-USE_NEW_BUILD_SYSTEM="YES"
-if [ "${XCODEVERSION}" != "`echo -e "${XCODEVERSION}\n11.0" | sort --version-sort -r | head -n1`" ]; then
-  USE_NEW_BUILD_SYSTEM="NO"
-fi
-echo "Using -UseNewBuildSystem=${USE_NEW_BUILD_SYSTEM}"
-
-# Step 1. Build Device and Simulator versions
-
-BUILD_IOS=`xcodebuild -project "${PROJECT}" -UseNewBuildSystem=${USE_NEW_BUILD_SYSTEM} -scheme Detox -configuration "${CONFIGURATION}" -arch arm64  -sdk iphoneos        ONLY_ACTIVE_ARCH=NO VALID_ARCHS=arm64  -showBuildSettings  | awk -F= '/TARGET_BUILD_DIR/{x=$NF; gsub(/^[ \t]+|[ \t]+$/,"",x); print x}'`
-BUILD_SIM=`xcodebuild -project "${PROJECT}" -UseNewBuildSystem=${USE_NEW_BUILD_SYSTEM} -scheme Detox -configuration "${CONFIGURATION}" -arch x86_64 -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO VALID_ARCHS=x86_64 -showBuildSettings  | awk -F= '/TARGET_BUILD_DIR/{x=$NF; gsub(/^[ \t]+|[ \t]+$/,"",x); print x}'`
-
-echo ${BUILD_IOS}
-echo ${BUILD_SIM}
-
-xcodebuild -project "${PROJECT}" -UseNewBuildSystem=${USE_NEW_BUILD_SYSTEM} -scheme Detox -configuration "${CONFIGURATION}" -arch arm64  -sdk iphoneos        ONLY_ACTIVE_ARCH=NO clean build VALID_ARCHS=arm64 -quiet
-xcodebuild -project "${PROJECT}" -UseNewBuildSystem=${USE_NEW_BUILD_SYSTEM} -scheme Detox -configuration "${CONFIGURATION}" -arch x86_64 -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO       build VALID_ARCHS=x86_64 -quiet
-
-# Step 2. Copy the framework structure (from iphoneos build) to the universal folder
-
-cp -fR "${BUILD_IOS}/${PROJECT_NAME}.framework" "${TEMP_DIR}/"
-
-# Step 3. Copy Swift modules from iphonesimulator build (if it exists) to the copied framework directory
-
-SIMULATOR_SWIFT_MODULES_DIR="${BUILD_SIM}/${PROJECT_NAME}.framework/Modules/${PROJECT_NAME}.swiftmodule/."
-if [ -d "${SIMULATOR_SWIFT_MODULES_DIR}" ]; then
-cp -fR "${SIMULATOR_SWIFT_MODULES_DIR}" "${TEMP_DIR}/${PROJECT_NAME}.framework/Modules/${PROJECT_NAME}.swiftmodule"
-fi
-
-# Step 4. Create universal binary file using lipo and place the combined executable in the copied framework directory
-
-remove_arch "${BUILD_SIM}/${PROJECT_NAME}.framework/${PROJECT_NAME}" "${BUILD_IOS}/${PROJECT_NAME}.framework/${PROJECT_NAME}" "${TEMP_DIR}/${PROJECT_NAME}.framework/${PROJECT_NAME}"
-
-# Step 5. Create universal binaries for embedded frameworks
-
-for SUB_FRAMEWORK in $( ls "${TEMP_DIR}/${PROJECT_NAME}.framework/Frameworks" ); do
-if [ -d "${TEMP_DIR}/${PROJECT_NAME}.framework/Frameworks/$SUB_FRAMEWORK" ]; then
-echo "Processing ${SUB_FRAMEWORK} as a dir"
-BINARY_NAME="${SUB_FRAMEWORK%.*}"
-
-remove_arch "${BUILD_SIM}/${PROJECT_NAME}.framework/Frameworks/${SUB_FRAMEWORK}/${BINARY_NAME}" "${BUILD_IOS}/${PROJECT_NAME}.framework/Frameworks/${SUB_FRAMEWORK}/${BINARY_NAME}" "${TEMP_DIR}/${PROJECT_NAME}.framework/Frameworks/${SUB_FRAMEWORK}/${BINARY_NAME}"
-
-else
-echo "Processing ${SUB_FRAMEWORK} as a file"
-
-remove_arch "${BUILD_SIM}/${PROJECT_NAME}.framework/Frameworks/${SUB_FRAMEWORK}" "${BUILD_IOS}/${PROJECT_NAME}.framework/Frameworks/${SUB_FRAMEWORK}" "${TEMP_DIR}/${PROJECT_NAME}.framework/Frameworks/${SUB_FRAMEWORK}"
-
-fi
-done
-
-mv "${TEMP_DIR}/${PROJECT_NAME}.framework" "${OUTPUT_DIR}"/
-rm -fr "${TEMP_DIR}"