Merge pull request #6966 from cmgustavo/v4-07

V4 07
This commit is contained in:
Javier Donadío 2017-10-24 18:58:46 -03:00 committed by GitHub
commit 4a7c329c5d
2 changed files with 17 additions and 16 deletions

View File

@ -41,7 +41,6 @@
<!-- Plugins -->
<plugin name="cordova-clipboard" spec="1.1.0" />
<plugin name="cordova-plugin-android-fingerprint-auth" spec="1.4.0" />
<plugin name="cordova-plugin-console" spec="1.1.0" />
<plugin name="cordova-plugin-device" spec="1.1.6" />
<plugin name="cordova-plugin-qrscanner" spec="2.5.0" />
<plugin name="cordova-plugin-splashscreen" spec="4.0.3" />
@ -62,7 +61,7 @@
<plugin name="cordova-ios-requires-fullscreen" spec="0.0.2" />
<plugin name="cordova-plugin-screen-orientation" spec="1.4.3" />
<plugin name="cordova-custom-config" spec="4.0.2" />
<plugin name="cordova-plugin-customurlscheme" spec="https://github.com/cmgustavo/Custom-URL-scheme.git">
<plugin name="cordova-plugin-customurlscheme" spec="https://github.com/cmgustavo/Custom-URL-scheme.git#v4.0">
<variable name="URL_SCHEME" value="bitcoin" />
<variable name="SECOND_URL_SCHEME" value="*APPURI*" />
<variable name="THIRD_URL_SCHEME" value="bitcoincash" />
@ -76,6 +75,10 @@
<config-file platform="ios" target="*-Info.plist" parent="UIStatusBarHidden"><true/></config-file>
<config-file platform="ios" target="*-Info.plist" parent="UIViewControllerBasedStatusBarAppearance"><false/></config-file>
<config-file target="*-Info.plist" parent="ITSAppUsesNonExemptEncryption"><false/></config-file>
<preference name="ios-XCBuildConfiguration-CODE\_SIGN\_IDENTITY" value="" buildType="debug" xcconfigEnforce="false" />
<preference name="ios-XCBuildConfiguration-CODE\_SIGN\_IDENTITY" value="" buildType="release" xcconfigEnforce="false" />
<icon src="resources/*PACKAGENAME*/ios/icon/icon-60@3x.png" width="180" height="180" />
<icon src="resources/*PACKAGENAME*/ios/icon/icon-60.png" width="60" height="60" />
<icon src="resources/*PACKAGENAME*/ios/icon/icon-60@2x.png" width="120" height="120" />

View File

@ -35,18 +35,18 @@
"start:android": "npm run build:android && npm run run:android",
"build:ios": "ionic cordova build ios --debug",
"build:android": "ionic cordova build android --debug",
"build:ios-release": "ionic cordova prepare ios && ionic cordova build ios --prod --release",
"build:android-release": "ionic cordova prepare android && ionic cordova build android --prod --release",
"build:ios-release": "ionic cordova build ios --prod --release",
"build:android-release": "ionic cordova build android --prod --release",
"open:ios": "open platforms/ios/*.xcodeproj",
"open:android": "open -a open -a /Applications/Android\\ Studio.app platforms/android",
"final:ios": "ionic build && npm run build:ios-release && npm run open:ios",
"final:android": "ionic build && npm run build:android-release && npm run sign:android && npm run run:android-release",
"final:ios": "npm run clean && npm run build:ios-release && npm run open:ios",
"final:android": "npm run clean && npm run build:android-release && npm run sign:android && npm run run:android-release",
"run:android": "ionic cordova run android --device",
"run:android-release": "ionic cordova run android --device --release",
"log:android": "adb logcat | grep chromium",
"sign:android": "rm -f platforms/android/build/outputs/apk/android-release-signed-aligned.apk; jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../copay.keystore -signedjar platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-unsigned.apk copay_play && $ANDROID_HOME/build-tools/26.0.1/zipalign -v 4 platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-signed-aligned.apk",
"apply:copay": "npm i && cd app-template && node apply.js copay && npm run build",
"apply:bitpay": "npm i && cd app-template && node apply.js bitpay && npm run build"
"apply:copay": "npm i && cd app-template && node apply.js copay",
"apply:bitpay": "npm i && cd app-template && node apply.js bitpay"
},
"dependencies": {
"@angular/common": "4.4.3",
@ -86,13 +86,12 @@
"cordova-ios-requires-fullscreen": "0.0.2",
"cordova-plugin-android-fingerprint-auth": "^1.4.0",
"cordova-plugin-compat": "^1.2.0",
"cordova-plugin-console": "^1.1.0",
"cordova-plugin-customurlscheme": "git+https://github.com/cmgustavo/Custom-URL-scheme.git",
"cordova-plugin-customurlscheme": "https://github.com/cmgustavo/Custom-URL-scheme.git#v4.0",
"cordova-plugin-device": "^1.1.6",
"cordova-plugin-dialogs": "^1.3.3",
"cordova-plugin-fcm": "git+https://github.com/cmgustavo/cordova-plugin-fcm.git",
"cordova-plugin-fcm": "https://github.com/cmgustavo/cordova-plugin-fcm.git",
"cordova-plugin-file": "^4.3.3",
"cordova-plugin-ionic-webview": "^1.1.15",
"cordova-plugin-ionic-webview": "^1.1.16",
"cordova-plugin-network-information": "^1.3.3",
"cordova-plugin-qrscanner": "^2.5.0",
"cordova-plugin-screen-orientation": "^1.4.3",
@ -121,7 +120,7 @@
"devDependencies": {
"@angular/cli": "1.3.0",
"@biesbjerg/ngx-translate-extract": "2.3.2",
"@ionic/app-scripts": "2.1.4",
"@ionic/app-scripts": "3.0.1",
"@types/chrome": "0.0.47",
"@types/cordova-plugin-qrscanner": "1.0.31",
"@types/jasmine": "2.5.53",
@ -130,7 +129,7 @@
"codecov": "2.2.0",
"fs-extra": "^4.0.2",
"html-loader": "0.4.5",
"ionic": "3.13.2",
"ionic": "3.14.0",
"jasmine-core": "2.6.4",
"jasmine-spec-reporter": "4.1.1",
"karma": "1.7.0",
@ -150,12 +149,11 @@
"tslint": "5.5.0",
"tslint-eslint-rules": "4.1.1",
"typescript": "2.3.4",
"webpack": "3.4.1"
"webpack": "3.8.1"
},
"cordova": {
"plugins": {
"cordova-sqlite-storage": {},
"cordova-plugin-console": {},
"cordova-plugin-device": {},
"cordova-plugin-splashscreen": {},
"cordova-plugin-statusbar": {},