status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'iojs-tests' of https://github.com/ide/react-native into Update_Wed_1_Jul 

Conflicts:
	package.json
This commit is contained in:
Alexsander Akers 2015-07-01 22:07:41 +01:00
parent 4886b3dc57 212bd2250c
commit d0cb80c072
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -15,13 +15,13 @@ install:
- cp $(brew --prefix nvm)/nvm-exec .nvm/ - cp $(brew --prefix nvm)/nvm-exec .nvm/
- export NVM_DIR=.nvm - export NVM_DIR=.nvm
- source $(brew --prefix nvm)/nvm.sh - source $(brew --prefix nvm)/nvm.sh
- nvm install v0.10 - nvm install iojs-v2
- npm config set spin=false - npm config set spin=false
- npm install - npm install
script: script:
- | - |
nvm use v0.10 nvm use iojs-v2
if [ "$TEST_TYPE" = objc ] if [ "$TEST_TYPE" = objc ]
then then

2
package.json
View File

@ -72,7 +72,7 @@
"yargs": "1.3.2" "yargs": "1.3.2"
}, },
"devDependencies": { "devDependencies": {
"jest-cli": "git://github.com/facebook/jest#0.5.x", "jest-cli": "facebook/jest#0.5.x",
"babel-eslint": "3.1.5", "babel-eslint": "3.1.5",
"eslint": "0.21.2", "eslint": "0.21.2",
"eslint-plugin-react": "2.3.0" "eslint-plugin-react": "2.3.0"