toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

[MM-15994] Revert change to use RNN v2's npm script (#2922)

Browse source 
* Revert change to use RNN v2's npm script

* Remove RNN v2 npm script
This commit is contained in:
Miguel Alatzar 2019-06-25 09:06:00 -07:00 committed by GitHub
parent 863043e125
commit 74c7805e65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Makefile
View file

@ -160,11 +160,19 @@ run-android: | check-device-android pre-run prepare-android-build ## Runs the ap
@if [ $(shell ps -ef | grep -i "cli.js start" | grep -civ grep) -eq 0 ]; then \
echo Starting React Native packager server; \
npm start & echo Running Android app in development; \
npm run android; \
if [ ! -z ${VARIANT} ]; then \
react-native run-android --no-packager --variant=${VARIANT}; \
else \
react-native run-android --no-packager; \
fi; \
wait; \
else \
echo Running Android app in development; \
npm run android; \
if [ ! -z ${VARIANT} ]; then \
react-native run-android --no-packager --variant=${VARIANT}; \
else \
react-native run-android --no-packager; \
fi; \
fi
build: | stop pre-build check-style i18n-extract-ci ## Builds the app for Android & iOS

3
package.json
View file

@ -116,8 +116,7 @@
"test:watch": "jest --watch",
"test:coverage": "jest --coverage",
"updatesnapshot": "jest --updateSnapshot",
"mmjstool": "mmjstool",
"android": "cd ./android && ./gradlew app:assembleDebug && ./gradlew installDebug"
"mmjstool": "mmjstool"
},
"rnpm": {
"assets": [