updating scripts

.travis.yml

@@ -25,15 +25,20 @@ before_cache:
   - rm -rf $HOME/.gradle/caches/*/plugin-resolution/
 
 install:
+  - set -e
+  # node
   - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.1/install.sh | bash
   - export NVM_DIR="$HOME/.nvm" && [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
   - nvm install $NODE_VERSION
   - nvm use $NODE_VERSION
-  - nvm ls
-  - gem install xcpretty
+  # yarn
   - curl -o- -L https://yarnpkg.com/install.sh | bash
   - yarn config set cache-folder $YARN_CACHE
-
+  # android sdk
+  - node ./scripts/installAndroidSdk.js
+  # fbsimctl
+  - brew tap facebook/fb && brew install fbsimctl
+  - set +e
 
 script:
   - set -e

scripts/fixRN38.js

@@ -1,14 +0,0 @@
-const _ = require('lodash');
-const shellUtils = require('shell-utils');
-const fs = require('fs');
-
-function run() {
-  console.log('fixing RCTJSStackFrame.m to not break analysis'); //eslint-disable-line
-
-  const path = `${process.cwd()}/node_modules/react-native/React/Base/RCTJSStackFrame.h`;
-  const lines = String(fs.readFileSync(path)).split('\n');
-  lines[24] = '+ (NSArray<RCTJSStackFrame *> *)stackFramesWithDictionaries:(NSArray *)dicts;';
-  fs.writeFileSync(path, lines.join('\n'));
-}
-
-run();

scripts/ignoreReactWarnings.rb

@@ -1,17 +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'
-
-project = Xcodeproj::Project.open(__dir__ + "/../node_modules/react-native/React/React.xcodeproj")
-
-warning_flags = ['-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']
-
-project.build_configuration_list['Debug'].build_settings['WARNING_CFLAGS'] = warning_flags
-project.build_configuration_list['Release'].build_settings['WARNING_CFLAGS'] = warning_flags
-
-raise "Error: Unable to save Xcode project" unless project.save()

scripts/installAndroidSdk.js

@@ -0,0 +1,13 @@
+const exec = require('shell-utils').exec;
+
+run();
+
+function run() {
+  console.log(`Downloading Android SDK`); //eslint-disable-line
+  // fix for https://code.google.com/p/android/issues/detail?id=223424
+  exec.execSync(`mkdir -p ~/.android`);
+  exec.execSync(`curl --location https://dl.google.com/android/android-sdk_r24.4.1-macosx.zip | tar -x -z -C $HOME`);
+  console.log(`Copying Android licenses`); //eslint-disable-line
+  exec.execSync(`mkdir -p "${ANDROID_HOME}"/licenses`);
+  exec.execSync(`cp "${__dirname}"/android-sdk-licenses/* "${ANDROID_HOME}"/licenses`);
+}

scripts/release.js

@@ -1,5 +1,5 @@
 /*eslint-disable no-console*/
-const shellUtils = require('shell-utils');
+const exec = require('shell-utils').exec;
 const p = require('path');
 const semver = require('semver');
 
@@ -22,30 +22,30 @@ function validateEnv() {
 }
 
 function setupGit() {
-  shellUtils.exec.execSyncSilent(`git config --global push.default simple`);
-  shellUtils.exec.execSyncSilent(`git config --global user.email "${process.env.GIT_EMAIL}"`);
-  shellUtils.exec.execSyncSilent(`git config --global user.name "${process.env.GIT_USER}"`);
-  const remoteUrl = new RegExp(`https?://(\\S+)`).exec(shellUtils.exec.execSyncRead(`git remote -v`))[1];
-  shellUtils.exec.execSyncSilent(`git remote add deploy "https://${process.env.GIT_USER}:${process.env.GIT_TOKEN}@${remoteUrl}"`);
-  shellUtils.exec.execSync(`git checkout master`);
+  exec.execSyncSilent(`git config --global push.default simple`);
+  exec.execSyncSilent(`git config --global user.email "${process.env.GIT_EMAIL}"`);
+  exec.execSyncSilent(`git config --global user.name "${process.env.GIT_USER}"`);
+  const remoteUrl = new RegExp(`https?://(\\S+)`).exec(exec.execSyncRead(`git remote -v`))[1];
+  exec.execSyncSilent(`git remote add deploy "https://${process.env.GIT_USER}:${process.env.GIT_TOKEN}@${remoteUrl}"`);
+  exec.execSync(`git checkout master`);
 }
 
 function calcNewVersion() {
-  const nextTaggedVersion = shellUtils.exec.execSyncRead(`npm view ${process.env.npm_package_name}@next version`);
+  const nextTaggedVersion = exec.execSyncRead(`npm view ${process.env.npm_package_name}@next version`);
   console.log(`next tagged version is: ${nextTaggedVersion}`);
   return semver.inc(nextTaggedVersion, 'prerelease');
 }
 
 function copyNpmRc() {
   const npmrcPath = p.resolve(`${__dirname}/.npmrc`);
-  shellUtils.exec.execSync(`cp -Rf ${npmrcPath} .`);
+  exec.execSync(`cp -Rf ${npmrcPath} .`);
 }
 
 function tagAndPublish(newVersion) {
   console.log(`new version is: ${newVersion}`);
-  shellUtils.exec.execSync(`npm version ${newVersion} -m "v${newVersion} [ci skip]"`);
-  shellUtils.exec.execSyncSilent(`git push deploy --tags`);
-  shellUtils.exec.execSync(`npm publish --tag next`);
+  exec.execSync(`npm version ${newVersion} -m "v${newVersion} [ci skip]"`);
+  exec.execSyncSilent(`git push deploy --tags`);
+  exec.execSync(`npm publish --tag next`);
 }
 
 function run() {

scripts/test.all.js

@@ -1,10 +1,10 @@
-const shellUtils = require('shell-utils');
+const exec = require('shell-utils').exec;
 
 function run() {
-  shellUtils.exec.execSync(`yarn run test-js`);
-  shellUtils.exec.execSync(`yarn run test-unit-android && yarn run test-unit-ios`);
-  shellUtils.exec.exec(`yarn run test-e2e-android`);
-  shellUtils.exec.exec(`yarn run test-e2e-ios`);
+  exec.execSync(`yarn run test-js`);
+  exec.execSync(`yarn run test-unit-android && yarn run test-unit-ios`);
+  exec.exec(`yarn run test-e2e-android`);
+  exec.exec(`yarn run test-e2e-ios`);
 }
 
 run();

scripts/test.e2e.ios.js

@@ -1,39 +1,31 @@
 const _ = require('lodash');
-const shellUtils = require('shell-utils');
+const exec = require('shell-utils').exec;
 
 const release = _.includes(process.argv, 'release');
 
 function buildProjForDetox() {
   const scheme = release ? `playground_release` : `playground`;
 
-  const cmd = `RCT_NO_LAUNCH_PACKAGER=true
-          cd ./playground/ios && xcodebuild
+  const cmd = `cd ./playground/ios && xcodebuild
             -scheme ${scheme}
             ${release ? 'clean build' : 'build'}
             -project playground.xcodeproj
             -sdk iphonesimulator
             -derivedDataPath ./DerivedData/playground`;
 
-  if (isInstalled(`xcpretty`)) {
-    shellUtils.exec.execSync(`${cmd} | xcpretty && exit \${PIPESTATUS[0]}`);
+  if (exec.which(`xcpretty`)) {
+    exec.execSync(`${cmd} | xcpretty && exit \${PIPESTATUS[0]}`);
   } else {
-    shellUtils.exec.execSync(`${cmd}`);
-  }
-}
-function isInstalled(what) {
-  try {
-    return shellUtils.exec.execSyncRead(`which ${what}`);
-  } catch (e) {
-    return false;
+    exec.execSync(`${cmd}`);
   }
 }
 
 function e2e() { //eslint-disable-line
   try {
-    shellUtils.exec.execSyncSilent(`watchman watch-del-all || true`);
+    exec.execSyncSilent(`watchman watch-del-all || true`);
     const detoxAppBuildPath = `playground/ios/DerivedData/playground/Build/Products/${release ? 'Release' : 'Debug'}-iphonesimulator/playground.app`;
 
-    shellUtils.exec.execSync(`detoxAppBuildPath="${detoxAppBuildPath}"
+    exec.execSync(`detoxAppBuildPath="${detoxAppBuildPath}"
                               BABEL_ENV=test
                               ./node_modules/mocha/bin/mocha e2e
                                 --timeout ${2 * 60 * 1000}
@@ -41,24 +33,17 @@ function e2e() { //eslint-disable-line
                                 --bail`);
   } finally {
     if (process.env.CI) {
-      shellUtils.exec.kill(`Simulator`);
-      shellUtils.exec.kill(`CoreSimulator`);
-      shellUtils.exec.execSync(`sleep 5`);
+      exec.kill(`Simulator`);
+      exec.kill(`CoreSimulator`);
+      exec.execSync(`sleep 5`);
     }
   }
 }
 
-function installFbsimctlIfNeeded() {
-  if (!isInstalled(`fbsimctl`)) {
-    console.log(`installing fbsimctl...`); //eslint-disable-line
-    shellUtils.exec.execSyncSilent(`brew tap facebook/fb && brew install fbsimctl`);
-  }
-}
-
 function run() {
-  shellUtils.exec.execSync(`./scripts/ignoreReactWarnings.rb`);
-  shellUtils.exec.execSync(`node ./scripts/fixRN38.js`);
-  installFbsimctlIfNeeded();
+  if (!exec.which(`fbsimctl`)) {
+    throw new Error(`fbsimctl must be installed: "brew tap facebook/fb && brew install fbsimctl"`);
+  }
   buildProjForDetox();
   e2e();
 }

scripts/test.unit.android.js

@@ -1,10 +1,6 @@
 const exec = require('shell-utils').exec;
+run();
 
 function run() {
-  if (process.env.CI) {
-    exec.execSync(`./scripts/installAndroidSDK.sh`);
-  }
   exec.execSync(`cd lib/android && ./gradlew clean testDebugUnitTest`);
 }
-
-run();

scripts/test.unit.ios.js

@@ -1,32 +1,22 @@
-const shellUtils = require('shell-utils');
+const exec = require('shell-utils').exec;
 
-function runWithXcprettyIfPossible(cmd) {
-  if (hasXcpretty()) {
-    shellUtils.exec.execSync(`${cmd} | xcpretty && exit \${PIPESTATUS[0]}`);
+function runWithXcpretty(cmd) {
+  if (exec.which(`xcpretty`)) {
+    exec.execSync(`${cmd} | xcpretty && exit \${PIPESTATUS[0]}`);
   } else {
-    shellUtils.exec.execSync(`${cmd}`);
-  }
-}
-
-function hasXcpretty() {
-  try {
-    return shellUtils.exec.execSyncRead(`which xcpretty`);
-  } catch (e) {
-    return false;
+    exec.execSync(`${cmd}`);
   }
 }
 
 function run() {
-  shellUtils.exec.execSync(`./scripts/ignoreReactWarnings.rb`);
-  shellUtils.exec.execSync(`node ./scripts/fixRN38.js`);
-  runWithXcprettyIfPossible(`RCT_NO_LAUNCH_PACKAGER=true
+  runWithXcpretty(`RCT_NO_LAUNCH_PACKAGER=true
           cd ./playground/ios && xcodebuild
             build build-for-testing
             -scheme "playground"
             -project playground.xcodeproj
             -sdk iphonesimulator
             -configuration Debug`);
-  runWithXcprettyIfPossible(`RCT_NO_LAUNCH_PACKAGER=true
+  runWithXcpretty(`RCT_NO_LAUNCH_PACKAGER=true
           cd ./playground/ios && xcodebuild
             test-without-building
             -scheme "playground"

yarn.lock

@@ -4124,8 +4124,8 @@ shell-quote@1.6.1:
     jsonify "~0.0.0"
 
 shell-utils@1.x.x:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/shell-utils/-/shell-utils-1.0.1.tgz#f65f40d05999c49569c0928355e9ede15ad2ce07"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/shell-utils/-/shell-utils-1.0.2.tgz#20b38d7d3f80deaeaeca364204da4e007bc4f59d"
   dependencies:
     lodash "4.x.x"