detox 21.0.0-breaking.new-global-lifecycle.0 → 21.0.1-rc.0

package/src/utils/childProcess/exec.js

@@ -3,7 +3,7 @@ const { exec } = require('child-process-promise');
 const _ = require('lodash');
 
 const DetoxRuntimeError = require('../../errors/DetoxRuntimeError');
-const rootLogger = require('../logger').child({ __filename });
+const rootLogger = require('../logger').child({ cat: ['child-process', 'child-process-exec'] });
 const retry = require('../retry');
 
 const execsCounter = require('./opsCounter');
@@ -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/childProcess/spawn.js

@@ -2,7 +2,7 @@
 const { spawn } = require('child-process-promise');
 const _ = require('lodash');
 
-const rootLogger = require('../logger').child({ __filename });
+const rootLogger = require('../logger').child({ cat: ['child-process', 'child-process-spawn'] });
 const { escape } = require('../pipeCommands');
 const retry = require('../retry');
 

package/src/utils/dateUtils.js

@@ -10,6 +10,11 @@ function shortFormat(date) {
   return `${HH}:${MM}:${ss}.${milli}`;
 }
 
+function removeMilliseconds(isoDate) {
+  return isoDate.replace(/(T\d\d:\d\d:\d\d)(\.\d\d\d)/, '$1');
+}
+
 module.exports = {
   shortFormat,
+  removeMilliseconds,
 };

package/src/utils/environment.js

@@ -78,7 +78,7 @@ function getAndroidEmulatorPath() {
     return legacyPath;
   }
 
-  throwSdkIntegrityError(sdkRoot, 'emulator/emulator');
+  throwSdkBinIntegrityError(sdkRoot, 'emulator/emulator');
 }
 
 async function getAaptPath() {
@@ -88,23 +88,33 @@ async function getAaptPath() {
   }
 
   const latestBuildTools = await getLatestBuildToolsPath(sdkRoot);
-  const defaultPath = latestBuildTools && which('aapt', latestBuildTools);
+  if (!latestBuildTools) {
+    throwSdkIntegrityError('Failed to find the "aapt" tool under the Android SDK: No build-tools are installed!');
+  }
+
+  const defaultPath = which('aapt', latestBuildTools);
   if (defaultPath) {
     return defaultPath;
   }
 
-  throwSdkIntegrityError(sdkRoot, `${latestBuildTools}/aapt`);
+  throwSdkToolPathError(`${latestBuildTools}/aapt`);
 }
 
 async function getLatestBuildToolsPath(sdkRoot) {
-  if (!sdkRoot) return '';
+  if (!sdkRoot) {
+    return '';
+  }
 
   const buildToolsDir = path.join(sdkRoot, 'build-tools');
-  if (!fs.existsSync(buildToolsDir)) return '';
+  if (!fs.existsSync(buildToolsDir)) {
+    return '';
+  }
 
   const buildToolsVersions = await fsext.getDirectories(buildToolsDir);
   const latestBuildToolsVersion = _.last(buildToolsVersions);
-  if (!latestBuildToolsVersion) return '';
+  if (!latestBuildToolsVersion) {
+    return '';
+  }
 
   return path.join(buildToolsDir, latestBuildToolsVersion);
 }
@@ -120,7 +130,7 @@ function getAdbPath() {
     return defaultPath;
   }
 
-  throwSdkIntegrityError(sdkRoot, 'platform-tools/adb');
+  throwSdkBinIntegrityError(sdkRoot, 'platform-tools/adb');
 }
 
 function getGmsaasPath() {
@@ -142,15 +152,20 @@ function throwMissingAvdError(avdName, avdPath, avdIniPath) {
   );
 }
 
-function throwSdkIntegrityError(sdkRoot, relativeExecutablePath) {
-  const executablePath = path.join(sdkRoot, relativeExecutablePath);
-  const name = path.basename(executablePath);
-  const dir = path.dirname(executablePath);
+function throwSdkBinIntegrityError(sdkRoot, relativeBinPath) {
+  const executablePath = path.join(sdkRoot, relativeBinPath);
+  throwSdkToolPathError(executablePath);
+}
 
-  throw new DetoxRuntimeError(
-    `There was no "${name}" executable file in directory: ${dir}.\n` +
-    `Check integrity of your Android SDK.`
-  );
+function throwSdkToolPathError(sdkToolPath) {
+  const name = path.basename(sdkToolPath);
+  const dir = path.dirname(sdkToolPath);
+
+  throwSdkIntegrityError(`There was no "${name}" executable file in directory: ${dir}`);
+}
+
+function throwSdkIntegrityError(errMessage) {
+  throw new DetoxRuntimeError(`${errMessage}\nCheck the integrity of your Android SDK.`);
 }
 
 function throwMissingGmsaasError() {
@@ -173,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() {
@@ -211,6 +249,7 @@ module.exports = {
   getGmsaasPath,
   getDetoxVersion,
   getFrameworkPath,
+  getXCUITestRunnerPath,
   getAndroidSDKPath,
   getAndroidEmulatorPath,
   getDetoxLibraryRootPath,

package/src/utils/errorUtils.js

@@ -1,4 +1,6 @@
 const { isError } = require('lodash');
+const { deserializeError, serializeError } = require('serialize-error');
+
 const CLEAN_AT = /\n\s*at [\s\S]*/m;
 
 function filterErrorStack(error, predicate) {
@@ -16,11 +18,12 @@ function filterErrorStack(error, predicate) {
 }
 
 function replaceErrorStack(source, target) {
-  const sourceStack = source.stack || source.message;
-  const targetStack = target.stack || target.message;
+  const sourceStack = (source.stack || '');
   const sourceMessage = sourceStack.replace(CLEAN_AT, '');
-  const targetMessage = targetStack.replace(CLEAN_AT, '');
   const actualSourceStack = sourceStack.slice(sourceMessage.length);
+
+  const targetMessage = target.message || target.stack.replace(CLEAN_AT, '');
+
   target.stack = targetMessage + actualSourceStack;
   return target;
 }
@@ -37,9 +40,27 @@ function asError(error) {
   return isError(error) ? error : new Error(error);
 }
 
+function serializeObjectWithError(obj, errorKey) {
+  if (obj[errorKey]) {
+    return { ...obj, [errorKey]: serializeError(obj[errorKey]) };
+  }
+
+  return obj;
+}
+
+function deserializeObjectWithError(obj, errorKey) {
+  if (typeof obj[errorKey] === 'object' && !(obj[errorKey] instanceof Error)) {
+    return { ...obj, [errorKey]: deserializeError(obj[errorKey]) };
+  }
+
+  return obj;
+}
+
 module.exports = {
   asError,
   replaceErrorStack,
   filterErrorStack,
   createErrorWithUserStack,
+  serializeObjectWithError,
+  deserializeObjectWithError,
 };

package/src/utils/invocationTraceDescriptions.js

@@ -0,0 +1,44 @@
+module.exports = {
+  actionDescription: {
+    adjustSliderToPosition: (newPosition) => `adjust slider to position ${newPosition}`,
+    clearText: () => 'clear input text',
+    getAttributes: () => 'get element attributes',
+    longPress: (duration) => `long press${duration !== undefined ? ` for ${duration}ms` : ''}`,
+    longPressAndDrag: (duration, startX, startY, targetElement, endX, endY, speed, holdDuration) =>
+      `long press and drag from ${startX}, ${startY} to ${endX}, ${endY} with speed ${speed} and hold duration ${holdDuration}`,
+    multiTap: (times) => `tap ${times} times`,
+    performAccessibilityAction: (actionName) => `perform ${actionName} accessibilityAction`,
+    pinch: (scale, speed, angle) => `pinch with scale ${scale}, speed ${speed}, and angle ${angle}`,
+    pinchWithAngle: (direction, speed, angle) => `pinch with direction ${direction}, speed ${speed}, and angle ${angle}`,
+    replaceText: (value) => `replace input text: "${value}"`,
+    scroll: (amount, direction, startPositionX, startPositionY) =>
+      `scroll ${amount} pixels ${direction}${startPositionX !== undefined && startPositionY !== undefined ? ` from normalized position (${startPositionX}, ${startPositionY})` : ''}`,
+    scrollTo: (edge) => `scroll to ${edge}`,
+    scrollToIndex: (index) => `scroll to index #${index}`,
+    setColumnToValue: (column, value) => `set column ${column} to value ${value}`,
+    setDatePickerDate: (dateString, dateFormat) => `set date picker date to ${dateString} using format ${dateFormat}`,
+    swipe: (direction, speed, normalizedSwipeOffset, normalizedStartingPointX, normalizedStartingPointY) =>
+      `swipe ${direction} ${speed} with offset ${normalizedSwipeOffset}
+      ${!isNaN(normalizedStartingPointX) && !isNaN(normalizedStartingPointY) ? ` from normalized position (${normalizedStartingPointX}, ${normalizedStartingPointY})` : ''}`,
+    takeScreenshot: (screenshotName) => `take screenshot${screenshotName !== undefined ? ` with name "${screenshotName}"` : ''}`,
+    tapAtPoint: (value) => `tap${value !== undefined ? ` at ${JSON.stringify(value)}` : ''}`,
+    tapBackspaceKey: () => 'tap on backspace key',
+    tapReturnKey: () => 'tap on return key',
+    typeText: (value) => `type input text: "${value}"`,
+  },
+  expectDescription: {
+    waitFor: (actionDescription) => `wait for expectation while ${actionDescription}`,
+    waitForWithTimeout: (expectDescription, timeout) => `${expectDescription} with timeout (${timeout} ms)`,
+    withTimeout: (timeout) => `wait until timeout (${timeout} ms)`,
+    toBeFocused: () => 'to be focused',
+    toBeVisible: (percent) => `to be visible${percent !== undefined ? ` ${percent}%` : ''}`,
+    toExist: () => 'to exist',
+    toHaveText: (text) => `to have text: "${text}"`,
+    toHaveLabel: (label) => `to have label: "${label}"`,
+    toHaveId: (id) => `to have id: "${id}"`,
+    toHaveValue: (value) => `to have value: "${value}"`,
+    toHaveSliderPosition: (position, tolerance) => `to have slider position: ${position}${tolerance > 0 ? ` with tolerance ${tolerance}` : ''}`,
+    toHaveToggleValue: (value) => `to have toggle value: ${value}`,
+    full: (expectDescription, notCondition) => `expect element ${notCondition ? `not ${expectDescription}` : expectDescription}`
+  }
+};

package/src/utils/isPromise.js

@@ -2,4 +2,11 @@ function isPromise(value) {
   return Promise.resolve(value) === value;
 }
 
-module.exports = isPromise;
+function isPromiseLike(value) {
+  return value ? typeof value.then === 'function' : false;
+}
+
+module.exports = {
+  isPromise,
+  isPromiseLike,
+};

package/src/utils/logger.js

@@ -1,4 +1,4 @@
 /**
- * @type {Detox.Logger}
+ * @type {import('../logger/DetoxLogger')}
  */
-module.exports = require('../..').log;
+module.exports = require('../../internals').log;

package/src/utils/pathUtils.js

@@ -0,0 +1,11 @@
+const path = require('path');
+
+function toSimplePath(filePath, cwd = process.cwd()) {
+  const relativePath = path.relative(cwd, filePath);
+  const isOutsideCwd = relativePath.split(path.sep, 1)[0] === '..';
+  return isOutsideCwd ? filePath : relativePath;
+}
+
+module.exports = {
+  toSimplePath,
+};

package/src/utils/shellUtils.js

@@ -1,5 +1,6 @@
 const SPACE = ' ';
 const BACK_SLASH = '\\';
+const FORWARD_SLASH = '/';
 const SINGLE_QUOTE = "'";
 const DOUBLE_QUOTE = '"';
 
@@ -64,6 +65,14 @@ function autoEscapeCmd(str) {
   return escapeWithDoubleQuotedString(str);
 }
 
+function useForwardSlashesCMD(str) {
+  return str.split(BACK_SLASH).join(FORWARD_SLASH);
+}
+
+function useForwardSlashesShell(str) {
+  return str; // already POSIX, so no-op
+}
+
 const hasUnsafeChars = isRunningInCMDEXE()
   /* istanbul ignore next */ ? hasUnsafeCMDChars
   /* istanbul ignore next */ : hasUnsafeShellChars;
@@ -76,6 +85,10 @@ const escapeSpaces = isRunningInCMDEXE()
   /* istanbul ignore next */ ? escapeSpacesCMD
   /* istanbul ignore next */ : escapeSpacesShell;
 
+const usePosixSlashes = isRunningInCMDEXE()
+  /* istanbul ignore next */ ? useForwardSlashesCMD
+  /* istanbul ignore next */ : useForwardSlashesShell;
+
 module.exports = {
   escapeInDoubleQuotedString,
   escapeInDoubleQuotedRegexp,
@@ -94,4 +107,8 @@ module.exports = {
     cmd: autoEscapeCmd,
     shell: autoEscapeShell,
   }),
+  useForwardSlashes: Object.assign(usePosixSlashes, {
+    cmd: useForwardSlashesCMD,
+    shell: useForwardSlashesShell,
+  }),
 };

package/src/utils/traceInvocationCall.js

@@ -0,0 +1,21 @@
+function _getCallStackTrace() {
+  return new Error().stack
+    .split('\n')
+    .slice(1) // Ignore Error message
+    .map(line => line
+      .replace(/^\s*at\s+/, '')
+      .replace(process.cwd(), '')
+    )
+    .filter(line => !line.includes('/detox/src')) // Ignore detox internal calls
+    .join('\n');
+}
+
+function invocationCall(logger, sectionName, invocation, action) {
+  return logger.trace.complete({
+    cat: 'ws-client,ws-client-invocation',
+    data: invocation,
+    stack: _getCallStackTrace(),
+  }, sectionName, action);
+}
+
+module.exports = invocationCall;

package/src/utils/traceMethods.js

@@ -0,0 +1,15 @@
+function traceMethods(logger, obj, methodNames) {
+  for (const name of methodNames) {
+    const originalMethod = obj[name];
+
+    obj[name] = function tracedMethod(...args) {
+      return logger.trace.complete(
+        { args },
+        name,
+        originalMethod.apply.bind(originalMethod, obj, args)
+      );
+    };
+  }
+}
+
+module.exports = traceMethods;

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/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0-javadoc.jar.md5

@@ -1 +0,0 @@
-8475cf31ccd6d011b0006e3bb733eecc

package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0-javadoc.jar.sha1

@@ -1 +0,0 @@
-886b14ddaa20a6f8c45591e264d9e4b37608c42c

package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0-javadoc.jar.sha256

@@ -1 +0,0 @@
-acc211b70fb65685f6bc4485877bbbb2eff3bc39c6c827eb2e3c7718a4483f3f

package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0-javadoc.jar.sha512

@@ -1 +0,0 @@
-a04e99a05821a7eee3dd52681ad4f5f90f79db30148dc725c0857dc6816d3a2321e0325301956b42135eeafba91730cbf1ea3e9bb2c7fd8907b6b3622554e681

package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0-sources.jar.md5

@@ -1 +0,0 @@
-1f34dcb78d3fca51336c8ef14e04d81a

package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0-sources.jar.sha1

@@ -1 +0,0 @@
-ada07ced21d56acce0c81bd3a23f491e377f8039

package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0-sources.jar.sha256

@@ -1 +0,0 @@
-aea2cd38e84670f4c1247a91ed192dfb7aa8e7b6b8caf0ab9e4653e9d3d534f3

package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0-sources.jar.sha512

@@ -1 +0,0 @@
-bde9ea969c3dc598bd83269cb194a45b2541a72cfb957cb73739e6bcc696db72f03083bd89d5487165259a6ec69290efddfe686456c37a26a5b756f48d2c16f3

package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0.aar.md5

@@ -1 +0,0 @@
-763fee6cb2b551c8163caecafb821478

package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0.aar.sha1

@@ -1 +0,0 @@
-a3d2827035258ddbd41de27ce4e25df2f3a5a2fd

package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0.aar.sha256

@@ -1 +0,0 @@
-87990259e9864e07f8a1ccde34e69dfcadfba39167d7384062c272e81b307231

package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0.aar.sha512

@@ -1 +0,0 @@
-34165b1c6d6ea54d5c3420bd7f387dfa9fc81f8a43d50c404d06c9d24a6d6377dc84ba4f0b699dda5780658fb8796d197f368ef396cbf29240270e9fea78bddc

package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0.pom.md5

@@ -1 +0,0 @@
-4873da6045eabca1e010029084da9b1a

package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0.pom.sha1

@@ -1 +0,0 @@
-fd2294f05635a75a1c049162064c751773d1acec

package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0.pom.sha256

@@ -1 +0,0 @@
-a815eb45d190075410faa418d75636120436338083a8c56b48c0314bf2370afe

package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0.pom.sha512

@@ -1 +0,0 @@
-9566b64dce8fc2983da565d015b787f1d13f1ea79c95f2062fcdb5ff06ef2c00c2fd96fc9680737d979c4f299570ef448ebac2489e5370f8efc94b08814e5f37

package/android/detox/src/full/java/com/wix/detox/espresso/registry/IRStatusInquirer.kt

@@ -1,24 +0,0 @@
-package com.wix.detox.espresso.registry
-
-import androidx.test.espresso.Espresso
-import androidx.test.espresso.IdlingResource
-import androidx.test.espresso.base.IdlingResourceRegistry
-import com.wix.detox.common.UIThread
-import org.joor.Reflect
-import java.util.concurrent.Callable
-
-class IRStatusInquirer(private val registry: IdlingResourceRegistry) {
-    fun getAllBusyResources(): List<IdlingResource> {
-        return UIThread.postFirstSync(Callable<List<IdlingResource>> {
-            registry.resources.filter { resource ->
-                !resource.isIdleNow
-            }
-        })
-    }
-
-    companion object {
-        val INSTANCE = IRStatusInquirer(getRegistryDefault())
-    }
-}
-
-private fun getRegistryDefault() = Reflect.on(Espresso::class.java).get<IdlingResourceRegistry>("baseRegistry")

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/DescriptiveIdlingResource.kt

@@ -1,10 +0,0 @@
-package com.wix.detox.reactnative.idlingresources
-
-import androidx.test.espresso.IdlingResource
-
-interface DescriptiveIdlingResource: IdlingResource {
-    /**
-     * Returns a descriptive representation of the resource.
-     */
-    fun getDescription(): IdlingResourceDescription
-}

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/IdlingResourceDescription.kt

@@ -1,20 +0,0 @@
-package com.wix.detox.reactnative.idlingresources
-
-class IdlingResourceDescription private constructor(
-  private val name: String,
-  private val description: Map<String, Any>) {
-    fun json(): Map<String, Any> = mutableMapOf<String, Any>("name" to name)
-      .apply { if (description.isNotEmpty()) put("description", description) }
-
-    override fun equals(other: Any?): Boolean = other is IdlingResourceDescription &&
-        other.json() == this.json()
-
-    data class Builder(
-      var name: String = "unknown",
-      var description: MutableMap<String, Any> = mutableMapOf()) {
-
-        fun name(name: String) = apply { this.name = name }
-        fun addDescription(key: String, value: Any) = apply { this.description[key] = value }
-        fun build() = IdlingResourceDescription(name, description)
-    }
-}

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/timers/DefaultIdleInterrogationStrategy.kt

@@ -1,84 +0,0 @@
-@file:RNDropSupportTodo(62, "Remove all of this; Use DelegatedIdleInterrogationStrategy, instead.")
-
-package com.wix.detox.reactnative.idlingresources.timers
-
-import com.facebook.react.bridge.ReactContext
-import com.wix.detox.common.RNDropSupportTodo
-import com.wix.detox.reactnative.helpers.RNHelpers
-import org.joor.Reflect
-import java.util.*
-
-private const val BUSY_WINDOW_THRESHOLD = 1500
-
-private class TimerReflected(timer: Any) {
-    private var reflected = Reflect.on(timer)
-
-    val isRepeating: Boolean
-        get() = reflected.field("mRepeat").get()
-    val interval: Int
-        get() = reflected.field("mInterval").get()
-    val targetTime: Long
-        get() = reflected.field("mTargetTime").get()
-}
-
-private class TimingModuleReflected(private val timingModule: Any) {
-    val timersQueue: PriorityQueue<Any>
-        get() = Reflect.on(timingModule).field("mTimers").get()
-    val timersLock: Any
-        get() = Reflect.on(timingModule).field("mTimerGuard").get()
-
-    operator fun component1() = timersQueue
-    operator fun component2() = timersLock
-}
-
-class DefaultIdleInterrogationStrategy
-    internal constructor(private val timersModule: Any)
-    : IdleInterrogationStrategy {
-
-    override fun isIdleNow(): Boolean {
-        val (timersQueue, timersLock) = TimingModuleReflected(timersModule)
-        synchronized(timersLock) {
-            val nextTimer = timersQueue.peek()
-            nextTimer?.let {
-                return !isTimerInBusyWindow(it) && !hasBusyTimers(timersQueue)
-            }
-            return true
-        }
-    }
-
-    private fun isTimerInBusyWindow(timer: Any): Boolean {
-        val timerReflected = TimerReflected(timer)
-        return when {
-            timerReflected.isRepeating -> false
-            timerReflected.interval > BUSY_WINDOW_THRESHOLD -> false
-            else -> true
-        }
-    }
-
-    private fun hasBusyTimers(timersQueue: PriorityQueue<Any>): Boolean {
-        timersQueue.forEach {
-            if (isTimerInBusyWindow(it)) {
-                return true
-            }
-        }
-        return false
-    }
-
-    companion object {
-        fun createIfSupported(reactContext: ReactContext): DefaultIdleInterrogationStrategy? {
-            // RN = 0.62.0:
-            // Should have been handled by DelegatedIdleInterrogationStrategy.createIfSupported() but seems the new TimingModule class
-            // was released without the awaited-for "hasActiveTimersInRange()" method.
-            try {
-                val timingModule = RNHelpers.getNativeModule(reactContext, "com.facebook.react.modules.core.TimingModule")
-                val timersManager = Reflect.on(timingModule).get<Any>("mJavaTimerManager")
-                return DefaultIdleInterrogationStrategy(timersManager)
-            } catch (ex: Exception) {
-            }
-
-            // RN < 0.62
-            val timingModule = RNHelpers.getNativeModule(reactContext, "com.facebook.react.modules.core.Timing") ?: return null
-            return DefaultIdleInterrogationStrategy(timingModule)
-        }
-    }
-}

package/android/detox/src/main/java/com/wix/detox/espresso/action/AdjustSliderToPositionAction.kt

@@ -1,36 +0,0 @@
-package com.wix.detox.espresso.action
-
-import android.view.View
-import androidx.test.espresso.UiController
-import androidx.test.espresso.ViewAction
-import androidx.test.espresso.matcher.ViewMatchers
-import com.facebook.react.bridge.JavaOnlyMap
-import com.facebook.react.uimanager.ReactStylesDiffMap
-import com.facebook.react.views.slider.ReactSlider
-import com.facebook.react.views.slider.ReactSliderManager
-import org.hamcrest.Matcher
-import org.hamcrest.Matchers
-
-class AdjustSliderToPositionAction(private val desiredPosition: Double, private val mManager: ReactSliderManager) : ViewAction {
-    override fun getConstraints(): Matcher<View?>? = Matchers.allOf(
-            ViewMatchers.isAssignableFrom(ReactSlider::class.java),
-            getIsDisplayed())
-
-    override fun getDescription() = "adjustSliderToPosition"
-
-    fun getIsDisplayed(): Matcher<View?> = ViewMatchers.isDisplayed()
-
-    private fun buildStyles(vararg keysAndValues: Any) = ReactStylesDiffMap(JavaOnlyMap.of(*keysAndValues))
-
-    private fun calculateProgressTarget(view: ReactSlider): Double {
-        val sliderProgress = view.toRealProgress(view.progress)
-        val sliderScrollFactor = view.max / view.progress.toDouble()
-        val sliderMaxValue = sliderProgress * sliderScrollFactor
-        return desiredPosition * sliderMaxValue
-    }
-
-    override fun perform(uiController: UiController?, view: View) {
-        val progressNewValue = calculateProgressTarget(view as ReactSlider)
-        mManager.updateProperties(view, buildStyles("value", progressNewValue))
-    }
-}