migrated detox

playground/ios/playground.xcodeproj/project.pbxproj

@@ -451,7 +451,6 @@
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
-				6956ED03EAA1831C238A5BB4 /* Copy Detox Framework */,
 			);
 			buildRules = (
 			);
@@ -727,20 +726,6 @@
 			shellPath = /bin/sh;
 			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/packager/react-native-xcode.sh";
 		};
-		6956ED03EAA1831C238A5BB4 /* Copy Detox Framework */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Copy Detox Framework";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/bash;
-			shellScript = "if [ -n \"$DEPLOY_DETOX_FRAMEWORK\" ]; then\nmkdir -p \"${BUILT_PRODUCTS_DIR}\"/\"${FRAMEWORKS_FOLDER_PATH}\"\ncp -r \"${PROJECT_DIR}\"/../node_modules/detox/Detox.framework \"${BUILT_PRODUCTS_DIR}\"/\"${FRAMEWORKS_FOLDER_PATH}\"\nfi";
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -981,8 +966,6 @@
 			buildConfigurations = (
 				00E356F61AD99517003FC87E /* Debug */,
 				00E356F71AD99517003FC87E /* Release */,
-				2984212B73D7531DE5F65D1F /* Debug_Detox */,
-				048D2E7E9477FA2088E39149 /* Release_Detox */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;
@@ -992,8 +975,6 @@
 			buildConfigurations = (
 				13B07F941A680F5B00A75B9A /* Debug */,
 				13B07F951A680F5B00A75B9A /* Release */,
-				DB9A0E11DD86A380A31F9DD9 /* Debug_Detox */,
-				29AFC5A9B25FF77E054960D7 /* Release_Detox */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;
@@ -1003,8 +984,6 @@
 			buildConfigurations = (
 				83CBBA201A601CBA00E9B192 /* Debug */,
 				83CBBA211A601CBA00E9B192 /* Release */,
-				57FA1AC8487324BC4A99A465 /* Debug_Detox */,
-				BBF3AB28495B87423DAC695F /* Release_Detox */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;

playground/scripts/detoxDebugFix.rb

@@ -1,34 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'pathname'
-
-$LOAD_PATH.unshift(__dir__ + "/../node_modules/detox/scripts/Xcodeproj/lib")
-$LOAD_PATH.unshift(__dir__ + "/../node_modules/detox/scripts/Nanaimo/lib")
-
-require 'xcodeproj'
-
-isAlwaysDebug = ARGV.count > 0 && ARGV[0].to_s.eql?('debug')
-
-project = Xcodeproj::Project.open(__dir__ + "/../node_modules/react-native/React/React.xcodeproj")
-
-debug_preprocessor_macros = project.build_configuration_list['Debug'].build_settings['GCC_PREPROCESSOR_DEFINITIONS']
-release_preprocessor_macros = project.build_configuration_list['Release'].build_settings['GCC_PREPROCESSOR_DEFINITIONS']
-
-unless debug_preprocessor_macros.kind_of?(Array)
-  debug_preprocessor_macros = [debug_preprocessor_macros]
-end
-unless release_preprocessor_macros.kind_of?(Array)
-  release_preprocessor_macros = [release_preprocessor_macros]
-end
-
-if isAlwaysDebug then
-  release_preprocessor_macros = release_preprocessor_macros | debug_preprocessor_macros
-else
-  release_preprocessor_macros = release_preprocessor_macros - debug_preprocessor_macros
-end
-
-project.build_configuration_list['Release'].build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = release_preprocessor_macros
-
-project.build_configuration_list['Release'].build_settings['WARNING_CFLAGS'] = ['-Wno-shorten-64-to-32','-Wno-unused-parameter','-Wno-unreachable-code','-Wno-deprecated-declarations','-Wno-extra-tokens','-Wno-unused-variable','-Wno-incompatible-pointer-types','-Wno-conditional-uninitialized','-Wno-undeclared-selector','-Wno-objc-protocol-property-synthesis']
-
-raise "Error: Unable to save Xcode project" unless project.save()

playground/scripts/e2e.ios.js

@@ -4,17 +4,8 @@ const fs = require('fs');
 
 const release = _.includes(process.argv, 'release');
 
-function hackReactXcodeScript() {
-  const fileToHack = `./node_modules/react-native/packager/react-native-xcode.sh`;
-  const lines = _.split(String(fs.readFileSync(fileToHack)), '\n');
-  lines[11] = release ? '' : `exit 0;`;
-  fs.writeFileSync(fileToHack, _.join(lines, '\n'));
-}
-
 function buildProjForDetox() {
-  const scheme = release ? `playground_release_Detox` : `playground_Detox`;
-
-  shellUtils.exec.execSync(`./scripts/detoxDebugFix.rb ${release ? '' : 'debug'}`);
+  const scheme = release ? `playground_release` : `playground`;
 
   shellUtils.exec.execSync(`echo 'travis_fold:start:xcodebuild'`);
   const cmd = `RCT_NO_LAUNCH_PACKAGER=true
@@ -46,7 +37,7 @@ function e2e() { //eslint-disable-line
     shellUtils.exec.execSyncSilent(`watchman watch-del-all || true`);
     shellUtils.exec.kill(`detox-server`);
     shellUtils.exec.exec(`./node_modules/.bin/detox-server > ./detox-server.log 2>&1`);
-    const detoxAppBuildPath = `ios/DerivedData/playground/Build/Products/${release ? 'Release' : 'Debug'}_Detox-iphonesimulator/playground.app`;
+    const detoxAppBuildPath = `ios/DerivedData/playground/Build/Products/${release ? 'Release' : 'Debug'}-iphonesimulator/playground.app`;
 
     shellUtils.exec.execSync(`detoxAppBuildPath="${detoxAppBuildPath}"
                               BABEL_ENV=test
@@ -55,7 +46,6 @@ function e2e() { //eslint-disable-line
                                 --recursive
                                 --compilers js:babel-register`);
   } finally {
-    shellUtils.exec.execSync(`./scripts/detoxDebugFix.rb`);
     shellUtils.exec.kill(`detox-server`);
     if (process.env.CI) {
       shellUtils.exec.kill(`Simulator`);
@@ -69,7 +59,6 @@ function e2e() { //eslint-disable-line
 }
 
 function run() {
-  hackReactXcodeScript();
   buildProjForDetox();
   e2e();
 }