From 9f9e0226d60007cf5f09f27b53797141d2cbff82 Mon Sep 17 00:00:00 2001
From: Martin Zagora <zaggino@gmail.com>
Date: Mon, 13 Mar 2017 11:51:35 +1100
Subject: [PATCH] update electron to 1.6.2

---
 package.json | 33 +++++++++++++++------------------
 tslint.json  |  1 +
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index 3efb15c4d21..d6028763cb2 100644
--- a/package.json
+++ b/package.json
@@ -71,27 +71,24 @@
         "semver": "5.3.0",
         "strip-bom": "3.0.0",
         "temp": "0.8.3",
-        "trash": "4.0.0",
+        "trash": "4.0.1",
         "xml2js": "0.4.17"
     },
-    "optionalDependencies": {
-        "fsevents": "1.0.15"
-    },
     "devDependencies": {
-        "@types/electron": "1.4.32",
+        "@types/electron": "1.4.33",
         "@types/fs-extra": "0.0.37",
-        "@types/jquery": "2.0.40",
-        "@types/lodash": "4.14.52",
-        "@types/node": "7.0.5",
-        "@types/ws": "0.0.38",
-        "concurrently": "3.3.0",
-        "cross-spawn": "5.0.1",
-        "electron": "1.4.15",
-        "electron-builder": "13.9.0",
-        "electron-builder-squirrel-windows": "13.10.1",
+        "@types/jquery": "2.0.41",
+        "@types/lodash": "4.14.55",
+        "@types/node": "7.0.8",
+        "@types/ws": "0.0.39",
+        "concurrently": "3.4.0",
+        "cross-spawn": "5.1.0",
+        "electron": "1.6.2",
+        "electron-builder": "15.3.0",
+        "electron-builder-squirrel-windows": "15.3.0",
         "electron-packager": "8.5.2",
         "electron-rebuild": "1.5.7",
-        "eslint": "3.15.0",
+        "eslint": "3.17.1",
         "glob": "7.1.1",
         "grunt": "0.4.5",
         "grunt-cleanempty": "1.0.3",
@@ -117,9 +114,9 @@
         "load-grunt-tasks": "3.5.2",
         "q": "1.4.1",
         "rimraf": "2.6.0",
-        "tslint": "4.4.2",
-        "typescript": "2.2.0",
-        "typescript-eslint-parser": "1.0.3",
+        "tslint": "4.5.1",
+        "typescript": "2.2.1",
+        "typescript-eslint-parser": "2.0.0",
         "webpack": "2.2.1",
         "xmldoc": "0.1.2"
     }
diff --git a/tslint.json b/tslint.json
index 79a5bd63820..9046f5712b2 100644
--- a/tslint.json
+++ b/tslint.json
@@ -1,6 +1,7 @@
 {
   "extends": "tslint:latest",
   "rules": {
+    "ban-types": false,
     "interface-name": false,
     "member-ordering": false,
     "no-namespace": false,