detox 20.0.0-breaking.new-global-lifecycle.0 → 20.0.3-breaking.new-global-lifecycle.0

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

@@ -0,0 +1 @@
+c6493b7e10e165c7c6e7f0b4cf9d100c

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

@@ -0,0 +1 @@
+6afd03fe5e86a8a04e4caf452772e710d2943deb

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

@@ -0,0 +1 @@
+1fd68b232ab5d4668575c8d666cacb5c8ab02e50f7aed50d8d53d36d2c669eee

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

@@ -0,0 +1 @@
+3b59f3522d88982355734b5a6d74add724fdd37b569bfc4fb07a8a1f954aab82e054bb5348833b9c156479af8440af6aabb4c2f0f684ff10afe7ca330d2a17a1

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

@@ -0,0 +1 @@
+692bae402dc4d4f29b815943905eb9e7

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

@@ -0,0 +1 @@
+130eba535610edf748a958abcddf5b2551b371a6

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

@@ -0,0 +1 @@
+3ab48363cf0d353f3013e0a1157a8f1781e3ef91f86929c321c885aba8f0af52

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

@@ -0,0 +1 @@
+b5034dce6f23e5356cc635d35c511314c074f1a4b01ae5cf15663f00d9b27711add721b3a9e9b318bacae16209e8474ccf3fd29533f4e591353169da7ad6c2c5

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

@@ -0,0 +1 @@
+e7043eb4fd0dfa3c309fd8cd35ee68e5

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

@@ -0,0 +1 @@
+80bef0c22a710dabb0e72b8d15c59125db1bd58b

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

@@ -0,0 +1 @@
+7828ffdff493f8a856efad9b7db540e4e6b13b91260292efe98791013ba2db04

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

@@ -0,0 +1 @@
+a57448b5eec5edfb2b45b99b9c8a6714b3384f71ade0f25da7b453d14c29597e818690b293cefa9be9362be29efb2c420664283cb1fc994883cd143d46506a2f

package/Detox-android/com/wix/detox/{20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0.pom → 20.0.3-breaking.new-global-lifecycle.0/detox-20.0.3-breaking.new-global-lifecycle.0.pom}

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
-  <version>20.0.0-breaking.new-global-lifecycle.0</version>
+  <version>20.0.3-breaking.new-global-lifecycle.0</version>
   <packaging>aar</packaging>
   <name>Detox</name>
   <description>Gray box end-to-end testing and automation library for mobile apps</description>

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

@@ -0,0 +1 @@
+1576eed74ead432e6108c03493a6873c

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

@@ -0,0 +1 @@
+092446317977f5dc4261d559e9608932254f5e3b

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

@@ -0,0 +1 @@
+f05c7aab6a3e42433c2934f4b7617441cce2d9c1879319cd5999b765cce8d968

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

@@ -0,0 +1 @@
+1c0756ed5dd13915de4625248beffb25c78fdf56635b54b65df36c61116ae860a66bc421e14641630d165b1cc630f51a225221dbd8789214d108bc531eb51ef7

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

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
   <versioning>
-    <latest>20.0.0-breaking.new-global-lifecycle.0</latest>
-    <release>20.0.0-breaking.new-global-lifecycle.0</release>
+    <latest>20.0.3-breaking.new-global-lifecycle.0</latest>
+    <release>20.0.3-breaking.new-global-lifecycle.0</release>
     <versions>
-      <version>20.0.0-breaking.new-global-lifecycle.0</version>
+      <version>20.0.3-breaking.new-global-lifecycle.0</version>
     </versions>
-    <lastUpdated>20220719065707</lastUpdated>
+    <lastUpdated>20220815091331</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-d6bdfc52b842956498f8c9915246ef54
+2ef77b80bf45d2428c511a0c5723661e

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

@@ -1 +1 @@
-7d7b975015b7c6dc6804b63b99522ffaca9d09ff
+a0dbdca1e65a0410798600e9b701a189b1831aac

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

@@ -1 +1 @@
-e3b6dce4491bb1703968fd4b82d89bfdf8c25014eac1fda6a64c196b9a79cea2
+ef9c05cfe345d3f50b63c73a2207a80d0a417bb2288059f987285188457c41eb

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

@@ -1 +1 @@
-3167b1a219d343785c974586d46d5a19dbe6985dd444d70f5bd364b747272c3da434f60f743c5a40c809a4f9db5e3665403471e5ed2756c50439c841993856cf
+495f7993e651cf04a0cc907638214236249c2944faec87b77795d0eb923a602b414c550dbe0d82ad3555d1b7f55a62671bcdf81e5169f1f23a8fecd53f1f5cca

package/android/build.gradle

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

package/android/detox/build.gradle

@@ -5,8 +5,8 @@ apply plugin: 'kotlin-android-extensions'
 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 : '30.0.2'
-def _minSdkVersion = _ext.has('minSdkVersion') ? _ext.minSdkVersion : 18
+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 _kotlinStdlib = _ext.has('detoxKotlinStdlib') ? _ext.detoxKotlinStdlib : 'kotlin-stdlib-jdk8'
 

package/android/detox/publish-pom.gradle

@@ -4,8 +4,12 @@ project.ext.buildPomXmlDependencies = { pom, configurations ->
     pom.withXml {
         final rootNode = asNode().appendNode('dependencies')
         addConfigurationDependencies(rootNode, configurations.api, 'compile')
-        addConfigurationDependencies(rootNode, configurations.compile, 'compile')
         addConfigurationDependencies(rootNode, configurations.implementation, 'runtime')
+
+        // Legacy syntax
+        if (configurations.hasProperty('compile')) {
+            addConfigurationDependencies(rootNode, configurations.compile, 'compile')
+        }
     }
 }
 

package/android/detox/publishing.gradle

@@ -140,13 +140,15 @@ signing {
 
 project.afterEvaluate {
     project.tasks.all { Task task ->
-        android.libraryVariants.all { variant ->
-            String variantName = variant.name.capitalize()
-            if (task.name == "publishMaven${variantName}AarPublicationToMavenRepository") {
-                task.dependsOn "assemble${variantName}"
-                task.dependsOn project.tasks.signArchives
-                task.doFirst {
-                    onPrePublish()
+        android {
+            libraryVariants.all { variant ->
+                String variantName = variant.name.capitalize()
+                if (task.name == "publishMaven${variantName}AarPublicationToMavenRepository") {
+                    task.dependsOn "assemble${variantName}"
+                    task.dependsOn project.tasks.signArchives
+                    task.doFirst {
+                        onPrePublish()
+                    }
                 }
             }
         }

package/android/detox/src/full/java/com/wix/detox/adapters/server/WebSocketClient.java

@@ -2,6 +2,8 @@ package com.wix.detox.adapters.server;
 
 import android.util.Log;
 
+import com.wix.detox.common.DetoxErrors;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -84,7 +86,7 @@ public class WebSocketClient {
                 wsEventsHandler.onAction(type, params.toString(), messageId);
             }
         } catch (JSONException e) {
-            Log.e(LOG_TAG, "Detox Error: receiveAction decode - " + e.toString());
+            throw new DetoxErrors.DetoxIllegalArgumentException(e);
         }
     }
 

package/android/detox/src/full/java/com/wix/detox/espresso/DetoxAction.java

@@ -2,7 +2,6 @@ package com.wix.detox.espresso;
 
 import android.view.View;
 
-import com.facebook.react.views.slider.ReactSliderManager;
 import com.wix.detox.common.DetoxErrors.DetoxRuntimeException;
 import com.wix.detox.common.DetoxErrors.StaleActionException;
 import com.wix.detox.espresso.action.AdjustSliderToPositionAction;
@@ -151,8 +150,7 @@ public class DetoxAction {
     }
 
     public static ViewAction adjustSliderToPosition(final double newPosition) {
-        ReactSliderManager reactSliderManager = new ReactSliderManager();
-        return new AdjustSliderToPositionAction(newPosition, reactSliderManager);
+        return new AdjustSliderToPositionAction(newPosition);
     }
 
     public static ViewAction takeViewScreenshot() {

package/android/detox/src/full/java/com/wix/detox/espresso/UiAutomatorHelper.java

@@ -5,7 +5,7 @@ import android.util.Log;
 import android.view.Choreographer;
 
 import com.wix.detox.common.UIThread;
-import com.wix.detox.espresso.common.utils.UiControllerUtils;
+import com.wix.detox.espresso.action.common.utils.UiControllerUtils;
 
 import org.joor.Reflect;
 import org.joor.ReflectException;

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

@@ -0,0 +1,22 @@
+package com.wix.detox.espresso.action
+
+import android.view.View
+import androidx.appcompat.widget.AppCompatSeekBar
+import androidx.test.espresso.UiController
+import androidx.test.espresso.ViewAction
+import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import com.wix.detox.espresso.common.SliderHelper
+import org.hamcrest.Matcher
+import org.hamcrest.Matchers
+
+class AdjustSliderToPositionAction(private val targetPositionPct: Double) : ViewAction {
+    override fun getDescription() = "adjustSliderToPosition"
+    override fun getConstraints(): Matcher<View?>? =
+        Matchers.allOf( isDisplayed(), isAssignableFrom(AppCompatSeekBar::class.java) )
+
+    override fun perform(uiController: UiController?, view: View) {
+        val sliderHelper = SliderHelper.create(view)
+        sliderHelper.setProgressPct(targetPositionPct)
+    }
+}

package/android/detox/src/{main → full}/java/com/wix/detox/espresso/action/GetAttributesAction.kt

@@ -9,6 +9,7 @@ import android.widget.TextView
 import androidx.test.espresso.UiController
 import com.google.android.material.slider.Slider
 import com.wix.detox.espresso.ViewActionWithResult
+import com.wix.detox.espresso.common.SliderHelper
 import org.hamcrest.Matcher
 import org.hamcrest.Matchers
 import org.hamcrest.Matchers.allOf
@@ -127,13 +128,24 @@ private class CheckBoxAttributes {
             rootObject.put("value", view.isChecked)
 }
 
+/**
+ * Note: this applies also to [androidx.appcompat.widget.AppCompatSeekBar], which
+ * is anything RN-slider-ish.
+ */
 private class ProgressBarAttributes {
     fun get(json: JSONObject, view: View) {
         if (view is ProgressBar) {
-            getProgressBarValue(json, view)
+            SliderHelper.maybeCreate(view)?.let {
+                getRNSliderValue(json, it)
+            } ?:
+                getProgressBarValue(json, view)
         }
     }
 
+    private fun getRNSliderValue(rootObject: JSONObject, sliderHelper: SliderHelper) {
+        rootObject.put("value", sliderHelper.getCurrentProgressPct())
+    }
+
     private fun getProgressBarValue(rootObject: JSONObject, view: ProgressBar) =
             rootObject.put("value", view.progress)
 }

package/android/detox/src/full/java/com/wix/detox/espresso/common/SliderHelper.kt

@@ -0,0 +1,75 @@
+package com.wix.detox.espresso.common
+
+import android.view.View
+import androidx.appcompat.widget.AppCompatSeekBar
+import com.facebook.react.bridge.JavaOnlyMap
+import com.facebook.react.uimanager.ReactStylesDiffMap
+import com.facebook.react.views.slider.ReactSlider
+import com.wix.detox.common.DetoxErrors.DetoxIllegalStateException
+import com.wix.detox.espresso.action.common.ReflectUtils
+import org.joor.Reflect
+
+private const val CLASS_REACT_SLIDER_LEGACY = "com.facebook.react.views.slider.ReactSlider"
+private const val CLASS_REACT_SLIDER_COMMUNITY = "com.reactnativecommunity.slider.ReactSlider"
+
+abstract class SliderHelper(protected val slider: AppCompatSeekBar) {
+    fun getCurrentProgressPct(): Double {
+        val nativeProgress = slider.progress.toDouble()
+        val nativeMax = slider.max
+        return nativeProgress / nativeMax
+    }
+
+    // TODO Make this more testable (e.g. by delegating the set action away)
+    fun setProgressPct(valuePct: Double) {
+        val maxJSProgress = calcMaxJSProgress()
+        val valueJS = valuePct * maxJSProgress
+        setProgressJS(valueJS)
+    }
+
+    protected abstract fun setProgressJS(valueJS: Double)
+
+    private fun calcMaxJSProgress(): Double {
+        val nativeProgress = slider.progress.toDouble()
+        val nativeMax = slider.max
+        val toMaxFactor = nativeMax / nativeProgress
+
+        val jsProgress = getJSProgress()
+        return jsProgress * toMaxFactor
+    }
+
+    private fun getJSProgress(): Double =
+        Reflect.on(slider).call("toRealProgress", slider.progress).get() as Double
+
+    companion object {
+        fun create(view: View) =
+            maybeCreate(view)
+                ?: throw DetoxIllegalStateException("Cannot handle this type of a seek-bar view (Class ${view.javaClass.canonicalName}). " +
+                        "Only React Native sliders are currently supported.")
+
+        fun maybeCreate(view: View): SliderHelper? =
+            when {
+                ReflectUtils.isAssignableFrom(view, CLASS_REACT_SLIDER_LEGACY)
+                   -> LegacySliderHelper(view as ReactSlider)
+                ReflectUtils.isAssignableFrom(view, CLASS_REACT_SLIDER_COMMUNITY)
+                    -> CommunitySliderHelper(view as AppCompatSeekBar)
+                else
+                   -> null
+            }
+    }
+}
+
+private class LegacySliderHelper(slider: AppCompatSeekBar): SliderHelper(slider) {
+    override fun setProgressJS(valueJS: Double) {
+        val reactSliderManager = com.facebook.react.views.slider.ReactSliderManager()
+        reactSliderManager.updateProperties(slider as ReactSlider, buildStyles("value", valueJS))
+    }
+
+    private fun buildStyles(vararg keysAndValues: Any) = ReactStylesDiffMap(JavaOnlyMap.of(*keysAndValues))
+}
+
+private class CommunitySliderHelper(slider: AppCompatSeekBar): SliderHelper(slider) {
+    override fun setProgressJS(valueJS: Double) {
+        val reactSliderManager = Class.forName("com.reactnativecommunity.slider.ReactSliderManager").newInstance()
+        Reflect.on(reactSliderManager).call("setValue", slider, valueJS)
+    }
+}

package/android/detox/src/full/java/com/wix/detox/espresso/matcher/ViewMatchers.kt

@@ -3,15 +3,17 @@
 package com.wix.detox.espresso.matcher
 
 import android.view.View
+import androidx.appcompat.widget.AppCompatSeekBar
 import androidx.test.espresso.matcher.BoundedMatcher
 import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
-import com.facebook.react.views.slider.ReactSlider
+import com.wix.detox.espresso.common.SliderHelper
 import org.hamcrest.BaseMatcher
 import org.hamcrest.Description
 import org.hamcrest.Matcher
 import org.hamcrest.Matchers.allOf
 import org.hamcrest.TypeSafeMatcher
+import kotlin.math.abs
 
 /*
  * An extension of [androidx.test.espresso.matcher.ViewMatchers].
@@ -36,6 +38,19 @@ fun isOfClassName(className: String): Matcher<View> {
 fun isMatchingAtIndex(index: Int, innerMatcher: Matcher<View>): Matcher<View> =
     ViewAtIndexMatcher(index, innerMatcher)
 
+fun toHaveSliderPosition(expectedValuePct: Double, tolerance: Double): Matcher<View?> =
+    object: BoundedMatcher<View?, AppCompatSeekBar>(AppCompatSeekBar::class.java) {
+        override fun describeTo(description: Description) {
+            description.appendText("sliderPositionPercent($expectedValuePct)")
+        }
+
+        override fun matchesSafely(view: AppCompatSeekBar): Boolean {
+            val sliderHelper = SliderHelper.create(view)
+            val progressPct = sliderHelper.getCurrentProgressPct()
+            return (abs(progressPct - expectedValuePct) <= tolerance)
+        }
+    }
+
 /**
  * Same as [androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom], but accepts any class. Needed
  * in order to avoid warning when passing 'any' class.
@@ -47,25 +62,3 @@ private class IsAssignableFromMatcher(private val clazz: Class<*>) : TypeSafeMat
         description.appendText("is assignable from class: $clazz")
     }
 }
-
-fun toHaveSliderPosition(expectedValue: Double, tolerance: Double): Matcher<View?> {
-    return object : BoundedMatcher<View?, ReactSlider>(ReactSlider::class.java) {
-        override fun describeTo(description: Description) {
-            description.appendText("expected: $expectedValue")
-        }
-
-        override fun matchesSafely(slider: ReactSlider?): Boolean {
-            val currentProgress = slider?.progress
-
-            if (currentProgress != null) {
-                val realProgress = slider.toRealProgress(currentProgress)
-                val currentPctFactor = slider.max / currentProgress.toDouble()
-                val realTotal = realProgress * currentPctFactor
-                val actualValue = realProgress / realTotal
-                return Math.abs(actualValue - expectedValue) <= tolerance
-            }
-
-            return false
-        }
-    }
-}

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

@@ -7,17 +7,22 @@ import com.facebook.react.ReactInstanceManager
 import com.facebook.react.bridge.ReactContext
 import com.wix.detox.common.DetoxErrors
 import com.wix.detox.config.DetoxConfig
+import org.joor.Reflect
+import java.lang.reflect.Proxy
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 
 private const val LOG_TAG = "DetoxRNLoading"
 
+private const val REACT_INSTANCE_EVENT_LISTENER_CLASS = "com.facebook.react.ReactInstanceEventListener"
+private const val REACT_INSTANCE_EVENT_LISTENER_CLASS_COMPAT = "com.facebook.react.ReactInstanceManager\$ReactInstanceEventListener"
+
 open class ReactNativeLoadingMonitor(
         private val instrumentation: Instrumentation,
         private val rnApplication: ReactApplication,
         private val previousReactContext: ReactContext?,
         private val config: DetoxConfig = DetoxConfig.CONFIG) {
-    val countDownLatch = CountDownLatch(1)
+    private val countDownLatch = CountDownLatch(1)
 
     fun getNewContext(): ReactContext? {
         subscribeToNewRNContextUpdates()
@@ -35,13 +40,9 @@ open class ReactNativeLoadingMonitor(
                         return@Runnable
                     }
 
-                    rnInstanceManager.addReactInstanceEventListener(object : ReactInstanceManager.ReactInstanceEventListener {
-                        override fun onReactContextInitialized(context: ReactContext) {
-                            Log.i(LOG_TAG, "Got new RN-context async'ly through listener")
-                            rnInstanceManager.removeReactInstanceEventListener(this)
-                            countDownLatch.countDown()
-                        }
-                    })
+                    subscribeAsyncRNContextHandler(rnInstanceManager) {
+                        countDownLatch.countDown()
+                    }
                 })
     }
 
@@ -81,3 +82,48 @@ open class ReactNativeLoadingMonitor(
         return rnInstanceManager.currentReactContext
     }
 }
+
+private interface DummyListenerIdentifier
+
+/**
+ * This baby bridges over RN's breaking change introduced in version 0.68:
+ * `ReactInstanceManager$ReactInstanceEventListener` was extracted onto a separate interface, having
+ * `ReactInstanceManager.{add|remove}ReactInstanceEventLister()` changing their signature to use it, accordingly.
+ *
+ * This made us resort to a solution based on dynamic proxies, because - depending on RN's version (at runtime), we
+ * need to dynamically decide what interface we "extend" (or actually shadow) via the proxy.
+ *
+ * @see RNDiff https://github.com/facebook/react-native/compare/v0.67.4..v0.68.0#diff-2f01f0cd7ff8c9ea58f12ef0eff5fa8250cad144dd5490598d80d8e9e743458aR1009
+ * @see DynamicProxies https://docs.oracle.com/javase/8/docs/technotes/guides/reflection/proxy.html
+ */
+private fun subscribeAsyncRNContextHandler(rnInstanceManager: ReactInstanceManager, onReactContextInitialized: () -> Any) {
+    val listenerClass = resolveListenerClass()
+    val proxyInterfaces = arrayOf(
+        listenerClass,
+        DummyListenerIdentifier::class.java // In order to be able to implement equals()
+    )
+    val listener = Proxy.newProxyInstance(listenerClass.classLoader, proxyInterfaces) { listener, method, args ->
+        Log.d(LOG_TAG, "Listener-proxy method called: ${method.name}")
+
+        val result = when (method.name) {
+            "onReactContextInitialized" -> {
+                Log.i(LOG_TAG, "Got new RN-context async'ly through listener")
+                Reflect.on(rnInstanceManager).call("removeReactInstanceEventListener", listener)
+                onReactContextInitialized()
+            }
+            "equals" -> {
+                val candidate = args[0]
+                candidate is DummyListenerIdentifier
+            }
+            else -> Any()
+        }
+
+        result
+    }
+    Reflect.on(rnInstanceManager).call("addReactInstanceEventListener", listener)
+}
+
+private fun resolveListenerClass(): Class<*> {
+    val className = if (ReactNativeInfo.rnVersion().minor >= 68) REACT_INSTANCE_EVENT_LISTENER_CLASS else REACT_INSTANCE_EVENT_LISTENER_CLASS_COMPAT
+    return Class.forName(className)
+}

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

@@ -2,6 +2,7 @@ package com.wix.detox.reactnative.idlingresources.uimodule
 
 import android.util.Log
 import android.view.View
+import com.facebook.react.uimanager.IllegalViewOperationException
 import com.wix.detox.common.DetoxLog.Companion.LOG_TAG
 import com.wix.detox.reactnative.ReactNativeInfo
 import java.lang.ref.WeakReference
@@ -19,9 +20,7 @@ class RN66Workaround {
     fun isScarceUISwitchCommandStuckInQueue(uiManagerModuleReflected: UIManagerModuleReflected): Boolean {
         var isStuckSwitchOperation = false
 
-        val rnVersion = ReactNativeInfo.rnVersion()
-
-        if (rnVersion.minor >= 66 && uiManagerModuleReflected.getUIOpsCount() >= 1) {
+        if (isRelevantRNVersion() && uiManagerModuleReflected.getUIOpsCount() >= 1) {
             val nextUIOperation = uiManagerModuleReflected.getNextUIOpReflected()
             val view = getUIOpView(uiManagerModuleReflected, nextUIOperation)
             val isReactSwitch = isReactSwitch(view)
@@ -46,10 +45,20 @@ class RN66Workaround {
         return isStuckSwitchOperation
     }
 
+    private fun isRelevantRNVersion(): Boolean {
+        val rnVersion = ReactNativeInfo.rnVersion()
+        return rnVersion.minor == 66 || (rnVersion.minor == 67 && rnVersion.patch < 4)
+    }
+
     private fun getUIOpView(uiManagerModuleReflected: UIManagerModuleReflected, uiOperation: DispatchCommandOperationReflected?): View? {
         val nativeViewHierarchyManager = uiManagerModuleReflected.nativeViewHierarchyManager() ?: return null
         val tag = uiOperation?.tag ?: return null
-        return nativeViewHierarchyManager.getViewClass(tag)
+        return try {
+            nativeViewHierarchyManager.getViewClass(tag)
+        } catch(e: IllegalViewOperationException) {
+            Log.e(LOG_TAG, "failed to get view from tag ", e.cause)
+            null
+        }
     }
 
     private fun isReactSwitch(view: View?) = try {

package/android/detox/src/main/java/com/wix/detox/common/DetoxErrors.java

@@ -5,7 +5,6 @@ public interface DetoxErrors {
         public DetoxRuntimeException(Throwable cause) {
             super(cause);
         }
-
         public DetoxRuntimeException(String message) {
             super(message);
         }
@@ -31,5 +30,9 @@ public interface DetoxErrors {
         public DetoxIllegalArgumentException(String message) {
             super(message);
         }
+
+        public DetoxIllegalArgumentException(Throwable cause) {
+            super(cause);
+        }
     }
 }

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

@@ -1,10 +1,11 @@
+
 package com.wix.detox.espresso
 
 import androidx.test.espresso.UiController
 import com.wix.detox.common.proxy.CallInfo
 import com.wix.detox.common.proxy.SpyingInvocationHandler
 import com.wix.detox.common.proxy.MethodsSpy
-import com.wix.detox.espresso.common.utils.getUiController
+import com.wix.detox.espresso.action.common.utils.getUiController
 import org.joor.Reflect
 
 class UiControllerSpy: MethodsSpy("uiController") {

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

@@ -0,0 +1,10 @@
+package com.wix.detox.espresso.action.common
+
+object ReflectUtils {
+    fun isAssignableFrom(source: Any, className: String) =
+        try {
+            Class.forName(className).isAssignableFrom(source.javaClass)
+        } catch (ex: ClassNotFoundException) {
+            false
+        }
+}

package/android/detox/src/main/java/com/wix/detox/espresso/action/common/utils/UiControllerUtils.kt

@@ -1,6 +1,6 @@
 @file:JvmName("UiControllerUtils")
 
-package com.wix.detox.espresso.common.utils
+package com.wix.detox.espresso.action.common.utils
 
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.UiController