detox 19.3.1 → 19.4.0-alpha.0

package/Detox-android/com/wix/detox/19.4.0-alpha.0/detox-19.4.0-alpha.0-javadoc.jar.md5

@@ -0,0 +1 @@
+14335d4accfdb6db18c017d6d4c559bc

package/Detox-android/com/wix/detox/19.4.0-alpha.0/detox-19.4.0-alpha.0-javadoc.jar.sha1

@@ -0,0 +1 @@
+a79d71c2692fa83edc476d2ffa6496fbb1604763

package/Detox-android/com/wix/detox/19.4.0-alpha.0/detox-19.4.0-alpha.0-javadoc.jar.sha256

@@ -0,0 +1 @@
+9842f3ec080250019cdc73325be798a37722e00bcde45f804980425e53ac9c2d

package/Detox-android/com/wix/detox/19.4.0-alpha.0/detox-19.4.0-alpha.0-javadoc.jar.sha512

@@ -0,0 +1 @@
+e70d36237404abd83bca254aebece2bae4eb35c9b80353c5e3b49a491a1ebea8d972d5870c3e57a8e8ce76c97a24547fc6231fce6b37f5ffa067516108cb6287

package/Detox-android/com/wix/detox/19.4.0-alpha.0/detox-19.4.0-alpha.0-sources.jar.md5

@@ -0,0 +1 @@
+1af7059a015aa9f321071ceab52be60f

package/Detox-android/com/wix/detox/19.4.0-alpha.0/detox-19.4.0-alpha.0-sources.jar.sha1

@@ -0,0 +1 @@
+a56771ac8e035424cc1c22a0a41dda08a172fc03

package/Detox-android/com/wix/detox/19.4.0-alpha.0/detox-19.4.0-alpha.0-sources.jar.sha256

@@ -0,0 +1 @@
+3e02271c29f87482ad663a08d736c4e2614063c8b221704886bd6b7ef096eaa5

package/Detox-android/com/wix/detox/19.4.0-alpha.0/detox-19.4.0-alpha.0-sources.jar.sha512

@@ -0,0 +1 @@
+16722733fee56837646224847fff8f835e029f5a17d2ae32960f99497c3cbf04f45ce1a3eb9dae92bc8ca4cbefa63e6e17600ba27ab70bace35cf5702816d6ca

package/Detox-android/com/wix/detox/19.4.0-alpha.0/detox-19.4.0-alpha.0.aar.md5

@@ -0,0 +1 @@
+db5438a69056782c6b65faf53f746bfe

package/Detox-android/com/wix/detox/19.4.0-alpha.0/detox-19.4.0-alpha.0.aar.sha1

@@ -0,0 +1 @@
+818e8057a07f4ea8145d6c0490906340ebad700d

package/Detox-android/com/wix/detox/19.4.0-alpha.0/detox-19.4.0-alpha.0.aar.sha256

@@ -0,0 +1 @@
+082dac5e9d4dba9ac093cb3f25b8bde915469055fe1c986a401ea65fb5f10d65

package/Detox-android/com/wix/detox/19.4.0-alpha.0/detox-19.4.0-alpha.0.aar.sha512

@@ -0,0 +1 @@
+878279c9e3df36b86a64f71f577138fbb7ebc9f8956e77d61c811c55d5f1f6d8cfa06750a29c2089905e1458fa0cac61c108fdacdfa89a05882c1e0dea54e077

package/Detox-android/com/wix/detox/{19.3.1/detox-19.3.1.pom → 19.4.0-alpha.0/detox-19.4.0-alpha.0.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
-  <version>19.3.1</version>
+  <version>19.4.0-alpha.0</version>
   <packaging>aar</packaging>
   <name>Detox</name>
   <description>Gray box end-to-end testing and automation library for mobile apps</description>
@@ -33,31 +33,25 @@
     <dependency>
       <groupId>androidx.test.espresso</groupId>
       <artifactId>espresso-core</artifactId>
-      <version>3.3.0</version>
+      <version>3.4.0</version>
       <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>com.google.code.findbugs</groupId>
-          <artifactId>jsr305</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>androidx.test.espresso</groupId>
       <artifactId>espresso-web</artifactId>
-      <version>3.3.0</version>
+      <version>3.4.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>androidx.test</groupId>
       <artifactId>rules</artifactId>
-      <version>1.2.0</version>
+      <version>1.4.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>androidx.test.ext</groupId>
       <artifactId>junit</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

package/Detox-android/com/wix/detox/19.4.0-alpha.0/detox-19.4.0-alpha.0.pom.md5

@@ -0,0 +1 @@
+a38333dfd1c07236c8b5d0eb10a08757

package/Detox-android/com/wix/detox/19.4.0-alpha.0/detox-19.4.0-alpha.0.pom.sha1

@@ -0,0 +1 @@
+2ddc1e10d6af2c7781ceb0ec9c668b7b90ce712b

package/Detox-android/com/wix/detox/19.4.0-alpha.0/detox-19.4.0-alpha.0.pom.sha256

@@ -0,0 +1 @@
+707e4c68172fbc8ec9a1f784042d111e39f11ca5717f18fa9049c2ad16a68106

package/Detox-android/com/wix/detox/19.4.0-alpha.0/detox-19.4.0-alpha.0.pom.sha512

@@ -0,0 +1 @@
+5b82f5611dd8d959c16d790134fa809d97fb3469108aa918179a7b26f14b016292598a3de8860d1cf4504220492db63d3d2df3b4d64face976404b6c2137b70d

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

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
   <versioning>
-    <latest>19.3.1</latest>
-    <release>19.3.1</release>
+    <latest>19.4.0-alpha.0</latest>
+    <release>19.4.0-alpha.0</release>
     <versions>
-      <version>19.3.1</version>
+      <version>19.4.0-alpha.0</version>
     </versions>
-    <lastUpdated>20211212121551</lastUpdated>
+    <lastUpdated>20211223152137</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-a09e7c7ea6fad8e6d449ba92bffe9295
+3d2fd5ee475a78c4a312206c7c654bde

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

@@ -1 +1 @@
-1e3977640e5bda05cc649dabe540e16031ac9269
+850604928677367ba747042ab7194f3f2f145fe6

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

@@ -1 +1 @@
-ada0c25b3200e63c5afd385b24d107c2ee86a70ef0b75ff4a8473ceec45a6901
+9ddbd8a3557e167a80a211bf2f3345f7ef8354160256d70c5afec52ce3080688

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

@@ -1 +1 @@
-7a60028c1ad23d8c376721100f29339307471c493aa0bd7bf3c54ba51b0cf0917b417c25708d5a4635dfc9705e992bcd9261e2c48e460eefdbda59056e24ef0e
+893c523faf3edff5a02bf0d1d6f5cac1c55225690ac62bd820ed02a0ef6ae268fd96549a1edbeba8679863edccbe00fb391885beabefde6f434632c273753ba0

package/android/build.gradle

@@ -2,10 +2,10 @@ buildscript {
     ext {
         isOfficialDetoxLib = true
         kotlinVersion = '1.2.0'
-        dokkaVersion = '0.9.18'
-        buildToolsVersion = '29.0.3'
-        compileSdkVersion = 29
-        targetSdkVersion = 29
+        dokkaVersion = '1.6.0'
+        buildToolsVersion = '30.0.2'
+        compileSdkVersion = 31
+        targetSdkVersion = 31
         minSdkVersion = 21
     }
     ext.detoxKotlinVersion = ext.kotlinVersion
@@ -15,7 +15,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokkaVersion"
 

package/android/detox/build.gradle

@@ -3,9 +3,9 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 def _ext = rootProject.ext
-def _compileSdkVersion = _ext.has('compileSdkVersion') ? _ext.compileSdkVersion : 29
-def _targetSdkVersion = _ext.has('targetSdkVersion') ? _ext.targetSdkVersion : 29
-def _buildToolsVersion = _ext.has('buildToolsVersion') ? _ext.buildToolsVersion : '29.0.3'
+def _compileSdkVersion = _ext.has('compileSdkVersion') ? _ext.compileSdkVersion : 31
+def _targetSdkVersion = _ext.has('targetSdkVersion') ? _ext.targetSdkVersion : 31
+def _buildToolsVersion = _ext.has('buildToolsVersion') ? _ext.buildToolsVersion : '30.0.2'
 def _minSdkVersion = _ext.has('minSdkVersion') ? _ext.minSdkVersion : 18
 def _kotlinVersion = _ext.has('detoxKotlinVersion') ? _ext.detoxKotlinVersion : '1.2.0'
 def _kotlinStdlib = _ext.has('detoxKotlinStdlib') ? _ext.detoxKotlinStdlib : 'kotlin-stdlib-jdk8'
@@ -80,22 +80,30 @@ dependencies {
 }
 
 // androidx.test deps.
-// All are aligned with this release: https://developer.android.com/jetpack/androidx/releases/test#1.2.0
+// All are aligned with this release: https://developer.android.com/jetpack/androidx/releases/test#1.4.0
 dependencies {
 
-    // Versions are in-sync with the 'androidx-test-1.2.0' release/tag of the android-test github repo,
-    // used by the Detox generator. See https://github.com/android/android-test/releases/tag/androidx-test-1.2.0
+    // Versions are in-sync with the 'androidx-test-1.4.0' release/tag of the android-test github repo,
+    // used by the Detox generator. See https://github.com/android/android-test/releases/tag/androidx-test-1.4.0
     // Important: Should remain so when generator tag is replaced!
-    api('androidx.test.espresso:espresso-core:3.3.0') { // Needed all across Detox but also makes Espresso seamlessly provided to Detox users with hybrid apps/E2E-tests.
-        exclude group: 'com.google.code.findbugs', module: 'jsr305'
+    api('androidx.test.espresso:espresso-core:3.4.0') {
+        because 'Needed all across Detox but also makes Espresso seamlessly provided to Detox users with hybrid apps/E2E-tests.'
+    }
+    api('androidx.test.espresso:espresso-web:3.4.0') {
+        because 'Web-View testing'
+    }
+    api('androidx.test:rules:1.4.0') {
+        because 'of ActivityTestRule. Needed by users *and* internally used by Detox.'
+    }
+    api('androidx.test.ext:junit:1.1.3') {
+        because 'Needed so as to seamlessly provide AndroidJUnit4 to Detox users. Depends on junit core.'
     }
-    api 'androidx.test.espresso:espresso-web:3.3.0' // Web-View testing
-    api 'androidx.test:rules:1.2.0' // Needed because of ActivityTestRule. Needed by users *and* internally used by Detox.
-    api 'androidx.test.ext:junit:1.1.1' // Needed so as to seamlessly provide AndroidJUnit4 to Detox users. Depends on junit core.
 
     // Version is the latest; Cannot sync with the Github repo (e.g. android/android-test) because the androidx
     // packaging version of associated classes is simply not there...
-    api 'androidx.test.uiautomator:uiautomator:2.2.0' // Needed by Detox but also makes UIAutomator seamlessly provided to Detox users with hybrid apps/E2E-tests.
+    api('androidx.test.uiautomator:uiautomator:2.2.0') {
+        because 'Needed by Detox but also makes UIAutomator seamlessly provided to Detox users with hybrid apps/E2E-tests.'
+    }
 }
 
 // Third-party/extension deps.
@@ -103,7 +111,9 @@ dependencies {
     implementation('com.google.android.material:material:1.2.1') {
         because 'Material components are mentioned explicitly (e.g. Slider in get-attributes handler)'
     }
-    implementation 'org.apache.commons:commons-lang3:3.7' // Needed by invoke. Warning: Upgrading to newer versions is not seamless.
+    implementation('org.apache.commons:commons-lang3:3.7') {
+        because 'Needed by invoke. Warning: Upgrading to newer versions is not seamless.'
+    }
     implementation 'com.github.anrwatchdog:anrwatchdog:1.4.0'
 
     implementation fileTree(dir: '../libs', includes: ['*.jar']) // Includes: Genymotion SDK

package/android/detox/proguard-rules-app.pro

@@ -12,3 +12,4 @@
 -keep class kotlin.collections.** { *; }
 -keep class kotlin.text.** { *; }
 -keep class kotlin.io.** { *; }
+-keep class okhttp3.** { *; }

package/android/detox/publishing.gradle

@@ -85,41 +85,31 @@ initPublishing()
  * Dokka is the official javadoc equivalent that supports kotlin KDoc (see https://github.com/Kotlin/dokka)
  */
 
-dokka {
-    // Note: this only remains valid as long as we don't move kotlin code to src/main/kotlin instead of src/main/java.
-    // Will have to keep this up to date if we decided to do so.
-    sourceDirs = files(android.sourceSets.main.java.srcDirs)
-
-    // Nothing to add to what kotlinTasks() resolves on its own
-//    classpath = []
-//    classpath += files(android.bootClasspath)
-//    classpath += files(project.configurations.getByName('compile').asList())
-//    classpath += files(android.libraryVariants.collect { variant ->
-//        variant.javaCompile.classpath.files
-//    }.flatten())
-
-    reportUndocumented = false
-    skipEmptyPackages = true
-
-    outputFormat = 'javadoc' // https://github.com/Kotlin/dokka#output-formats
-    outputDirectory = "$buildDir/dokkaDoc" // Temp 'exploded' dir for .jar creation (i.e. by dokkaDocJar task)
-
-    def suppressedPackages = ["android_libs", "com.wix.detox.espresso.common.annot"]
-    for (String packagePrefix: suppressedPackages) {
-        packageOptions {
-            prefix = packagePrefix
-            suppress = true
+tasks.named("dokkaJavadoc") {
+    File dokkaDoc = new File("$buildDir/dokkaDoc");
+    outputDirectory.set(dokkaDoc)
+    dokkaSourceSets {
+        named("main") {
+            sourceRoots.from(android.sourceSets.main.java.srcDirs)
+            reportUndocumented.set(false)
+            skipEmptyPackages.set(true)
+            def suppressedPackages = ["android_libs", "com.wix.detox.espresso.common.annot"]
+            for (String packagePrefix : suppressedPackages) {
+                packageOptions {
+                    prefix = packagePrefix
+                    suppress = true
+                }
+            }
         }
     }
-
+}
     // 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.
-}
 
-task dokkaDocJar(type: Jar, dependsOn: dokka) {
+task dokkaDocJar(type: Jar, dependsOn: dokkaJavadoc) {
     from "$buildDir/dokkaDoc"
     classifier = 'javadoc'
 }

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

@@ -9,6 +9,7 @@ import com.wix.detox.LaunchArgs
 import com.wix.detox.reactnative.idlingresources.*
 import com.wix.detox.reactnative.idlingresources.timers.TimersIdlingResource
 import com.wix.detox.reactnative.idlingresources.timers.getInterrogationStrategy
+import com.wix.detox.reactnative.idlingresources.uimodule.UIModuleIdlingResource
 import org.joor.Reflect
 import org.joor.ReflectException
 import java.util.Set

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

@@ -0,0 +1,36 @@
+package com.wix.detox.reactnative.idlingresources.uimodule
+
+import android.util.Log
+import com.wix.detox.common.DetoxLog
+import org.joor.Reflect
+import org.joor.ReflectException
+
+private const val FIELD_TAG = "mTag"
+private const val FIELD_NUM_RETRIES = "numRetries"
+private const val FIELD_COMMAND = "mCommand"
+
+class DispatchCommandOperationReflected(val instance: Any?) {
+    val tag: Int?
+        get() = try {
+            Reflect.on(instance).field(FIELD_TAG).get<Int>()
+        } catch (e: ReflectException) {
+            Log.e(DetoxLog.LOG_TAG, "failed to get $FIELD_TAG ", e)
+            null
+        }
+
+    val numRetries: Int?
+        get() = try {
+            Reflect.on(instance).field(FIELD_NUM_RETRIES).get<Int>()
+        } catch (e: ReflectException) {
+            Log.e(DetoxLog.LOG_TAG, "failed to get $FIELD_NUM_RETRIES ", e)
+            0
+        }
+
+    val viewCommand: String?
+        get() = try {
+            Reflect.on(instance).field(FIELD_COMMAND).get<String>()
+        } catch (e: ReflectException) {
+            Log.e(DetoxLog.LOG_TAG, "failed to get $FIELD_COMMAND ", e)
+            null
+        }
+}

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

@@ -0,0 +1,28 @@
+package com.wix.detox.reactnative.idlingresources.uimodule
+
+import android.util.Log
+import android.view.View
+import com.facebook.react.uimanager.NativeViewHierarchyManager
+import com.facebook.react.uimanager.UIViewOperationQueue
+import com.wix.detox.common.DetoxLog.Companion.LOG_TAG
+import org.joor.Reflect
+import org.joor.ReflectException
+
+private const val FIELD_NATIVE_HIERARCHY_MANAGER = "mNativeViewHierarchyManager"
+
+class NativeHierarchyManagerReflected(uIViewOperationQueueInstance: UIViewOperationQueue) {
+    private val reflected = Reflect.on(uIViewOperationQueueInstance)
+
+    fun getViewClass(tag: Int): View? {
+        return nativeViewHierarchyManager()?.resolveView(tag)
+    }
+
+    private fun nativeViewHierarchyManager(): NativeViewHierarchyManager? {
+        return try {
+            reflected.field(FIELD_NATIVE_HIERARCHY_MANAGER).get<NativeViewHierarchyManager>()
+        } catch(e: ReflectException) {
+            Log.e(LOG_TAG, "failed to get $FIELD_NATIVE_HIERARCHY_MANAGER ", e.cause)
+            null
+        }
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.wix.detox.reactnative.idlingresources.uimodule
+
+import android.util.Log
+import android.view.View
+import com.wix.detox.common.DetoxLog.Companion.LOG_TAG
+import java.lang.ref.WeakReference
+
+private const val NUM_TIMES_BEFORE_NOTIFY_IDLE = 10
+private const val SET_NATIVE_VALUE = "setNativeValue"
+private const val CLASS_REACT_SWITCH = "com.facebook.react.views.switchview.ReactSwitch"
+
+class RN66Workaround {
+    private var timesStuckQueueDetected = 0
+    private var stuckOperation: WeakReference<Any?>? = null
+
+    // This is a workaround for https://github.com/facebook/react-native/issues/32594
+    // uses duck typing heuristics to determine that this is probably the stuck Switch operation and if so, ignores it
+    fun isScarceUISwitchCommandStuckInQueue(uiManagerModuleReflected: UIManagerModuleReflected): Boolean {
+        var isStuckSwitchOperation = false
+
+        if (uiManagerModuleReflected.getUIOpsCount() == 1) {
+            val nextUIOperation = uiManagerModuleReflected.getNextUIOpReflected()
+            val view = getUIOpView(uiManagerModuleReflected, nextUIOperation)
+            val isReactSwitch = isReactSwitch(view)
+            val hasOneRetryIncremented = nextUIOperation?.numRetries == 1
+            val isSetNativeValueCommand = (nextUIOperation?.viewCommand ?: "") == SET_NATIVE_VALUE
+
+            if (isReactSwitch && hasOneRetryIncremented && isSetNativeValueCommand) {
+                if (stuckOperation?.get() == nextUIOperation?.instance) {
+                    timesStuckQueueDetected++
+                } else {
+                    stuckOperation = WeakReference(nextUIOperation?.instance)
+                    timesStuckQueueDetected = 0
+                }
+            }
+
+            if (timesStuckQueueDetected >= NUM_TIMES_BEFORE_NOTIFY_IDLE) {
+                isStuckSwitchOperation = true
+            }
+        } else {
+            timesStuckQueueDetected = 0
+        }
+        return isStuckSwitchOperation
+    }
+
+    private fun getUIOpView(uiManagerModuleReflected: UIManagerModuleReflected, uiOperation: DispatchCommandOperationReflected?): View? {
+        val nativeViewHierarchyManager = uiManagerModuleReflected.nativeViewHierarchyManager() ?: return null
+        val tag = uiOperation?.tag ?: return null
+        return nativeViewHierarchyManager.getViewClass(tag)
+    }
+
+    private fun isReactSwitch(view: View?) = try {
+        val ReactSwitchClass: Class<*> = Class.forName(CLASS_REACT_SWITCH)
+        if (view != null) ReactSwitchClass.isAssignableFrom(view.javaClass) else false
+    } catch (e: ClassNotFoundException) {
+        Log.e(LOG_TAG, "failed to get $CLASS_REACT_SWITCH class ", e.cause)
+        false
+    }
+}

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

@@ -0,0 +1,70 @@
+package com.wix.detox.reactnative.idlingresources.uimodule
+
+import android.util.Log
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.uimanager.UIViewOperationQueue
+import com.wix.detox.common.DetoxLog.Companion.LOG_TAG
+import org.joor.Reflect
+
+private const val CLASS_UI_MANAGER_MODULE = "com.facebook.react.uimanager.UIManagerModule"
+private const val METHOD_GET_NATIVE_MODULE = "getNativeModule"
+private const val METHOD_GET_UI_IMPLEMENTATION = "getUIImplementation"
+private const val FIELD_UI_OPERATION_QUEUE = "mOperationsQueue"
+private const val FIELD_DISPATCH_RUNNABLES = "mDispatchUIRunnables"
+private const val FIELD_DISPATCH_RUNNABLES_LOCK = "mDispatchRunnablesLock"
+private const val FIELD_NON_BATCHED_OPS = "mNonBatchedOperations"
+private const val FIELD_NON_BATCHED_OPS_LOCK = "mNonBatchedOperationsLock"
+private const val METHOD_IS_EMPTY = "isEmpty"
+
+class UIManagerModuleReflected(private val reactContext: ReactContext) {
+
+    fun getUIOpsCount(): Int = (viewCommandOperations()?.size ?: 0)
+    fun getNextUIOpReflected() = viewCommandOperations()?.firstCommandReflected()
+
+    fun nativeViewHierarchyManager(): NativeHierarchyManagerReflected? =
+            getUIOperationQueue()?.let {
+                NativeHierarchyManagerReflected(it)
+            }
+
+    fun isRunnablesListEmpty(): Boolean =
+        getUIOperationQueue()?.let {
+            synchronized(Reflect.on(it).field(FIELD_DISPATCH_RUNNABLES_LOCK).get())  {
+                Reflect.on(it)
+                    .field(FIELD_DISPATCH_RUNNABLES)
+                    .call(METHOD_IS_EMPTY).get<Boolean>()
+            }
+        } ?: true
+
+    fun isNonBatchOpsEmpty(): Boolean =
+        getUIOperationQueue()?.let {
+            synchronized(Reflect.on(it).field(FIELD_NON_BATCHED_OPS_LOCK).get()) {
+                Reflect.on(it)
+                        .field(FIELD_NON_BATCHED_OPS)
+                        .call(METHOD_IS_EMPTY).get<Boolean>()
+            }
+        } ?: true
+
+    fun isOperationQueueEmpty(): Boolean =
+        getUIOperationQueue()?.let {
+            Reflect.on(it).call(METHOD_IS_EMPTY).get<Boolean>()
+        } ?: true
+
+    private fun viewCommandOperations(): ViewCommandOpsQueueReflected? =
+            getUIOperationQueue()?.let {
+                ViewCommandOpsQueueReflected(it)
+            }
+
+
+    private fun getUIOperationQueue(): UIViewOperationQueue? =
+            try {
+                val uiModuleClass = Class.forName(CLASS_UI_MANAGER_MODULE)
+                Reflect.on(reactContext)
+                        .call(METHOD_GET_NATIVE_MODULE, uiModuleClass)
+                        .call(METHOD_GET_UI_IMPLEMENTATION)
+                        .field(FIELD_UI_OPERATION_QUEUE)
+                        .get()
+            } catch (e: Exception) {
+                Log.e(LOG_TAG, "failed to get $CLASS_UI_MANAGER_MODULE instance ", e)
+                null
+            }
+}

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

@@ -0,0 +1,83 @@
+package com.wix.detox.reactnative.idlingresources.uimodule
+
+import android.util.Log
+import android.view.Choreographer
+import androidx.test.espresso.IdlingResource.ResourceCallback
+import com.facebook.react.bridge.ReactContext
+import com.wix.detox.reactnative.helpers.RNHelpers
+import com.wix.detox.reactnative.idlingresources.DetoxBaseIdlingResource
+import com.wix.detox.reactnative.idlingresources.IdlingResourceDescription
+import org.joor.ReflectException
+
+/**
+ * Espresso IdlingResource for React Native's UI Module.
+ * Hooks up to React Native internals to grab the pending ui operations from it.
+ */
+class UIModuleIdlingResource(private val reactContext: ReactContext)
+    : DetoxBaseIdlingResource(), Choreographer.FrameCallback {
+
+    private val rn66workaround = RN66Workaround()
+    private val uiManagerModuleReflected = UIManagerModuleReflected(reactContext)
+    private var callback: ResourceCallback? = null
+
+    override fun getName(): String = UIModuleIdlingResource::class.java.name
+    override fun getDescription() =
+            IdlingResourceDescription.Builder()
+                .name("ui")
+                .addDescription("reason", "UI rendering activity")
+                .build()
+
+    override fun checkIdle(): Boolean {
+        try {
+            if (!reactContext.hasActiveCatalystInstance()) {
+                Log.e(LOG_TAG, "No active CatalystInstance. Should never see this.")
+                return false
+            }
+
+            if (RNHelpers.getNativeModule(reactContext, "com.facebook.react.uimanager.UIManagerModule") == null) {
+                notifyIdle()
+                return true
+            }
+
+            val runnablesAreEmpty = uiManagerModuleReflected.isRunnablesListEmpty()
+            val nonBatchesOpsEmpty = uiManagerModuleReflected.isNonBatchOpsEmpty()
+            var operationQueueEmpty = uiManagerModuleReflected.isOperationQueueEmpty()
+
+            if (!operationQueueEmpty) {
+                operationQueueEmpty = rn66workaround.isScarceUISwitchCommandStuckInQueue(uiManagerModuleReflected)
+            }
+
+            if (runnablesAreEmpty && nonBatchesOpsEmpty && operationQueueEmpty) {
+                notifyIdle()
+                return true
+            }
+
+            Log.i(LOG_TAG, "UIManagerModule is busy")
+            Choreographer.getInstance().postFrameCallback(this)
+            return false
+        } catch (e: ReflectException) {
+            Log.e(LOG_TAG, "Can't set up RN UIModule listener", e.cause)
+        }
+        notifyIdle()
+        return true
+    }
+
+    override fun registerIdleTransitionCallback(callback: ResourceCallback) {
+        this.callback = callback
+        Choreographer.getInstance().postFrameCallback(this)
+    }
+
+    override fun doFrame(frameTimeNanos: Long) {
+        isIdleNow
+    }
+
+    override fun notifyIdle() {
+        callback?.run {
+            onTransitionToIdle()
+        }
+    }
+
+    companion object {
+        private const val LOG_TAG = "Detox"
+    }
+}

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

@@ -0,0 +1,27 @@
+package com.wix.detox.reactnative.idlingresources.uimodule
+
+import android.util.Log
+import com.facebook.react.uimanager.UIViewOperationQueue
+import com.wix.detox.common.DetoxLog.Companion.LOG_TAG
+import org.joor.Reflect
+import org.joor.ReflectException
+
+private const val FIELD_VIEW_COMMAND_OPERATIONS = "mViewCommandOperations"
+
+class ViewCommandOpsQueueReflected(uiViewOperationQueueInstance: UIViewOperationQueue) {
+    private val instance = Reflect.on(uiViewOperationQueueInstance)
+
+    val size: Int?
+        get() = viewCommandOperations()?.size
+
+    fun firstCommandReflected() = DispatchCommandOperationReflected(firstCommand())
+
+    private fun firstCommand() = viewCommandOperations()?.elementAt(0)
+    private fun viewCommandOperations(): Collection<Any>? =
+        try {
+            instance.field(FIELD_VIEW_COMMAND_OPERATIONS).get<Collection<Any>>()
+        } catch(e: ReflectException) {
+            Log.e(LOG_TAG, "could not get reflected field mViewCommandOperations ", e)
+            null
+        }
+}

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

@@ -16,6 +16,7 @@ private class AsyncStorageModuleStub: NativeModule {
     override fun initialize() {}
     override fun canOverrideExistingModule() = false
     override fun onCatalystInstanceDestroy() {}
+    override fun invalidate() {}
 }
 
 class AsyncStorageIdlingResourceSpec: Spek({

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

@@ -22,6 +22,8 @@ class TimersNativeModuleStub : NativeModule {
     val mTimerGuard = "Lock-Mock"
 
     override fun onCatalystInstanceDestroy() {}
+    override fun invalidate() {}
+
     override fun getName(): String = "TimersNativeModuleStub"
     override fun canOverrideExistingModule() = false
     override fun initialize() {}

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "detox",
   "description": "E2E tests and automation for mobile",
-  "version": "19.3.1",
+  "version": "19.4.0-alpha.0",
   "bin": {
     "detox": "local-cli/cli.js"
   },
@@ -48,7 +48,7 @@
     "mocha": ">=6.0.0",
     "mockdate": "^2.0.1",
     "prettier": "1.7.0",
-    "react-native": "0.64.1",
+    "react-native": "0.66.1",
     "react-native-codegen": "^0.0.8",
     "typescript": "^4.5.2",
     "wtfnode": "^0.9.1"
@@ -171,5 +171,5 @@
       }
     }
   },
-  "gitHead": "97ac5df9e482fd12cfd1613d51ae496281060389"
+  "gitHead": "542893790005eeca88614955e02bbb2f26c1d073"
 }

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

@@ -344,7 +344,7 @@ class AppleSimUtils {
     }
 
     const cmdArgs = quote(_.flatten(this._mergeLaunchArgs(launchArgs, languageAndLocale)));
-    let launchBin = `SIMCTL_CHILD_DYLD_INSERT_LIBRARIES="${dylibs}" ` +
+    let launchBin = `SIMCTL_CHILD_NSZombieEnabled=YES SIMCTL_CHILD_DYLD_INSERT_LIBRARIES="${dylibs}" ` +
       `/usr/bin/xcrun simctl launch ${udid} ${bundleId} --args ${cmdArgs}`;
 
     const result = await exec.execWithRetriesAndLogs(launchBin, {

package/src/utils/environment.js

@@ -55,11 +55,11 @@ function getAvdDir(avdName) {
 }
 
 function getAvdManagerPath() {
-  return path.join(getAndroidSDKPath(), 'tools', 'bin', 'avdmanager');
+  return path.join(getAndroidSDKPath(), 'cmdline-tools', 'latest', 'bin', 'avdmanager');
 }
 
 function getAndroidSdkManagerPath() {
-  return path.join(getAndroidSDKPath(), 'tools', 'bin', 'sdkmanager');
+  return path.join(getAndroidSDKPath(), 'cmdline-tools', 'latest', 'bin', 'sdkmanager');
 }
 
 function getAndroidEmulatorPath() {

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

@@ -1 +0,0 @@
-aa55c9b00e351521ce69399a8505e412

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

@@ -1 +0,0 @@
-3f85c2fda9140c5b981ebd83c9b0316cdad5210a

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

@@ -1 +0,0 @@
-b24730ebdb6b47b3cd27f8195f632e1117fc46565c0d6ce684bc8c4a6a3fa15b

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

@@ -1 +0,0 @@
-b9442bd45c68c620ab97821382a095a4005326b4d1248fdb15d21f547b0f73701edd1009cdaf366c31cbf111b2a541f683e803e71f7b1951ec86480fa8bbb4a0

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

@@ -1 +0,0 @@
-3a57b68454634485e89378b459cdce7d

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

@@ -1 +0,0 @@
-18907b1f57b790f717095345d325c1b48730ca04

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

@@ -1 +0,0 @@
-1522127c1dea373e9edf27a669431ba57bd1965aad9f1f30895d02a80dd55920

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

@@ -1 +0,0 @@
-253133008032813ce6f15b399233521858dbf723911ea8a9afdf4e39886e4549cbc55cdfe89cb34c3f6e2135aab3730c7ead42a903f981d428f871b33d29e4a7

package/Detox-android/com/wix/detox/19.3.1/detox-19.3.1.aar.md5

@@ -1 +0,0 @@
-a32fc8da8e9d97ddb6a7e33be3be4cea

package/Detox-android/com/wix/detox/19.3.1/detox-19.3.1.aar.sha1

@@ -1 +0,0 @@
-702aded71e6e005899a7a4de7e0ebc918e1a246b

package/Detox-android/com/wix/detox/19.3.1/detox-19.3.1.aar.sha256

@@ -1 +0,0 @@
-eb0358d9b4e0e233fe61c516a7727154463639a206fa71341a5e9297147e3f2b

package/Detox-android/com/wix/detox/19.3.1/detox-19.3.1.aar.sha512

@@ -1 +0,0 @@
-c323c30943f8d8c27e1defa9a68c8af7da9f3f73b77942401692fa7f5bf99971df8b064b87a9f01544c2feb7f97c08bf95f47cd08c3e6bfddb74203a069913a9

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

@@ -1 +0,0 @@
-4364b6e95e1a47da2cf7bf04a6d56c85

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

@@ -1 +0,0 @@
-8e8d4e7e8e18abd8e7b67c980b95d7b1ff56536a

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

@@ -1 +0,0 @@
-038995f2e2992c90bbb67f45e3946546961ac68ed0a5db04e17dbc8a21f1c6c8

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

@@ -1 +0,0 @@
-2a49593c977fee87aa54ba67534f9326928b23c35d874e17ce6354cca843779bc832105732004ec5c1e36ed14c82a2db1ee378bfdf59d21753ca8dd813807c4c

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

@@ -1,148 +0,0 @@
-package com.wix.detox.reactnative.idlingresources;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import android.util.Log;
-import android.view.Choreographer;
-
-import org.jetbrains.annotations.NotNull;
-import org.joor.Reflect;
-import org.joor.ReflectException;
-
-import androidx.annotation.NonNull;
-
-/**
- * Created by simonracz on 26/07/2017.
- */
-
-/**
- * <p>
- * Espresso IdlingResource for React Native's UI Module.
- * </p>
- *
- * <p>
- * Hooks up to React Native internals to grab the pending ui operations from it.
- * </p>
- *
- * TODO Rewrite this awful, awful class
- */
-public class UIModuleIdlingResource extends DetoxBaseIdlingResource implements Choreographer.FrameCallback {
-    private static final String LOG_TAG = "Detox";
-
-    private final static String CLASS_UI_MANAGER_MODULE = "com.facebook.react.uimanager.UIManagerModule";
-    private final static String METHOD_GET_NATIVE_MODULE = "getNativeModule";
-    private final static String METHOD_HAS_NATIVE_MODULE = "hasNativeModule";
-    private final static String METHOD_GET_UI_IMPLEMENTATION = "getUIImplementation";
-    private final static String FIELD_UI_OPERATION_QUEUE = "mOperationsQueue";
-    private final static String METHOD_IS_EMPTY = "isEmpty";
-    private final static String FIELD_DISPATCH_RUNNABLES = "mDispatchUIRunnables";
-    private final static String FIELD_NON_BATCHES_OPERATIONS = "mNonBatchedOperations";
-    private final static String FIELD_CATALYST_INSTANCE = "mCatalystInstance";
-    private final static String LOCK_RUNNABLES = "mDispatchRunnablesLock";
-    private final static String LOCK_OPERATIONS = "mNonBatchedOperationsLock";
-
-    private ResourceCallback callback;
-    private Object reactContext;
-
-    public UIModuleIdlingResource(@NonNull Object reactContext) {
-        this.reactContext = reactContext;
-    }
-
-    @Override
-    public String getName() {
-        return UIModuleIdlingResource.class.getName();
-    }
-
-    @NotNull
-    @Override
-    public IdlingResourceDescription getDescription() {
-        return new IdlingResourceDescription.Builder()
-                .name("ui")
-                .addDescription("reason", "UI rendering activity")
-                .build();
-    }
-
-    @Override
-    protected boolean checkIdle() {
-        Class<?> uiModuleClass;
-        try {
-            uiModuleClass = Class.forName(CLASS_UI_MANAGER_MODULE);
-        } catch (ClassNotFoundException e) {
-            Log.e(LOG_TAG, "UIManagerModule is not on classpath.");
-            notifyIdle();
-            return true;
-        }
-
-        try {
-            // reactContext.hasActiveCatalystInstance() should be always true here
-            // if called right after onReactContextInitialized(...)
-            if (Reflect.on(reactContext).field(FIELD_CATALYST_INSTANCE).get() == null) {
-                Log.e(LOG_TAG, "No active CatalystInstance. Should never see this.");
-                return false;
-            }
-
-            if (!(boolean)Reflect.on(reactContext).call(METHOD_HAS_NATIVE_MODULE, uiModuleClass).get()) {
-                Log.e(LOG_TAG, "Can't find UIManagerModule.");
-                notifyIdle();
-                return true;
-            }
-
-            Object uiOperationQueue = Reflect.on(reactContext)
-                    .call(METHOD_GET_NATIVE_MODULE, uiModuleClass)
-                    .call(METHOD_GET_UI_IMPLEMENTATION)
-                    .field(FIELD_UI_OPERATION_QUEUE)
-                    .get();
-            Object runnablesLock = Reflect.on(uiOperationQueue).field(LOCK_RUNNABLES).get();
-            Object operationsLock = Reflect.on(uiOperationQueue).field(LOCK_OPERATIONS).get();
-
-            boolean runnablesAreEmpty;
-            boolean nonBatchesOpsEmpty;
-            synchronized (runnablesLock) {
-                runnablesAreEmpty = (boolean) Reflect.on(uiOperationQueue)
-                        .field(FIELD_DISPATCH_RUNNABLES)
-                        .call(METHOD_IS_EMPTY).get();
-            }
-            synchronized (operationsLock) {
-                nonBatchesOpsEmpty = (boolean) Reflect.on(uiOperationQueue)
-                        .field(FIELD_NON_BATCHES_OPERATIONS)
-                        .call(METHOD_IS_EMPTY).get();
-            }
-
-            boolean isOperationQueueEmpty = (Boolean) Reflect.on(uiOperationQueue).call(METHOD_IS_EMPTY).get();
-
-            if (runnablesAreEmpty && nonBatchesOpsEmpty && isOperationQueueEmpty) {
-                notifyIdle();
-                // Log.i(LOG_TAG, "UIManagerModule is idle.");
-                return true;
-            }
-
-            Log.i(LOG_TAG, "UIManagerModule is busy");
-            Choreographer.getInstance().postFrameCallback(this);
-            return false;
-        } catch (ReflectException e) {
-            Log.e(LOG_TAG, "Can't set up RN UIModule listener", e.getCause());
-        }
-
-        notifyIdle();
-        return true;
-    }
-
-    @Override
-    public void registerIdleTransitionCallback(ResourceCallback callback) {
-        this.callback = callback;
-        Choreographer.getInstance().postFrameCallback(this);
-    }
-
-    @Override
-    public void doFrame(long frameTimeNanos) {
-        isIdleNow();
-    }
-
-    @Override
-    protected void notifyIdle() {
-        if (callback != null) {
-            callback.onTransitionToIdle();
-        }
-    }
-}