From 2e75b7f2bbd30929cd1763bcb78951beba1a96ab Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Sun, 10 Apr 2016 23:22:51 -0400 Subject: [PATCH] Upgrade Electron to v0.36.11 (#275) This version contains a fix for `resizable: false` not working on GNU/Linux. See: https://github.com/electron/electron/releases/tag/v0.36.11 Fixes: https://github.com/resin-io/etcher/issues/272 Signed-off-by: Juan Cruz Viotti --- Makefile | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1b203df8..dbce0039 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ ELECTRON_PACKAGER=./node_modules/.bin/electron-packager ELECTRON_BUILDER=./node_modules/.bin/electron-builder ELECTRON_OSX_SIGN=./node_modules/.bin/electron-osx-sign ELECTRON_IGNORE=$(shell node -e "console.log(require('./package.json').packageIgnore.join('|'))") -ELECTRON_VERSION=0.36.8 +ELECTRON_VERSION=0.36.11 ETCHER_VERSION=$(shell node -e "console.log(require('./package.json').version)") APPLICATION_NAME=$(shell node -e "console.log(require('./package.json').displayName)") APPLICATION_DESCRIPTION=$(shell node -e "console.log(require('./package.json').description)") diff --git a/package.json b/package.json index f1934d70..6b6f803d 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "electron-mocha": "^0.8.0", "electron-osx-sign": "^0.3.0", "electron-packager": "^6.0.0", - "electron-prebuilt": "^0.36.8", + "electron-prebuilt": "^0.36.11", "gulp": "^3.9.0", "gulp-jscs": "^3.0.2", "gulp-jshint": "^2.0.0",