diff --git a/detox/scripts/postinstall.sh b/detox/scripts/postinstall.sh index e21c7007ea..f05bfc8668 100755 --- a/detox/scripts/postinstall.sh +++ b/detox/scripts/postinstall.sh @@ -1,10 +1,5 @@ #!/bin/bash -e -if [ "$__DETOX_DEV" = true ]; then - echo "Running postinstall for detox dev mode, exiting" - exit 0 -fi - if [ `uname` == "Darwin" ]; then source "$(dirname ${0})/build_framework.ios.sh" fi diff --git a/docs/Guide.Contributing.md b/docs/Guide.Contributing.md index b0e505ebd1..b0fb7300b5 100644 --- a/docs/Guide.Contributing.md +++ b/docs/Guide.Contributing.md @@ -42,7 +42,7 @@ git submodule update --init --recursive ### Installing and linking internal projects ```sh -scripts/bootstrap.sh +lerna bootstrap ``` ### Building diff --git a/examples/demo-native-android/package.json b/examples/demo-native-android/package.json index 0a88c9feaa..727d21318d 100644 --- a/examples/demo-native-android/package.json +++ b/examples/demo-native-android/package.json @@ -8,8 +8,8 @@ "e2e": "mocha e2e --opts ./e2e/mocha.opts" }, "devDependencies": { - "mocha": "^3.2.0", - "detox": "^6.0.0" + "mocha": "^4.0.0", + "detox": "^7.0.0" }, "detox": {} } diff --git a/examples/demo-native-ios/package.json b/examples/demo-native-ios/package.json index ce158ff78d..d5adecad7c 100644 --- a/examples/demo-native-ios/package.json +++ b/examples/demo-native-ios/package.json @@ -3,8 +3,8 @@ "version": "0.0.1", "private": true, "devDependencies": { - "mocha": "^3.2.0", - "detox": "^6.0.0" + "mocha": "^4.0.0", + "detox": "^7.0.0" }, "detox": { "specs": "e2e", diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh deleted file mode 100755 index f5f73775e3..0000000000 --- a/scripts/bootstrap.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -e - -# Detox package runs a postinstall script when installed as a dependency in order to compile Detox.framework (iOS). -# In order to install it, the framework sources must be already packaged in Detox-ios-src.tbz. An issue arises when developing Detox, -# since postinstall runs before prepublish, causing the compilation script to start running before the sources are available, -# so we had to add a hack :( to the dev process, skipping postinstall and then manually triggering it. -__DETOX_DEV=true lerna bootstrap -npm run postinstall --prefix detox diff --git a/scripts/ci.sh b/scripts/ci.sh index af331cc966..c475b63ae9 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh @@ -6,7 +6,7 @@ if [ ! -z ${REACT_NATIVE_VERSION} ]; then node scripts/change_react_native_version.js "detox/test" ${REACT_NATIVE_VERSION} fi -run_f "$(dirname "$0")/bootstrap.sh" +run_f "lerna bootstrap" run_f "lerna run --ignore detox-demo* build" run_f "lerna run --ignore detox-demo* test"