From aa387baa8717dacb673e5f6cb1eb04012d3f5a73 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Thu, 23 Nov 2017 16:41:31 +0100 Subject: add tar.gz as a linux build target --- electron-builder.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/electron-builder.yml b/electron-builder.yml index adc8f8ae9..994b5b0b8 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -27,6 +27,7 @@ linux: target: - target: AppImage - target: deb + - target: tar.gz nsis: perMachine: false -- cgit v1.2.3-70-g09d2 From 2edf8b4d004bcd994e6a58383165ead090242dd1 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Thu, 23 Nov 2017 16:41:47 +0100 Subject: Use node 8 on travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b3ebc4f25..3b5e4c4b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ script: - travis_wait yarn build node_js: -- '7' +- '8' before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt install libx11-dev libxext-dev libxss-dev libxkbfile-dev; fi -- cgit v1.2.3-70-g09d2 From f2ab173b9de2422d42732fbe12ff4722ba4fd10d Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Thu, 23 Nov 2017 16:43:12 +0100 Subject: Add gulp as a local dependency --- package.json | 1 + yarn.lock | 25 ++++++++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 54df530ca..8a5eee7b2 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "electron-updater": "^2.4.3", "electron-window-state": "^4.1.0", "fs-extra": "^3.0.1", + "gulp-cli": "1.2.2", "ini": "^1.3.4", "jshashes": "^1.0.6", "jsonwebtoken": "^7.4.1", diff --git a/yarn.lock b/yarn.lock index 6c3f807a4..c662ce63f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2974,6 +2974,29 @@ gulp-babel@^6.1.2: through2 "^2.0.0" vinyl-sourcemaps-apply "^0.2.0" +gulp-cli@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-1.2.2.tgz#7392def6316c6e7939a4f296f3f540151ae3a275" + dependencies: + archy "^1.0.0" + chalk "^1.1.0" + fancy-log "^1.1.0" + gulplog "^1.0.0" + interpret "^1.0.0" + liftoff "^2.1.0" + lodash.isfunction "^3.0.8" + lodash.isplainobject "^4.0.4" + lodash.isstring "^4.0.1" + lodash.sortby "^4.5.0" + matchdep "^1.0.0" + mute-stdout "^1.0.0" + pretty-hrtime "^1.0.0" + semver-greatest-satisfied-range "^1.0.0" + tildify "^1.0.0" + v8flags "^2.0.9" + wreck "^6.3.0" + yargs "^3.28.0" + gulp-cli@^1.0.0: version "1.4.0" resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-1.4.0.tgz#6f5bbe2cd0bdb4849d12cf9e1246a5861f8b4f88" @@ -3768,7 +3791,7 @@ levn@^0.3.0, levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -liftoff@^2.3.0: +liftoff@^2.1.0, liftoff@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.3.0.tgz#a98f2ff67183d8ba7cfaca10548bd7ff0550b385" dependencies: -- cgit v1.2.3-70-g09d2 From 8d59264e662b05389000f767b452420749ed1ce1 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Thu, 23 Nov 2017 16:43:48 +0100 Subject: remove gulp as a global dependency --- .travis.yml | 2 -- README.md | 6 ------ appveyor.yml | 2 -- 3 files changed, 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3b5e4c4b0..78c1e3693 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,6 @@ matrix: language: node_js before_script: -- yarn add global gulp-cli@1.2.2 -- yarn add global gulpjs/gulp#4.0 - yarn add global node-sass - yarn install diff --git a/README.md b/README.md index 6110573a8..099100284 100644 --- a/README.md +++ b/README.md @@ -31,12 +31,6 @@ $ brew install yarn ##### Linux [Install Yarn on Linux](https://yarnpkg.com/lang/en/docs/install/) -#### Install Gulp 4 -```bash -$ yarn add global gulp-cli@1.2.2 -$ yarn add global gulpjs/gulp#4.0 -``` - #### Fix native modules to match current electron node version ```bash $ yarn run rebuild diff --git a/appveyor.yml b/appveyor.yml index a8e55d25f..d9296b1f6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,8 +11,6 @@ version: 5.0.0.{build} install: - ps: Install-Product node 8 - yarn cache clean - - yarn add global gulp-cli@1.2.2 - - yarn add global gulpjs/gulp#4.0 - yarn install # cache: -- cgit v1.2.3-70-g09d2 From adef56ef193a9b7a434b228010b0cc830f29bf06 Mon Sep 17 00:00:00 2001 From: Anton Pirker Date: Fri, 24 Nov 2017 10:25:12 +0100 Subject: Set a synopsis and description for linux. Also fixed the icons on linux (tested on ubuntu --- build-helpers/images/icon.png | Bin 547480 -> 126364 bytes build-helpers/images/icons/1024x1024.png | Bin 547480 -> 126364 bytes electron-builder.yml | 2 ++ 3 files changed, 2 insertions(+) diff --git a/build-helpers/images/icon.png b/build-helpers/images/icon.png index e0b4935b5..9c39f06e0 100644 Binary files a/build-helpers/images/icon.png and b/build-helpers/images/icon.png differ diff --git a/build-helpers/images/icons/1024x1024.png b/build-helpers/images/icons/1024x1024.png index e0b4935b5..9c39f06e0 100644 Binary files a/build-helpers/images/icons/1024x1024.png and b/build-helpers/images/icons/1024x1024.png differ diff --git a/electron-builder.yml b/electron-builder.yml index adc8f8ae9..2b2cf3fcb 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -24,6 +24,8 @@ linux: icon: ./build-helpers/images/icons category: Network;InstantMessaging; executableName: franz + synopsis: "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more." + description: "Franz is your messaging app / former Emperor of Austria and combines chat & messaging services into one application. Franz currently supports Slack, WhatsApp, WeChat, HipChat, Facebook Messenger, Telegram, Google Hangouts, GroupMe, Skype and many more. You can download Franz for free for Mac & Windows." target: - target: AppImage - target: deb -- cgit v1.2.3-70-g09d2 From f2df9e3403b8ba90ac982aaf37c14d30591ae1ee Mon Sep 17 00:00:00 2001 From: Anton Pirker Date: Fri, 24 Nov 2017 10:25:25 +0100 Subject: Added missing icon files --- build-helpers/images/icons/128x128.png | Bin 0 -> 5538 bytes build-helpers/images/icons/16x16.png | Bin 0 -> 682 bytes build-helpers/images/icons/24x24.png | Bin 0 -> 1143 bytes build-helpers/images/icons/256x256.png | Bin 0 -> 13267 bytes build-helpers/images/icons/32x32.png | Bin 0 -> 1526 bytes build-helpers/images/icons/48x48.png | Bin 0 -> 2262 bytes build-helpers/images/icons/512x512.png | Bin 0 -> 38356 bytes build-helpers/images/icons/64x64.png | Bin 0 -> 2885 bytes build-helpers/images/icons/96x96.png | Bin 0 -> 4422 bytes 9 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 build-helpers/images/icons/128x128.png create mode 100644 build-helpers/images/icons/16x16.png create mode 100644 build-helpers/images/icons/24x24.png create mode 100644 build-helpers/images/icons/256x256.png create mode 100644 build-helpers/images/icons/32x32.png create mode 100644 build-helpers/images/icons/48x48.png create mode 100644 build-helpers/images/icons/512x512.png create mode 100644 build-helpers/images/icons/64x64.png create mode 100644 build-helpers/images/icons/96x96.png diff --git a/build-helpers/images/icons/128x128.png b/build-helpers/images/icons/128x128.png new file mode 100644 index 000000000..8eb811283 Binary files /dev/null and b/build-helpers/images/icons/128x128.png differ diff --git a/build-helpers/images/icons/16x16.png b/build-helpers/images/icons/16x16.png new file mode 100644 index 000000000..2523dd8a7 Binary files /dev/null and b/build-helpers/images/icons/16x16.png differ diff --git a/build-helpers/images/icons/24x24.png b/build-helpers/images/icons/24x24.png new file mode 100644 index 000000000..9cb17a0b1 Binary files /dev/null and b/build-helpers/images/icons/24x24.png differ diff --git a/build-helpers/images/icons/256x256.png b/build-helpers/images/icons/256x256.png new file mode 100644 index 000000000..5742147b8 Binary files /dev/null and b/build-helpers/images/icons/256x256.png differ diff --git a/build-helpers/images/icons/32x32.png b/build-helpers/images/icons/32x32.png new file mode 100644 index 000000000..09b88a805 Binary files /dev/null and b/build-helpers/images/icons/32x32.png differ diff --git a/build-helpers/images/icons/48x48.png b/build-helpers/images/icons/48x48.png new file mode 100644 index 000000000..c9d2f331c Binary files /dev/null and b/build-helpers/images/icons/48x48.png differ diff --git a/build-helpers/images/icons/512x512.png b/build-helpers/images/icons/512x512.png new file mode 100644 index 000000000..9d5f1c658 Binary files /dev/null and b/build-helpers/images/icons/512x512.png differ diff --git a/build-helpers/images/icons/64x64.png b/build-helpers/images/icons/64x64.png new file mode 100644 index 000000000..7842217ed Binary files /dev/null and b/build-helpers/images/icons/64x64.png differ diff --git a/build-helpers/images/icons/96x96.png b/build-helpers/images/icons/96x96.png new file mode 100644 index 000000000..bbae07f45 Binary files /dev/null and b/build-helpers/images/icons/96x96.png differ -- cgit v1.2.3-70-g09d2