Use EarlGrey and SocketRocket as sub-modules. Update EarlGrey to the …

…latest release version. Update detox code using EarlGrey.

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "detox/ios/SocketRocket"]
+	path = detox/ios/SocketRocket
+	url = https://github.com/facebook/SocketRocket.git
+[submodule "detox/ios/EarlGrey"]
+	path = detox/ios/EarlGrey
+	url = https://github.com/google/EarlGrey.git

detox/ios/Detox/EarlGreyExtensions.h

@@ -0,0 +1,26 @@
+//
+//  EarlGreyExtensions.h
+//  Detox
+//
+//  Created by Leo Natan (Wix) on 12/10/2016.
+//  Copyright © 2016 Wix. All rights reserved.
+//
+
+#import <EarlGrey/EarlGrey.h>
+
+/**
+ Expose provate Earl Grey methods
+ */
+@interface GREYUIThreadExecutor ()
+
+- (void)registerIdlingResource:(id<GREYIdlingResource>)resource;
+- (void)deregisterIdlingResource:(id<GREYIdlingResource>)resource;
+
+@end
+
+FOUNDATION_EXPORT id HC_hasProperty(NSString *propertyName, id valueMatcher);
+
+static inline id hasProperty(NSString *propertyName, id valueMatcher)
+{
+	return HC_hasProperty(propertyName, valueMatcher);
+}

detox/ios/Detox/GREYMatchers+Detox.m

@@ -7,7 +7,7 @@
 //
 
 #import "GREYMatchers+Detox.h"
-#import <OCHamcrest/OCHamcrest.h>
+#import "EarlGreyExtensions.h"
 
 @implementation GREYMatchers (Detox)
 

detox/ios/Detox/ReactNativeBridgeIdlingResource.m

@@ -8,8 +8,8 @@
 
 #import "ReactNativeHeaders.h"
 #import "ReactNativeBridgeIdlingResource.h"
-#import "Common/GREYDefines.h"
-#import "Common/GREYPrivate.h"
+
+#import "EarlGreyExtensions.h"
 
 static const CGFloat MOVING_AVERAGE_WEIGHT = 0.2;
 static const CGFloat MIN_THRESHOLD_FOR_IDLE = 10;

detox/ios/Detox/ReactNativeUIManagerIdlingResource.m

@@ -8,14 +8,15 @@
 
 #import "ReactNativeHeaders.h"
 #import "ReactNativeUIManagerIdlingResource.h"
-#import "Common/GREYDefines.h"
-#import "Common/GREYPrivate.h"
 
+#import "EarlGreyExtensions.h"
 
 @interface GREYDispatchQueueIdlingResource (ReactNativeUIManagerIdlingResource)
 - (instancetype)initWithDispatchQueue:(dispatch_queue_t)queue name:(NSString *)name;
 @end
 
+extern dispatch_queue_t RCTGetUIManagerQueue(void);
+
 
 @implementation ReactNativeUIManagerIdlingResource
 {
@@ -29,10 +30,10 @@ + (dispatch_queue_t)getUIQueueFromBridge:(id)bridge
 }
 
 // this is a hack since we don't have a public API to check this and we crash over an assertion if we install twice
-+ (GREYDispatchQueueIdlingResource*)checkIfDispatchQueueIdlingResourceAlreadyInstalled:(id)bridge
++ (GREYDispatchQueueIdlingResource*)checkIfDispatchQueueIdlingResourceAlreadyInstalled:(id)bridge name:(NSString*)name
 {
     dispatch_queue_t queue = [self getUIQueueFromBridge:bridge];
-    return [[GREYDispatchQueueIdlingResource class] performSelector:@selector(grey_resourceForCurrentlyTrackedDispatchQueue:) withObject:queue];
+	return [[GREYDispatchQueueIdlingResource class] performSelector:@selector(resourceWithDispatchQueue:name:) withObject:queue withObject:name];
 }
 
 + (instancetype)idlingResourceForBridge:(id)bridge name:(NSString *)name
@@ -47,7 +48,7 @@ + (instancetype)idlingResourceForBridge:(id)bridge name:(NSString *)name
     if (bridge == nil) return nil;
 
     // we have an issue that calling unregister on the idling resource (sometimes?)
-    GREYDispatchQueueIdlingResource *existing = [self checkIfDispatchQueueIdlingResourceAlreadyInstalled:bridge];
+	GREYDispatchQueueIdlingResource *existing = [self checkIfDispatchQueueIdlingResourceAlreadyInstalled:bridge name:name];
     if (existing != nil)
     {
         // I suspect that we have a race condition and deregister doesn't free the idling resource immediately, need to investigate further