detox 20.0.7-prerelease.0 → 20.0.8-prerelease.0

package/Detox-android/com/wix/detox/20.0.8-prerelease.0/detox-20.0.8-prerelease.0-javadoc.jar.md5

@@ -0,0 +1 @@
+fd8a1feca61c400f9120a5954c277c4c

package/Detox-android/com/wix/detox/20.0.8-prerelease.0/detox-20.0.8-prerelease.0-javadoc.jar.sha1

@@ -0,0 +1 @@
+c822315686adf622857908c74ac136e1a053bf8f

package/Detox-android/com/wix/detox/20.0.8-prerelease.0/detox-20.0.8-prerelease.0-javadoc.jar.sha256

@@ -0,0 +1 @@
+05c829e58cafe9ae9c7f186ecc23f105eb795180020e98cb9fcc6519e6a4c1c3

package/Detox-android/com/wix/detox/20.0.8-prerelease.0/detox-20.0.8-prerelease.0-javadoc.jar.sha512

@@ -0,0 +1 @@
+ec9749320550216fc8e85faf96c3cae741b6c0db3a0d65053e8837131e2545a060c8aa836f212b2be53b1b6fd588cef55b4c4a51ca10eb5dbc5cc43f9752ab48

package/Detox-android/com/wix/detox/20.0.8-prerelease.0/detox-20.0.8-prerelease.0-sources.jar.md5

@@ -0,0 +1 @@
+703a2d89ea5341a4b10b05b4480b6d95

package/Detox-android/com/wix/detox/20.0.8-prerelease.0/detox-20.0.8-prerelease.0-sources.jar.sha1

@@ -0,0 +1 @@
+1d05d4bdb8a07e3dc2f4b8350f673d5cca5ea9fe

package/Detox-android/com/wix/detox/20.0.8-prerelease.0/detox-20.0.8-prerelease.0-sources.jar.sha256

@@ -0,0 +1 @@
+b9d8c4f11d73bd0dd4e7536d4d160b2a71cd6464848a4079a656c9a1af4a5514

package/Detox-android/com/wix/detox/20.0.8-prerelease.0/detox-20.0.8-prerelease.0-sources.jar.sha512

@@ -0,0 +1 @@
+6f78b1dd5b0ac9ee3e64744fda135e4fc637187fddbd85f625e2cf36d0c5ac7c8fd01f31155536f49fae1cfce75fe9ed2abb8c2e0522fbf278a433ee4292e1f1

package/Detox-android/com/wix/detox/20.0.8-prerelease.0/detox-20.0.8-prerelease.0.aar.md5

@@ -0,0 +1 @@
+fdd88ee21e7da1b14bda4b49205eceec

package/Detox-android/com/wix/detox/20.0.8-prerelease.0/detox-20.0.8-prerelease.0.aar.sha1

@@ -0,0 +1 @@
+c03bccd8a1a300d6859c75672e06c0aa49fb4965

package/Detox-android/com/wix/detox/20.0.8-prerelease.0/detox-20.0.8-prerelease.0.aar.sha256

@@ -0,0 +1 @@
+251e1ca4bd82c503575e86cc6506d957e7fee327ecd19280a35f4761d11cf422

package/Detox-android/com/wix/detox/20.0.8-prerelease.0/detox-20.0.8-prerelease.0.aar.sha512

@@ -0,0 +1 @@
+d51f289616a8d801d977b4ef996ec23139c65084e8f3f2a0d62603b712706caa6e6e7ee40949abb4d36c77064c3af6966851d2bd7601525c4d17092dbf4f55cc

package/Detox-android/com/wix/detox/{20.0.7-prerelease.0/detox-20.0.7-prerelease.0.pom → 20.0.8-prerelease.0/detox-20.0.8-prerelease.0.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
-  <version>20.0.7-prerelease.0</version>
+  <version>20.0.8-prerelease.0</version>
   <packaging>aar</packaging>
   <name>Detox</name>
   <description>Gray box end-to-end testing and automation library for mobile apps</description>
@@ -60,12 +60,6 @@
       <version>2.2.0</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-android-extensions-runtime</artifactId>
-      <version>1.3.72</version>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-stdlib-jdk8</artifactId>

package/Detox-android/com/wix/detox/20.0.8-prerelease.0/detox-20.0.8-prerelease.0.pom.md5

@@ -0,0 +1 @@
+9511a52e99b74eba29e508b05a893e99

package/Detox-android/com/wix/detox/20.0.8-prerelease.0/detox-20.0.8-prerelease.0.pom.sha1

@@ -0,0 +1 @@
+27eace42fa75812951d39c03e36ed07797946718

package/Detox-android/com/wix/detox/20.0.8-prerelease.0/detox-20.0.8-prerelease.0.pom.sha256

@@ -0,0 +1 @@
+93da305e085d1ab09802a1983f1f706b7171f701082f5a5161f2bd606b0fdc36

package/Detox-android/com/wix/detox/20.0.8-prerelease.0/detox-20.0.8-prerelease.0.pom.sha512

@@ -0,0 +1 @@
+6a2bce2993c09e8c261339e10b6f2c9af48910789dc7b76233cf7b6090226746571edfae4b6c90e451fbc2d26a871720732c507ad1892f467be9db8a693267d3

package/Detox-android/com/wix/detox/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
   <versioning>
-    <latest>20.0.7-prerelease.0</latest>
-    <release>20.0.7-prerelease.0</release>
+    <latest>20.0.8-prerelease.0</latest>
+    <release>20.0.8-prerelease.0</release>
     <versions>
-      <version>20.0.7-prerelease.0</version>
+      <version>20.0.8-prerelease.0</version>
     </versions>
-    <lastUpdated>20220906143110</lastUpdated>
+    <lastUpdated>20220907153612</lastUpdated>
   </versioning>
 </metadata>

package/Detox-android/com/wix/detox/maven-metadata.xml.md5

@@ -1 +1 @@
-443209a3d276fc780cececc129d8e70b
+e922bb0e5ca1b5b017338c3185a6ef89

package/Detox-android/com/wix/detox/maven-metadata.xml.sha1

@@ -1 +1 @@
-283f03aa8235477f8b3070d4cfa36018d5a7fe7f
+e4c6e03fcf50237cac24bda1c7a5d1bd5476b0fa

package/Detox-android/com/wix/detox/maven-metadata.xml.sha256

@@ -1 +1 @@
-40762b77b08b8369c14f0f11ecf0832d7fd56ecaa618b1a0a62c3c5d16938ed9
+282b526b0da3c6dd360a2379d3c2d6e176cf67f32564fdb11d64295582d29ac9

package/Detox-android/com/wix/detox/maven-metadata.xml.sha512

@@ -1 +1 @@
-5b3fceef49c72fa0bd12736858bf0e6f16cefc317c648ff83525d2fdc4b7831cce101c206d3640ba7a79edc432b90d481f279cba5285f7c36ce1f613caf163f6
+012dafdd2fbae8b112f7a8baccd7214cc3f716af5a54878f580d3ea40a4a571c268462b579a1f8033e1af185450bd696a626fb99143ae4c356f27593e7c89a32

package/android/build.gradle

@@ -1,12 +1,20 @@
 buildscript {
     ext {
         isOfficialDetoxLib = true
-        kotlinVersion = '1.2.0'
+        kotlinVersion = '1.6.10' // Aligned with RN .69's version bump
         dokkaVersion = '1.6.0'
         buildToolsVersion = '31.0.0'
         compileSdkVersion = 31
         targetSdkVersion = 31
         minSdkVersion = 21
+
+        if (System.properties['os.arch'] == "aarch64") {
+            // For M1 Users we need to use the NDK 24 which added support for aarch64
+            ndkVersion = "24.0.8215888"
+        } else {
+            // Otherwise we default to the side-by-side NDK version from AGP.
+            ndkVersion = "21.4.7075529"
+        }
     }
     ext.detoxKotlinVersion = ext.kotlinVersion
 
@@ -15,14 +23,12 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:7.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokkaVersion"
 
-        if (!rootProject.hasProperty('suppressUnitTests')) {
-            // Needed by Spek (https://spekframework.org/setup-android)
-            classpath 'de.mannodermaus.gradle.plugins:android-junit5:1.7.1.1'
-        }
+        // Needed by Spek (https://spekframework.org/setup-android)
+        classpath 'de.mannodermaus.gradle.plugins:android-junit5:1.7.1.1'
     }
 }
 

package/android/detox/build.gradle

@@ -1,13 +1,15 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+
+def _kotlinMinVersion = '1.2.0'
+def _materialMinVersion = '1.2.1'
 
 def _ext = rootProject.ext
 def _compileSdkVersion = _ext.has('compileSdkVersion') ? _ext.compileSdkVersion : 31
 def _targetSdkVersion = _ext.has('targetSdkVersion') ? _ext.targetSdkVersion : 31
-def _buildToolsVersion = _ext.has('buildToolsVersion') ? _ext.buildToolsVersion : "31.0.0"
+def _buildToolsVersion = _ext.has('buildToolsVersion') ? _ext.buildToolsVersion : '31.0.0'
 def _minSdkVersion = _ext.has('minSdkVersion') ? _ext.minSdkVersion : 21
-def _kotlinVersion = _ext.has('detoxKotlinVersion') ? _ext.detoxKotlinVersion : '1.2.0'
+def _kotlinVersion = _ext.has('detoxKotlinVersion') ? _ext.detoxKotlinVersion : _kotlinMinVersion
 def _kotlinStdlib = _ext.has('detoxKotlinStdlib') ? _ext.detoxKotlinStdlib : 'kotlin-stdlib-jdk8'
 
 android {
@@ -75,7 +77,8 @@ android {
 
 // Fundamental deps.
 dependencies {
-    implementation "org.jetbrains.kotlin:$_kotlinStdlib:$_kotlinVersion"
+    implementation "org.jetbrains.kotlin:$_kotlinStdlib:$_kotlinMinVersion"
+    //noinspection GradleDynamicVersion
     compileOnly 'com.facebook.react:react-native:+'
 }
 
@@ -108,7 +111,7 @@ dependencies {
 
 // Third-party/extension deps.
 dependencies {
-    implementation('com.google.android.material:material:1.2.1') {
+    implementation("com.google.android.material:material:$_materialMinVersion") {
         because 'Material components are mentioned explicitly (e.g. Slider in get-attributes handler)'
     }
     implementation('org.apache.commons:commons-lang3:3.7') {
@@ -121,11 +124,11 @@ dependencies {
 
 // Unit-testing deps.
 dependencies {
+    //noinspection GradleDynamicVersion
     testImplementation 'com.facebook.react:react-native:+'
     testImplementation 'org.json:json:20140107'
 
 // https://github.com/spekframework/spek/issues/232#issuecomment-610732158
-//    testImplementation 'junit:junit:4.13.2'
     testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.6.0'
 
     testImplementation 'org.assertj:assertj-core:3.16.1'
@@ -136,9 +139,9 @@ dependencies {
 }
 
 // Spek (https://spekframework.org/setup-android)
-if (!rootProject.hasProperty('suppressUnitTests') &&
-    (rootProject.hasProperty('isOfficialDetoxLib') ||
-     rootProject.hasProperty('isOfficialDetoxApp'))) {
+if (rootProject.hasProperty('isOfficialDetoxLib') ||
+    rootProject.hasProperty('isOfficialDetoxApp')) {
+    
     apply plugin: 'de.mannodermaus.android-junit5'
 
     android {
@@ -164,3 +167,4 @@ if (!rootProject.hasProperty('suppressUnitTests') &&
 if (rootProject.hasProperty('isOfficialDetoxLib')) {
     apply from: './publishing.gradle'
 }
+

package/android/detox/publishing.gradle

@@ -18,6 +18,7 @@ def DEVELOPERS = [
 String _versionName = System.getProperty('version')
 String _flavour = System.getProperty('buildFlavour', PUB_FLAVOUR_FULL_DETOX)
 Boolean _forceLocal = System.getProperty('forceLocal', 'false').toBoolean()
+Boolean _forceSign = System.getProperty('forceSign', 'false').toBoolean()
 
 String _mavenRepoUrl
 Map _mavenCredentials
@@ -28,7 +29,7 @@ def _selectedVariant
 def initLocalPublishing = {
     _mavenRepoUrl = TARGET_LOCAL_DIR
     _mavenCredentials = null
-    _shouldSignArtifacts = false
+    _shouldSignArtifacts = _forceSign
 }
 
 def initMavenPublishing = {
@@ -71,10 +72,8 @@ def shouldPublishVariant = {
 }
 
 def declareArchive = { target ->
-    if (_shouldSignArtifacts) {
-        project.artifacts {
-            archives target
-        }
+    project.artifacts {
+        archives target
     }
 }
 
@@ -103,12 +102,12 @@ tasks.named("dokkaJavadoc") {
         }
     }
 }
-    // Side note / TODO:
-    // Dokka outputs R and BuildConfig; currently, there's nothing to do about it, as issues such as
-    // this on - https://github.com/Kotlin/dokka/issues/419 are still open :-/
-    // We might want to revisit this in the future -- see if they've decided to export a custom classes
-    // suppression config var or something.
 
+// Side note / TODO (revisit because dokka's 419 issue has been resolved, since):
+// Dokka outputs R and BuildConfig; currently, there's nothing to do about it, as issues such as
+// this on - https://github.com/Kotlin/dokka/issues/419 are still open :-/
+// We might want to revisit this in the future -- see if they've decided to export a custom classes
+// suppression config var or something.
 task dokkaDocJar(type: Jar, dependsOn: dokkaJavadoc) {
     from "$buildDir/dokkaDoc"
     classifier = 'javadoc'
@@ -143,7 +142,7 @@ project.afterEvaluate {
         android {
             libraryVariants.all { variant ->
                 String variantName = variant.name.capitalize()
-                if (task.name == "publishMaven${variantName}AarPublicationToMavenRepository") {
+                if (task.name == "publishMaven${variantName}AarPublicationToMavenRepository".toString()) {
                     task.dependsOn "assemble${variantName}"
                     task.dependsOn project.tasks.signArchives
                     task.doFirst {
@@ -245,22 +244,23 @@ publishing {
                         }
                     }
 
-                    // Register all artifacts we've previously registered as archives (i.e. .jar.asc's, .aar.asc's) as published artifacts.
-                    // Note: this relies on preregistering the equivalent generator-tasks as archive artifacts
-                    // inside a project.artifacts { ... } clause.
-                    project.tasks.signArchives.signatureFiles.each {
-                        artifact(it) {
-                            def matcherSrcDocs = (it.file =~ /-(sources|javadoc)\.jar\.asc$/)
-                            def matcherAAR = (it.file =~ /\.aar\.asc$/)
-                            if (matcherSrcDocs.find()) {
-                                classifier = matcherSrcDocs.group(1)
-                                extension = 'jar.asc'
-                            } else if (matcherAAR.find()) {
-                                classifier = null
-                                extension = 'aar.asc'
-                            } else {
-                                classifier = null
-                                extension = null
+                    // Register all artifacts we've previously registered as signed archives (i.e. .jar.asc's, .aar.asc's) as publish-artifacts.
+                    // Note: this relies on preregistering the equivalent generator-tasks as archive artifacts inside a project.artifacts { ... } clause.
+                    if (_shouldSignArtifacts) {
+                        project.tasks.signArchives.signatureFiles.each {
+                            artifact(it) {
+                                def matcherSrcDocs = (it.file =~ /-(sources|javadoc)\.jar\.asc$/)
+                                def matcherAAR = (it.file =~ /\.aar\.asc$/)
+                                if (matcherSrcDocs.find()) {
+                                    classifier = matcherSrcDocs.group(1)
+                                    extension = 'jar.asc'
+                                } else if (matcherAAR.find()) {
+                                    classifier = null
+                                    extension = 'aar.asc'
+                                } else {
+                                    classifier = null
+                                    extension = null
+                                }
                             }
                         }
                     }

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

@@ -1,43 +1,23 @@
+
 package com.wix.detox.reactnative.idlingresources.timers
 
-import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactContext
-import com.wix.detox.common.RNDropSupportTodo
-import com.wix.detox.reactnative.helpers.RNHelpers
-import org.joor.Reflect
+import com.facebook.react.modules.core.TimingModule
 
 private const val BUSY_WINDOW_THRESHOLD = 1500L
 
-private class RN62TimingModuleReflected(private val timingModule: NativeModule) {
-    fun hasActiveTimers(): Boolean = Reflect.on(timingModule).call("hasActiveTimersInRange", BUSY_WINDOW_THRESHOLD).get()
-}
-
 /**
  * Delegates the interrogation to the native module itself, added
  * [here](https://github.com/facebook/react-native/pull/27539) in the context
  * of RN v0.62 (followed by a previous refactor and rename of the class).
  */
-@RNDropSupportTodo(62, """
-    When min RN version supported by Detox is 0.62.x (or higher), can (and
-    should) remove any usage of reflection here.
-    That includes the unit test's stub being used for that reason in particular.
-    """)
-class DelegatedIdleInterrogationStrategy(timingModule: NativeModule): IdleInterrogationStrategy {
-    private val timingModuleReflected = RN62TimingModuleReflected(timingModule)
-
-    override fun isIdleNow(): Boolean = !timingModuleReflected.hasActiveTimers()
+class DelegatedIdleInterrogationStrategy(private val timingModule: TimingModule): IdleInterrogationStrategy {
+    override fun isIdleNow(): Boolean = !timingModule.hasActiveTimersInRange(BUSY_WINDOW_THRESHOLD)
 
     companion object {
-        fun createIfSupported(reactContext: ReactContext): DelegatedIdleInterrogationStrategy? {
-            val module = RNHelpers.getNativeModule(reactContext, "com.facebook.react.modules.core.TimingModule")
-                    ?: return null
-
-            return try {
-                module.javaClass.getDeclaredMethod("hasActiveTimersInRange", Long::class.java)
-                DelegatedIdleInterrogationStrategy(module)
-            } catch (ex: Exception) {
-                null
-            }
+        fun create(reactContext: ReactContext): DelegatedIdleInterrogationStrategy {
+            val timingModule = reactContext.getNativeModule(TimingModule::class.java)!!
+            return DelegatedIdleInterrogationStrategy(timingModule)
         }
     }
 }

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

@@ -1,6 +1,5 @@
 package com.wix.detox.reactnative.idlingresources.timers
 
-import android.util.Log
 import com.facebook.react.bridge.ReactContext
 import com.wix.detox.common.UIThread
 import java.util.concurrent.Callable
@@ -13,14 +12,5 @@ fun getInterrogationStrategy(reactContext: ReactContext): IdleInterrogationStrat
     // Getting a native-module (inside) also initializes it if needed. That has to run on a
     // looper thread, and the easiest to make sure that happens is to use the main thread.
     UIThread.runSync(Callable {
-        DelegatedIdleInterrogationStrategy.createIfSupported(reactContext)?.let {
-            return@Callable it
-        }
-
-        DefaultIdleInterrogationStrategy.createIfSupported(reactContext)?.let {
-            return@Callable it
-        }
-
-        Log.e(TimersIdlingResource.LOG_TAG, "Failed to determine proper implementation-strategy for timers idling resource")
-        null
+        return@Callable DelegatedIdleInterrogationStrategy.create(reactContext)
     })

package/android/detox/src/testFull/java/com/wix/detox/espresso/action/DetoxMultiTapSpec.kt

@@ -11,6 +11,7 @@ import org.assertj.core.api.Assertions.assertThat
 import org.mockito.kotlin.*
 import org.spekframework.spek2.Spek
 import org.spekframework.spek2.style.specification.describe
+import java.lang.NullPointerException
 import kotlin.test.assertFailsWith
 
 object DetoxMultiTapSpec: Spek({
@@ -136,17 +137,17 @@ object DetoxMultiTapSpec: Spek({
         }
 
         it("should throw if no UI-controller provided") {
-            assertFailsWith(KotlinNullPointerException::class) {
+            assertFailsWith(NullPointerException::class) {
                 uut(1).sendTap(null, coordinates, precision, -1, -1)
             }
         }
 
         it("should throw if no coordinates / precision are provided") {
-            assertFailsWith(KotlinNullPointerException::class) {
+            assertFailsWith(NullPointerException::class) {
                 uut(1).sendTap(uiController, null, precision, -1, -1)
             }
 
-            assertFailsWith(KotlinNullPointerException::class) {
+            assertFailsWith(NullPointerException::class) {
                 uut(1).sendTap(uiController, coordinates, null, -1, -1)
             }
         }

package/android/detox/src/testFull/java/com/wix/detox/reactnative/idlingresources/timers/DelegatedIdleInterrogationStrategySpec.kt

@@ -5,22 +5,14 @@ import org.assertj.core.api.Assertions.assertThat
 import org.mockito.kotlin.*
 import org.spekframework.spek2.Spek
 import org.spekframework.spek2.style.specification.describe
+import com.facebook.react.modules.core.TimingModule
 
 private const val BUSY_INTERVAL_MS = 1500L
 
-abstract class TimingModuleStub: NativeModule {
-    abstract fun hasActiveTimersInRange(rangeMs: Long): Boolean
-
-    override fun onCatalystInstanceDestroy() {}
-    override fun getName(): String = "TimersNativeModuleStub"
-    override fun canOverrideExistingModule() = false
-    override fun initialize() {}
-}
-
 object DelegatedIdleInterrogationStrategySpec : Spek({
-    describe("RN62+ timers idle-interrogation strategy") {
+    describe("Timers idle-interrogation strategy") {
 
-        lateinit var timingModule: TimingModuleStub
+        lateinit var timingModule: TimingModule
 
         beforeEachTest {
             timingModule = mock()

package/index.d.ts

@@ -157,6 +157,17 @@ declare global {
              * Use it when you rely on another test runner than Jest.
              */
             inspectBrk?: boolean | ((config: DetoxTestRunnerConfig) => void);
+            /**
+             * Forward environment variables to the spawned test runner
+             * accordingly to the given CLI argument overrides.
+             *
+             * If false, Detox CLI will be only printing a hint message on
+             * how to start the test runner using environment variables,
+             * in case when a user wants to avoid using Detox CLI.
+             *
+             * @default false
+             */
+            forwardEnv?: boolean;
         }
 
         type DetoxAppConfig = (DetoxBuiltInAppConfig | DetoxCustomAppConfig) & {

package/local-cli/test.js

@@ -9,16 +9,21 @@ module.exports.middlewares = require('./testCommand/middlewares').default;
 
 module.exports.handler = async function test({ detoxArgs, runnerArgs }) {
   try {
-    await detox.init({
+    const opts = {
       argv: detoxArgs,
       testRunnerArgv: runnerArgs,
       workerId: null,
-    });
+    };
+
+    const config = await detox.resolveConfig(opts);
+    if (!config.testRunner.inspectBrk) {
+      await detox.init(opts);
+    }
 
     const runnerCommand = new TestRunnerCommand()
-      .setRunnerConfig(detox.config.testRunner)
       .setDeviceConfig(detox.config.device)
-      .replicateCLIConfig(detox.config.cli);
+      .replicateCLIConfig(detox.config.cli)
+      .setRunnerConfig(detox.config.testRunner);
 
     await runnerCommand.execute();
   } finally {

package/local-cli/testCommand/TestRunnerCommand.js

@@ -36,9 +36,8 @@ class TestRunnerCommand {
    */
   setRunnerConfig(config) {
     this._argv = config.args;
-    this._retries = config.retries;
-
-    if (config.inspectBrk === true) {
+    this._retries = config.inspectBrk ? 0 : config.retries;
+    if (config.inspectBrk || config.forwardEnv) {
       this._env = this._envHint;
     }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "detox",
   "description": "E2E tests and automation for mobile",
-  "version": "20.0.7-prerelease.0",
+  "version": "20.0.8-prerelease.0",
   "bin": {
     "detox": "local-cli/cli.js"
   },
@@ -49,7 +49,7 @@
     "jest": "^28.0.0",
     "mockdate": "^2.0.1",
     "prettier": "1.7.0",
-    "react-native": "0.68.2",
+    "react-native": "0.69.5",
     "react-native-codegen": "^0.0.8",
     "typescript": "^4.5.2",
     "wtfnode": "^0.9.1"
@@ -184,5 +184,5 @@
       }
     }
   },
-  "gitHead": "4b75f39310b93707f01e2bb38a4fba4d385e8acd"
+  "gitHead": "205099aa94b9c7c5e0fa47985e24255f8aee3b1b"
 }

package/src/configuration/composeRunnerConfig.js

@@ -31,6 +31,7 @@ function composeRunnerConfig(opts) {
     {
       retries: 0,
       inspectBrk: inspectBrkHookDefault,
+      forwardEnv: false,
       jest: {
         initTimeout: 300000,
         retryAfterCircusRetries: false,

package/src/realms/DetoxPrimaryContext.js

@@ -170,11 +170,13 @@ class DetoxPrimaryContext extends DetoxContext {
 
       await fs.remove(this[$sessionState].detoxConfigSnapshotPath);
 
-      try {
-        this[_lifecycleLogger].trace.end();
-        await this[_finalizeLogs]();
-      } catch (err) {
-        this[_lifecycleLogger].error({ err }, 'Encountered an error while merging the process logs:');
+      if (this[_dirty]) {
+        try {
+          this[_lifecycleLogger].trace.end();
+          await this[_finalizeLogs]();
+        } catch (err) {
+          this[_lifecycleLogger].error({ err }, 'Encountered an error while merging the process logs:');
+        }
       }
     }
   }

package/Detox-android/com/wix/detox/20.0.7-prerelease.0/detox-20.0.7-prerelease.0-javadoc.jar.md5

@@ -1 +0,0 @@
-effab7a47e7869043e38424a2a1320ee

package/Detox-android/com/wix/detox/20.0.7-prerelease.0/detox-20.0.7-prerelease.0-javadoc.jar.sha1

@@ -1 +0,0 @@
-6ee9bcfa6e27561a20785f38d6978a16091d3da2

package/Detox-android/com/wix/detox/20.0.7-prerelease.0/detox-20.0.7-prerelease.0-javadoc.jar.sha256

@@ -1 +0,0 @@
-06ad5ed2c2c02a65f50c2913c88d9d83361b43decd36f3094ebbe088bbb5f784

package/Detox-android/com/wix/detox/20.0.7-prerelease.0/detox-20.0.7-prerelease.0-javadoc.jar.sha512

@@ -1 +0,0 @@
-4eaa276ed4517115f488a2fd76b24df233eb630eacf10544a90d7ef57ab0bf827d7495c9b0f39fd79edf7568bbde0b693d8bec308257bc1f0804a7dc6a32161f

package/Detox-android/com/wix/detox/20.0.7-prerelease.0/detox-20.0.7-prerelease.0-sources.jar.md5

@@ -1 +0,0 @@
-61e4258cf4c8c851cfafb2103a2d3b5e

package/Detox-android/com/wix/detox/20.0.7-prerelease.0/detox-20.0.7-prerelease.0-sources.jar.sha1

@@ -1 +0,0 @@
-f4fe7c3a998cef8964ff7f5af05eb529b38e09ee

package/Detox-android/com/wix/detox/20.0.7-prerelease.0/detox-20.0.7-prerelease.0-sources.jar.sha256

@@ -1 +0,0 @@
-114b949bbbf5f8fe5f6f355f5f629edb38e08e2221b6303e34a638c7bb824765

package/Detox-android/com/wix/detox/20.0.7-prerelease.0/detox-20.0.7-prerelease.0-sources.jar.sha512

@@ -1 +0,0 @@
-c77832e978a4e102716c7fd6fa70d04645e02c8a377bdf09cfa482a8f70a514c5d35d7dd4f0c10b5dcd690817a3fb740f2a7914fc905a22489522e7363f9f44d

package/Detox-android/com/wix/detox/20.0.7-prerelease.0/detox-20.0.7-prerelease.0.aar.md5

@@ -1 +0,0 @@
-90f9a8b95a3f10adc93442d4f4684092

package/Detox-android/com/wix/detox/20.0.7-prerelease.0/detox-20.0.7-prerelease.0.aar.sha1

@@ -1 +0,0 @@
-f03ce7143af53f09f8734c8ee3eb5a532f8143fa

package/Detox-android/com/wix/detox/20.0.7-prerelease.0/detox-20.0.7-prerelease.0.aar.sha256

@@ -1 +0,0 @@
-742ad662c67c18780e0844567205b1d02772f160b1876154cbe485bf8048c461

package/Detox-android/com/wix/detox/20.0.7-prerelease.0/detox-20.0.7-prerelease.0.aar.sha512

@@ -1 +0,0 @@
-dfd697ec8d6f5ee8296379bbbf3f5b487ad70a729a658c6118b2e4923c10959bdd56a30959eb48afa1cf0bfe210ba8a500423d6b9f3993c2570505d59288c0de

package/Detox-android/com/wix/detox/20.0.7-prerelease.0/detox-20.0.7-prerelease.0.pom.md5

@@ -1 +0,0 @@
-7bf66c5ea2c958c30ac7565193ba4bc8

package/Detox-android/com/wix/detox/20.0.7-prerelease.0/detox-20.0.7-prerelease.0.pom.sha1

@@ -1 +0,0 @@
-2485b54c1a62e1557d76ebc51a1741ccc4f10304

package/Detox-android/com/wix/detox/20.0.7-prerelease.0/detox-20.0.7-prerelease.0.pom.sha256

@@ -1 +0,0 @@
-d133d5b090110c223f578f117b344a1bb1e86c3df2d55f50dfd00f1b17498254

package/Detox-android/com/wix/detox/20.0.7-prerelease.0/detox-20.0.7-prerelease.0.pom.sha512

@@ -1 +0,0 @@
-11a29cc20eb22ce2133475e187c0941b7d32bff186857ddceb2ee88f3f3b1d46e32eb0cbed032598f57933cca7b9ed8d36008d9c8b882dc202afdd20d9fe5def

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/testFull/java/com/wix/detox/reactnative/idlingresources/timers/DefaultIdleInterrogationStrategySpec.kt

@@ -1,115 +0,0 @@
-package com.wix.detox.reactnative.idlingresources.timers
-
-import com.facebook.react.bridge.NativeModule
-import com.wix.detox.UTHelpers
-import org.assertj.core.api.Assertions
-import org.spekframework.spek2.Spek
-import org.spekframework.spek2.style.specification.describe
-import java.util.*
-import java.util.concurrent.Executors
-
-private const val BUSY_INTERVAL_MS = 1500
-private const val MEANINGFUL_TIMER_INTERVAL = BUSY_INTERVAL_MS
-
-data class TimerStub(
-        private var mCallbackID: Int,
-        private var mTargetTime: Long,
-        private var mInterval: Int,
-        private var mRepeat: Boolean)
-
-class TimersNativeModuleStub : NativeModule {
-    val mTimers: PriorityQueue<Any> = PriorityQueue(2) { _, _ -> 0}
-    val mTimerGuard = "Lock-Mock"
-
-    override fun onCatalystInstanceDestroy() {}
-    override fun invalidate() {}
-
-    override fun getName(): String = "TimersNativeModuleStub"
-    override fun canOverrideExistingModule() = false
-    override fun initialize() {}
-}
-
-private fun now() = System.nanoTime() / 1000000L
-private fun aTimer(targetTime: Long, interval: Int, isRepeating: Boolean): TimerStub {
-    return TimerStub(-1, targetTime, interval, isRepeating)
-}
-private fun aTimer(interval: Int, isRepeating: Boolean) = aTimer(now() + interval + 10, interval, isRepeating)
-private fun aOneShotTimer(interval: Int) = aTimer(interval, false)
-private fun aRepeatingTimer(interval: Int) = aTimer(interval, true)
-private fun anOverdueTimer() = aTimer(now() - 100, 123, false)
-
-object DefaultIdleInterrogationStrategySpec: Spek({
-  describe("Default timers idle-interrogation strategy") {
-
-      lateinit var timersNativeModule: TimersNativeModuleStub
-
-      beforeEachTest {
-          timersNativeModule = TimersNativeModuleStub()
-      }
-
-      fun givenTimer(timer: Any) {
-          timersNativeModule.mTimers.add(timer)
-      }
-
-      fun uut() = DefaultIdleInterrogationStrategy(timersNativeModule)
-
-      it("should be idle if there are no timers in queue") {
-          Assertions.assertThat(uut().isIdleNow()).isTrue()
-      }
-
-      it("should be busy if there's a meaningful pending timer") {
-          givenTimer(aOneShotTimer(MEANINGFUL_TIMER_INTERVAL))
-          Assertions.assertThat(uut().isIdleNow()).isFalse()
-      }
-
-      it("should be idle if pending timer is too far away (ie not meaningful)") {
-          givenTimer(aOneShotTimer(BUSY_INTERVAL_MS + 1))
-          Assertions.assertThat(uut().isIdleNow()).isTrue()
-      }
-
-      it("should be idle if the only timer is a repeating one") {
-          givenTimer(aRepeatingTimer(MEANINGFUL_TIMER_INTERVAL))
-          Assertions.assertThat(uut().isIdleNow()).isTrue()
-      }
-
-      it("should be busy if a meaningful pending timer lies beyond a repeating one") {
-          givenTimer(aRepeatingTimer(BUSY_INTERVAL_MS / 10))
-          givenTimer(aOneShotTimer(BUSY_INTERVAL_MS))
-          Assertions.assertThat(uut().isIdleNow()).isFalse()
-      }
-
-      /**
-       * Note: Reversed logic due to this issue: https://github.com/wix/Detox/issues/1171 !!!
-       *
-       * Apparently at times (rare) this caused Espresso to think we're idle too soon, rendering
-       * it never to query any idling resource again even after the timer effectively expires...
-       */
-      it("should be *busy* even if all timers are overdue") {
-          givenTimer(anOverdueTimer())
-          givenTimer(anOverdueTimer())
-          Assertions.assertThat(uut().isIdleNow()).isFalse()
-      }
-
-      it("should be busy if has a meaningful pending timer set beyond an overdue timer") {
-          givenTimer(anOverdueTimer())
-          givenTimer(aOneShotTimer(MEANINGFUL_TIMER_INTERVAL))
-          Assertions.assertThat(uut().isIdleNow()).isFalse()
-      }
-
-      it("should yield to other threads using the timers module") {
-          val executor = Executors.newSingleThreadExecutor()
-          var isIdle: Boolean? = null
-
-          synchronized(timersNativeModule.mTimerGuard) {
-              executor.submit {
-                  isIdle = uut().isIdleNow()
-              }
-              UTHelpers.yieldToOtherThreads(executor)
-              Assertions.assertThat(isIdle).isNull()
-          }
-          UTHelpers.yieldToOtherThreads(executor)
-          Assertions.assertThat(isIdle).isNotNull()
-          executor.shutdownNow()
-      }
-  }
-})