diff --git a/Gruntfile.js b/Gruntfile.js
index 33ed86676..db796f3b2 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -3,11 +3,21 @@
module.exports = function(grunt) {
require('load-grunt-tasks')(grunt);
+ require('grunt-curl')(grunt);
// Project Configuration
grunt.initConfig({
+ curl: {
+ './cache/nwjs.zip': 'https://dl.nwjs.io/v0.19.5-mas-beta/nwjs-mas-v0.19.5-osx-x64.zip',
+ },
+ unzip: {
+ './cache/': './cache/nwjs.zip'
+ },
pkg: grunt.file.readJSON('package.json'),
exec: {
+ replaceNWJS: {
+ command: 'rm -R ./cache/0.19.5/osx64/nwjs.app; cp -R ./cache/nwjs-mas-v0.19.5-osx-x64/nwjs.app ./cache/0.19.5/osx64/'
+ },
appConfig: {
command: 'node ./util/buildAppConfig.js'
},
@@ -240,6 +250,7 @@ module.exports = function(grunt) {
'CFBundleIdentifier': 'com.bitcoin.mwallet.mac',
'CFBundleDisplayName': '<%= pkg.title %>',
'CFBundleShortVersionString': '<%= pkg.version %>',
+ 'CFBundleVersion': '<%= pkg.androidVersion %>',
'LSApplicationCategoryType': 'public.app-category.finance',
'CFBundleURLTypes': [
{
@@ -276,7 +287,7 @@ module.exports = function(grunt) {
grunt.registerTask('default', ['nggettext_compile', 'exec:appConfig', 'exec:externalServices', 'browserify', 'sass', 'concat', 'copy:ionic_fonts', 'copy:ionic_js']);
grunt.registerTask('prod', ['default', 'uglify']);
grunt.registerTask('translate', ['nggettext_extract']);
- grunt.registerTask('desktop', ['prod', 'nwjs', 'copy:linux', 'compress:linux']);
+ grunt.registerTask('desktop', ['prod', 'nwjs', 'fix-nwjs-macos', 'nwjs', 'copy:linux', 'compress:linux']);
grunt.registerTask('osx', ['prod', 'nwjs', 'exec:macos', 'exec:osxsign']);
grunt.registerTask('osx-debug', ['default', 'nwjs']);
grunt.registerTask('chrome', ['default','exec:chrome']);
@@ -290,6 +301,7 @@ module.exports = function(grunt) {
grunt.registerTask('android-debug', ['exec:androiddebug', 'exec:androidrun']);
grunt.registerTask('android', ['exec:android']);
grunt.registerTask('android-release', ['prod', 'exec:android', 'exec:androidsign']);
- grunt.registerTask('desktopsign', ['exec:desktopsign', 'exec:desktopverify']);
+ grunt.registerTask('desktopsign', ['exec:desktopsign', 'exec:desktopverify']);
+ grunt.registerTask('fix-nwjs-macos', ['curl', 'unzip', 'exec:replaceNWJS']);
};
diff --git a/app-template/package-template.json b/app-template/package-template.json
index 65c97f7e9..8e7aae9be 100644
--- a/app-template/package-template.json
+++ b/app-template/package-template.json
@@ -70,6 +70,8 @@
"grunt-angular-gettext": "^2.2.3",
"grunt-browserify": "^5.0.0",
"grunt-cli": "^1.2.0",
+ "grunt-curl": "^2.4.1",
+ "grunt-zip": "^0.17.1",
"grunt-contrib-compress": "^1.3.0",
"grunt-contrib-concat": "^1.0.1",
"grunt-contrib-copy": "^1.0.0",
diff --git a/www/index.html b/www/index.html
index 76827f685..47dc27d2a 100644
--- a/www/index.html
+++ b/www/index.html
@@ -11,7 +11,7 @@
- Bitcoin.com - Bitcoin.com Wallet
+ Bitcoin.com Wallet