merge master and fix build

.travis.yml

@@ -9,19 +9,19 @@ matrix:
         - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
     - os: linux
       services: docker
-      language: generic
+      language: node_js
-before_cache:
+      node_js: "9"
-  - rm -rf $HOME/.cache/electron-builder/wine
+cache: false
-cache:
-  directories:
-  - node_modules
-  - $HOME/.cache/electron
-  - $HOME/.cache/electron-builder
 before_install:
   - |
     if [ "$TRAVIS_OS_NAME" == "osx" ]; then
       mkdir -p /tmp/git-lfs && curl -L https://github.com/github/git-lfs/releases/download/v2.3.1/git-lfs-$([ "$TRAVIS_OS_NAME" == "linux" ] && echo "linux" || echo "darwin")-amd64-2.3.1.tar.gz | tar -xz -C /tmp/git-lfs --strip-components 1
       export PATH="/tmp/git-lfs:$PATH"
+    else
+      sudo apt-get -qq update
+      sudo apt-get install -y libsecret-1-dev
+      curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.6.0
+      export PATH="$HOME/.yarn/bin:$PATH"
     fi
 before_script:
   - git lfs pull
@@ -38,7 +38,6 @@ script:
     else
       yarn build --publish onTag
     fi
-  - yarn danger ci
 branches:
   except:
     - "/^v\\d+\\.\\d+\\.\\d+$/"
@@ -48,4 +47,4 @@ addons:
     paths:
      - $(git ls-files -o dist/{*.dmg,*.exe,*.deb} | tr "\n" ":")
     target_paths:
-     - /app/build-${TRAVIS_BUILD_NUMBER}_commit-${TRAVIS_COMMIT:0:7}$([ ! -z ${TRAVIS_TAG} ] && echo _tag-${TRAVIS_TAG})
+     - /app/build-${TRAVIS_BUILD_NUMBER}_commit-${TRAVIS_COMMIT:0:7}$([ ! -z ${TRAVIS_TAG} ] && echo _tag-${TRAVIS_TAG})

README.md

@@ -14,7 +14,7 @@ The LBRY app is a graphical browser for the decentralized content marketplace pr
 
 ## Installing
 
-We provide installers for Windows, macOS, and Debian-based Linux.
+We provide installers for Windows, macOS (v10.9 or greater), and Debian-based Linux.
 
 |                       | Windows                                      | macOS                                        | Linux                                        |
 | --------------------- | -------------------------------------------- | -------------------------------------------- | -------------------------------------------- |

package.json

@@ -96,7 +96,7 @@
     "del": "^3.0.0",
     "devtron": "^1.4.0",
     "electron": "^1.8.4",
-    "electron-builder": "^20.8.1",
+    "electron-builder": "^20.13.3",
     "electron-devtools-installer": "^2.2.3",
     "electron-webpack": "^1.13.0",
     "eslint": "^4.19.0",