masq
/
glowing-bear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #988 from lorenzhs/update-electron 

Update electron and electron-packager to latest version
This commit is contained in:
Lorenz Hübschle-Schneider 2018-03-19 10:59:11 +01:00 committed by GitHub
parent 492bd3bd60 7b371e1c95
commit 29963b1b26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
electron.makefile
View File

@ -18,10 +18,10 @@ uselocal: copylocal
# build the electron app for various platforms # build the electron app for various platforms
build-electron-windows: uselocal build-electron-windows: uselocal
electron-packager ${ELECTRON_COMMON} --platform=win32 --arch=ia32 --version=1.3.3 --icon=assets/img/favicon.ico --asar=true electron-packager ${ELECTRON_COMMON} --platform=win32 --arch=ia32 --electron-version=1.8.4 --icon=assets/img/favicon.ico --asar=true
build-electron-darwin: uselocal build-electron-darwin: uselocal
electron-packager ${ELECTRON_COMMON} --platform=darwin --arch=x64 --version=1.3.3 --icon=assets/img/glowing-bear.icns electron-packager ${ELECTRON_COMMON} --platform=darwin --arch=x64 --electron-version=1.8.4 --icon=assets/img/glowing-bear.icns
build-electron-linux: uselocal build-electron-linux: uselocal
electron-packager ${ELECTRON_COMMON} --platform=linux --arch=x64 --version=1.3.3 --icon=assets/img/favicon.ico electron-packager ${ELECTRON_COMMON} --platform=linux --arch=x64 --electron-version=1.8.4 --icon=assets/img/favicon.ico

2
package.json
View File

@ -8,7 +8,7 @@
"license": "GPLv3", "license": "GPLv3",
"devDependencies": { "devDependencies": {
"bower": "^1.8", "bower": "^1.8",
"electron-packager": "^7.0.0", "electron-packager": "^11",
"http-server": "^0.11", "http-server": "^0.11",
"jasmine-core": "^3.1", "jasmine-core": "^3.1",
"jshint": "^2.9", "jshint": "^2.9",