“Fix” Xcode 8 support

The user activity API has been ifdef out to fix Xcode 8 support.

Author: LeoNatan

.travis.yml

@@ -5,7 +5,7 @@ matrix:
   include:
     - language: objective-c
       os: osx
-      osx_image: xcode9
+      osx_image: xcode9.2
       env:
         - REACT_NATIVE_VERSION=0.53.3
       install:
@@ -14,7 +14,7 @@ matrix:
       - ./scripts/ci.ios.sh
     - language: objective-c
       os: osx
-      osx_image: xcode9
+      osx_image: xcode9.2
       env:
         - REACT_NATIVE_VERSION=0.49.3
       install:

detox/ios/Detox/DetoxAppDelegateProxy.h

@@ -13,7 +13,9 @@
 
 @property (class, nonatomic, strong, readonly) DetoxAppDelegateProxy* currentAppDelegateProxy;
 
+#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_10_3
 - (void)__dtx_dispatchUserActivityFromDataURL:(NSURL*)userActivityDataURL delayUntilActive:(BOOL)delay;
+#endif
 - (void)__dtx_dispatchUserNotificationFromDataURL:(NSURL*)userNotificationDataURL delayUntilActive:(BOOL)delay;
 - (void)__dtx_dispatchOpenURL:(NSURL*)URL options:(NSDictionary*)options delayUntilActive:(BOOL)delay;
 

detox/ios/Detox/DetoxAppDelegateProxy.m

@@ -19,9 +19,11 @@
 static DetoxAppDelegateProxy* _currentAppDelegateProxy;
 static NSMutableArray<NSDictionary*>* _pendingOpenURLs;
 static NSMutableArray<DetoxUserNotificationDispatcher*>* _pendingUserNotificationDispatchers;
+static DetoxUserNotificationDispatcher* _pendingLaunchUserNotificationDispatcher;
+#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_10_3
 static NSMutableArray<DetoxUserActivityDispatcher*>* _pendingUserActivityDispatchers;
 static DetoxUserActivityDispatcher* _pendingLaunchUserActivityDispatcher;
-static DetoxUserNotificationDispatcher* _pendingLaunchUserNotificationDispatcher;
+#endif
 
 static COSTouchVisualizerWindow* _touchVisualizerWindow;
 
@@ -37,6 +39,7 @@
 	return [NSURL fileURLWithPath:userNotificationDataPath];
 }
 
+#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_10_3
 static NSURL* _launchUserActivityDataURL()
 {
 	NSString* userActivityDataPath = [[NSUserDefaults standardUserDefaults] objectForKey:@"detoxUserActivityDataURL"];
@@ -48,6 +51,7 @@
 
 	return [NSURL fileURLWithPath:userActivityDataPath];
 }
+#endif
 
 @interface UIWindow (DTXEventProxy) @end
 
@@ -123,13 +127,18 @@ + (void)load
 	dispatch_once(&onceToken, ^{
 		_pendingOpenURLs = [NSMutableArray new];
 		_pendingUserNotificationDispatchers = [NSMutableArray new];
+		
+		NSURL* url;
+		
+#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_10_3
 		_pendingUserActivityDispatchers = [NSMutableArray new];
 
-		NSURL* url = _launchUserActivityDataURL();
+		url = _launchUserActivityDataURL();
 		if(url)
 		{
 			_pendingLaunchUserActivityDispatcher = [[DetoxUserActivityDispatcher alloc] initWithUserActivityDataURL:url];
 		}
+#endif
 
 		url = _launchUserNotificationDataURL();
 		if(url)
@@ -188,7 +197,10 @@ - (NSString*)__dtx_sourceAppOverride
 	return [[NSUserDefaults standardUserDefaults] objectForKey:@"detoxSourceAppOverride"];
 }
 
-- (NSDictionary*)__dtx_prepareLaunchOptions:(NSDictionary*)launchOptions userNotificationDispatcher:(DetoxUserNotificationDispatcher*)notificationDispatcher userActivityDispatcher:(DetoxUserActivityDispatcher*)activityDispatcher
+- (NSDictionary*)__dtx_prepareLaunchOptions:(NSDictionary*)launchOptions userNotificationDispatcher:(DetoxUserNotificationDispatcher*)notificationDispatcher
+#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_10_3
+					 userActivityDispatcher:(DetoxUserActivityDispatcher*)activityDispatcher
+#endif
 {
 	NSMutableDictionary* rv = [launchOptions mutableCopy] ?: [NSMutableDictionary new];
 
@@ -197,6 +209,7 @@ - (NSDictionary*)__dtx_prepareLaunchOptions:(NSDictionary*)launchOptions userNot
 		rv[UIApplicationLaunchOptionsRemoteNotificationKey] = [notificationDispatcher remoteNotification];
 	}
 
+#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_10_3
 	if(activityDispatcher)
 	{
 		NSUserActivity* userActivity = [activityDispatcher userActivity];
@@ -208,7 +221,7 @@ - (NSDictionary*)__dtx_prepareLaunchOptions:(NSDictionary*)launchOptions userNot
 
 		rv[UIApplicationLaunchOptionsUserActivityDictionaryKey] = userActivityDictionary;
 	}
-	
+#endif
 
 	NSURL* openURLOverride = [self __dtx_URLOverride];
 	if(openURLOverride)
@@ -226,7 +239,11 @@ - (NSDictionary*)__dtx_prepareLaunchOptions:(NSDictionary*)launchOptions userNot
 
 - (BOOL)application:(UIApplication *)application willFinishLaunchingWithOptions:(nullable NSDictionary<UIApplicationLaunchOptionsKey, id>*)launchOptions
 {
-	launchOptions = [self __dtx_prepareLaunchOptions:launchOptions userNotificationDispatcher:_pendingLaunchUserNotificationDispatcher userActivityDispatcher:_pendingLaunchUserActivityDispatcher];
+	launchOptions = [self __dtx_prepareLaunchOptions:launchOptions userNotificationDispatcher:_pendingLaunchUserNotificationDispatcher
+#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_10_3
+							  userActivityDispatcher:_pendingLaunchUserActivityDispatcher
+#endif
+					 ];
 
 	BOOL rv = YES;
 	if([class_getSuperclass(object_getClass(self)) instancesRespondToSelector:_cmd])
@@ -241,7 +258,11 @@ - (BOOL)application:(UIApplication *)application willFinishLaunchingWithOptions:
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(nullable NSDictionary<UIApplicationLaunchOptionsKey, id> *)launchOptions
 {
-	launchOptions = [self __dtx_prepareLaunchOptions:launchOptions userNotificationDispatcher:_pendingLaunchUserNotificationDispatcher userActivityDispatcher:_pendingLaunchUserActivityDispatcher];
+	launchOptions = [self __dtx_prepareLaunchOptions:launchOptions userNotificationDispatcher:_pendingLaunchUserNotificationDispatcher
+#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_10_3
+							  userActivityDispatcher:_pendingLaunchUserActivityDispatcher
+#endif
+					 ];
 
 	BOOL rv = YES;
 	if([class_getSuperclass(object_getClass(self)) instancesRespondToSelector:_cmd])
@@ -252,10 +273,14 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 	}
 
 	[_pendingLaunchUserNotificationDispatcher dispatchOnAppDelegate:self simulateDuringLaunch:YES];
+#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_10_3
 	[_pendingLaunchUserActivityDispatcher dispatchOnAppDelegate:self];
+#endif
 
 	_pendingLaunchUserNotificationDispatcher = nil;
+#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_10_3
 	_pendingLaunchUserActivityDispatcher = nil;
+#endif
 
 	if([self __dtx_URLOverride] && [class_getSuperclass(object_getClass(self)) instancesRespondToSelector:@selector(application:openURL:options:)])
 	{
@@ -285,10 +310,12 @@ - (void)applicationWillEnterForeground:(UIApplication *)application
 		}];
 		[_pendingUserNotificationDispatchers removeAllObjects];
 
+#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_10_3
 		[_pendingUserActivityDispatchers enumerateObjectsUsingBlock:^(DetoxUserActivityDispatcher * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
 			[self __dtx_actualDispatchUserActivityWithDispatcher:obj];
 		}];
 		[_pendingUserActivityDispatchers removeAllObjects];
+#endif
 	});
 }
 
@@ -297,6 +324,7 @@ - (BOOL)touchVisualizerWindowShouldAlwaysShowFingertip:(COSTouchVisualizerWindow
 	return YES;
 }
 
+#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_10_3
 - (void)__dtx_actualDispatchUserActivityWithDispatcher:(DetoxUserActivityDispatcher*)dispatcher
 {
 	[dispatcher dispatchOnAppDelegate:self];
@@ -315,6 +343,7 @@ - (void)__dtx_dispatchUserActivityFromDataURL:(NSURL*)userActivityDataURL delayU
 		[self __dtx_actualDispatchUserActivityWithDispatcher:dispatcher];
 	}
 }
+#endif
 
 - (void)__dtx_actualDispatchUserNotificationWithDispatcher:(DetoxUserNotificationDispatcher*)dispatcher
 {

detox/ios/Detox/DetoxManager.m

@@ -176,6 +176,7 @@ - (void)websocketDidReceiveAction:(NSString *)type withParams:(NSDictionary *)pa
 				sendDoneAction(self.webSocket, messageId);
 			};
 		}
+#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_10_3
 		else if(params[@"detoxUserActivityDataURL"])
 		{
 			NSURL* userActivityDataURL = [NSURL fileURLWithPath:params[@"detoxUserActivityDataURL"]];
@@ -188,6 +189,7 @@ - (void)websocketDidReceiveAction:(NSString *)type withParams:(NSDictionary *)pa
 				sendDoneAction(self.webSocket, messageId);
 			};
 		}
+#endif
 
 		NSAssert(block != nil, @"Logic error, no block was generated for payload: %@", params);
 

detox/ios/Detox/DetoxUserActivityDispatcher.swift

@@ -6,6 +6,8 @@
 //  Copyright © 2018 Wix. All rights reserved.
 //
 
+#if swift(>=3.2)
+
 import UIKit
 
 private struct DetoxUserActivityKeys {
@@ -38,7 +40,7 @@ public class DetoxUserActivityDispatcher: NSObject {
 		return jsonObject
 	}
 
-	public lazy var userActivity: NSUserActivity = {
+	@objc public lazy var userActivity: NSUserActivity = {
 		guard let activityType = self.userActivityData[DetoxUserActivityKeys.activityType] as? String, activityType.count > 0 else {
 			Swift.fatalError("Missing or invalid activity type")
 		}
@@ -70,8 +72,4 @@ public class DetoxUserActivityDispatcher: NSObject {
 	}
 }
 
-//extension NSUserActivity {
-//	@objc override open func setValue(_ value: Any?, forUndefinedKey key: String) {
-//		
-//	}
-//}
+#endif