From 6d61ac400c4c8f569e6eec57f6f71debb6fcf5fb Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <Stanzilla@users.noreply.github.com>
Date: Mon, 12 Feb 2018 22:18:29 +0100
Subject: [PATCH] Electron 1.8 is out (#2663)

* update electron to 1.8.2

release notes: https://github.com/electron/electron/releases/tag/v1.8.2

* change yarn installation on travis

travis detects yarn lockfiles and automatically uses yarn in that case so no need to install it

* yarn is preinstalled on circleci
---
 .travis.yml  |  7 +------
 circle.yml   |  1 -
 package.json |  2 +-
 yarn.lock    | 14 +++++++-------
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2a80213e..de932ac0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ language: node_js
 matrix:
   include:
     - os: linux
-      node_js: 8.0.0
+      node_js: 8
       env: CC=clang CXX=clang++ npm_config_clang=1
       compiler: clang
 
@@ -25,10 +25,6 @@ addons:
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start; sleep 3; fi
-  - sudo apt-key adv --fetch-keys http://dl.yarnpkg.com/debian/pubkey.gpg
-  - echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
-  - sudo apt-get update -qq
-  - sudo apt-get install -y -qq yarn
 
 cache: yarn
 
@@ -42,4 +38,3 @@ after_success:
 branches:
   except:
     - "/^v\\d+\\.\\d+\\.\\d+$/"
-
diff --git a/circle.yml b/circle.yml
index d601e4e2..ca2745ac 100644
--- a/circle.yml
+++ b/circle.yml
@@ -6,7 +6,6 @@ machine:
 
 dependencies:
   pre:
-    - npm install -g yarn
     - yarn config set cache-folder ~/.yarn-cache
   cache_directories:
     - ~/.yarn-cache
diff --git a/package.json b/package.json
index db20c631..2686537c 100644
--- a/package.json
+++ b/package.json
@@ -205,7 +205,7 @@
     "babel-preset-react": "6.24.1",
     "copy-webpack-plugin": "4.3.1",
     "cross-env": "5.1.3",
-    "electron": "1.7.11",
+    "electron": "1.8.2",
     "electron-builder": "19.55.2",
     "electron-builder-squirrel-windows": "19.55.2",
     "electron-devtools-installer": "2.2.3",
diff --git a/yarn.lock b/yarn.lock
index 7bb9070c..bea06f39 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -76,9 +76,9 @@
   dependencies:
     arrify "^1.0.1"
 
-"@types/node@^7.0.18":
-  version "7.0.49"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.49.tgz#f43777edd31822d6bcb50735a76c7f301d7b3121"
+"@types/node@^8.0.24":
+  version "8.5.10"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.5.10.tgz#49bd3637125dea5f55d7d1e8f51efd6cb835e1f7"
 
 abbrev@1:
   version "1.1.1"
@@ -2316,11 +2316,11 @@ electron-to-chromium@^1.2.7:
   version "1.3.28"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.28.tgz#8dd4e6458086644e9f9f0a1cf32e2a1f9dffd9ee"
 
-electron@1.7.11:
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.11.tgz#993b6aa79e0e79a7cfcc369f4c813fbd9a0b08d9"
+electron@1.8.2:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-1.8.2.tgz#a817cd733c2972b3c7cc4f777caf6e424b88014d"
   dependencies:
-    "@types/node" "^7.0.18"
+    "@types/node" "^8.0.24"
     electron-download "^3.0.1"
     extract-zip "^1.0.3"