Apply ans1.js patch automatically after apply:bitcoincom npm-command

This commit is contained in:
Sebastiaan Pasma 2018-06-06 12:33:49 +02:00
commit 0eecaaf185
2 changed files with 17 additions and 2 deletions

View file

@ -3,6 +3,7 @@
module.exports = function(grunt) {
require('load-grunt-tasks')(grunt);
grunt.loadNpmTasks('grunt-patcher');
// Project Configuration
grunt.initConfig({
@ -266,7 +267,18 @@ module.exports = function(grunt) {
'bitcoin-cash-js/bitcoin-cash-js.js': ['bitcoin-cash-js/index.js']
},
}
}
},
patch: {
asn1: {
options: {
patch: './patches/asn1-fix.patch'
},
files: {
'./node_modules/asn1.js-rfc5280/index.js': './node_modules/asn1.js-rfc5280/index.js'
}
}
},
});
grunt.registerTask('default', ['nggettext_compile', 'exec:appConfig', 'exec:externalServices', 'browserify', 'sass', 'concat', 'copy:ionic_fonts', 'copy:ionic_js']);
@ -287,5 +299,7 @@ module.exports = function(grunt) {
grunt.registerTask('android', ['exec:android']);
grunt.registerTask('android-release', ['prod', 'exec:android', 'exec:androidsign']);
grunt.registerTask('desktopsign', ['exec:desktopsign', 'exec:desktopverify']);
grunt.registerTask('apply-patches', ['patch:asn1']);
};

View file

@ -113,7 +113,7 @@
"sign:android": "rm -f platforms/android/build/outputs/apk/android-release-signed-aligned.apk; jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../bitcoin-com-release-key.jks -signedjar platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-unsigned.apk bitcoin-com && $ANDROID_HOME/build-tools/27.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 fs-extra && cd app-template && node apply.js copay && npm i && cordova prepare",
"apply:bitpay": "npm i fs-extra && cd app-template && node apply.js bitpay && npm i && cordova prepare",
"apply:bitcoincom": "npm i fs-extra && cd app-template && node apply.js bitcoincom && npm i && cordova prepare",
"apply:bitcoincom": "npm i fs-extra && cd app-template && node apply.js bitcoincom && npm i && grunt apply-patches && cordova prepare",
"test": "echo \"no package tests configured\"",
"clean": "trash platforms && trash plugins && cordova prepare",
"unstage-package": "git reset package.json",
@ -122,6 +122,7 @@
"devDependencies": {
"cordova": "^6.3.1",
"grunt": "^1.0.1",
"grunt-patcher": "^1.0.0",
"ionic": "^3.6.0",
"trash-cli": "^1.4.0",
"lodash": "^4.17.4",