Merge branch 'package-version-fix'

3 files changed, 58 insertions, 29 deletions

diff --git a/electron-builder.yml b/electron-builder.yml
index c76642ec4d..a0dc05b1d2 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -1,7 +1,6 @@
 appId: net.mullvad.vpn
 copyright: Amagicom AB
 productName: MullvadVPN
-buildVersion: "2017.1-alpha5"
 
 asar: true
 compression: maximum
@@ -35,10 +34,11 @@ dmg:
 mac:
   target:
     - dmg
-  artifactName: ${productName}-${buildVersion}.${ext}
+  artifactName: ${productName}-${version}.${ext}
   category: public.app-category.tools
   extendInfo:
     LSUIElement: true
+  identity: null # disable code signing
   extraResources:
     - from: ../talpid_core/target/release/mullvad
       to: .
@@ -52,7 +52,7 @@ mac:
 win:
   target:
     - nsis
-  artifactName: ${productName}-${buildVersion}.${ext}
+  artifactName: ${productName}-${version}.${ext}
   extraResources:
     - from: ../talpid_core/target/release/mullvad.exe
       to: .
@@ -64,7 +64,7 @@ win:
 linux:
   target:
     - deb
-  artifactName: ${productName}_${buildVersion}_${arch}.${ext}
+  artifactName: ${productName}-${version}_${arch}.${ext}
   extraResources:
     - from: ../talpid_core/target/release/mullvad
       to: .
diff --git a/package.json b/package.json
index 2ea8bbc029..0ac29d903f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mullvad-vpn",
-  "version": "0.1.0",
+  "version": "2017.1.0-alpha5",
   "description": "Mullvad VPN client",
   "main": "init.js",
   "author": {
@@ -49,7 +49,7 @@
     "browser-sync": "^2.9.3",
     "chai": "^4.1.0",
     "electron": "^1.6.11",
-    "electron-builder": "^19.29.1",
+    "electron-builder": "^19.30.2",
     "electron-devtools-installer": "^2.1.0",
     "electron-mocha": "^3.3.0",
     "enzyme": "^2.9.1",
diff --git a/yarn.lock b/yarn.lock
index 6b9cabbb36..57f5a6f78c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -173,13 +173,13 @@ anymatch@^1.3.0:
     arrify "^1.0.0"
     micromatch "^2.1.5"
 
-app-package-builder@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/app-package-builder/-/app-package-builder-1.0.1.tgz#fb4e0f2f444f8435d0b963c55902dfd32337b11f"
+app-package-builder@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/app-package-builder/-/app-package-builder-1.0.2.tgz#bd55b7a88f7be7fa919bc5472e5a05489020bfc3"
   dependencies:
     bluebird-lst "^1.0.3"
-    builder-util "2.0.2"
-    builder-util-runtime "1.0.2"
+    builder-util "2.0.4"
+    builder-util-runtime "1.0.5"
     fs-extra-p "^4.4.2"
     int64-buffer "^0.1.9"
     js-yaml "^3.10.0"
@@ -1271,7 +1271,15 @@ buffers@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"
 
-builder-util-runtime@1.0.2, builder-util-runtime@^1.0.2:
+builder-util-runtime@1.0.5, builder-util-runtime@^1.0.3, builder-util-runtime@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-1.0.5.tgz#7f2c3eb285230ae60c34f360a9235b08af88f519"
+  dependencies:
+    bluebird-lst "^1.0.3"
+    debug "^3.0.1"
+    fs-extra-p "^4.4.2"
+
+builder-util-runtime@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-1.0.2.tgz#b10ca7913159f219b1707d46f6d3139825ee4605"
   dependencies:
@@ -1279,13 +1287,13 @@ builder-util-runtime@1.0.2, builder-util-runtime@^1.0.2:
     debug "^3.0.1"
     fs-extra-p "^4.4.2"
 
-builder-util@2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-2.0.2.tgz#407e2d43060ff86f7ec189d9fc7a12db138c5849"
+builder-util@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-2.0.4.tgz#69cf6a16e0b5fa9c4a3ba513c3352c783b221f28"
   dependencies:
     "7zip-bin" "^2.2.4"
     bluebird-lst "^1.0.3"
-    builder-util-runtime "^1.0.2"
+    builder-util-runtime "^1.0.5"
     chalk "^2.1.0"
     debug "^3.0.1"
     fs-extra-p "^4.4.2"
@@ -1300,7 +1308,7 @@ builder-util@2.0.2:
     temp-file "^2.0.3"
     tunnel-agent "^0.6.0"
 
-builder-util@2.0.3, builder-util@^2.0.2:
+builder-util@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-2.0.3.tgz#f0a6ed6078217e1393ed02d66090e89066a0a97b"
   dependencies:
@@ -1321,6 +1329,27 @@ builder-util@2.0.3, builder-util@^2.0.2:
     temp-file "^2.0.3"
     tunnel-agent "^0.6.0"
 
+builder-util@^2.0.3:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-2.0.5.tgz#ee75a98b38a2aaa60f12290300f06d879bfdef6d"
+  dependencies:
+    "7zip-bin" "^2.2.4"
+    bluebird-lst "^1.0.3"
+    builder-util-runtime "^1.0.5"
+    chalk "^2.1.0"
+    debug "^3.0.1"
+    fs-extra-p "^4.4.2"
+    ini "^1.3.4"
+    is-ci "^1.0.10"
+    js-yaml "^3.10.0"
+    lazy-val "^1.0.2"
+    node-emoji "^1.8.1"
+    semver "^5.4.1"
+    source-map-support "^0.4.18"
+    stat-mode "^0.2.2"
+    temp-file "^2.0.3"
+    tunnel-agent "^0.6.0"
+
 builtin-modules@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
@@ -1972,16 +2001,16 @@ ejs@^2.5.7:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"
 
-electron-builder@^19.29.1:
-  version "19.29.1"
-  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-19.29.1.tgz#00e097aaba63fcbb811c531945491c5ca7c044cf"
+electron-builder@^19.30.2:
+  version "19.30.2"
+  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-19.30.2.tgz#951be52a97229a0691fb6dccc4bbf7a3f86a3f30"
   dependencies:
     "7zip-bin" "^2.2.4"
-    app-package-builder "1.0.1"
+    app-package-builder "1.0.2"
     asar-integrity "0.2.1"
     bluebird-lst "^1.0.3"
-    builder-util "2.0.3"
-    builder-util-runtime "1.0.2"
+    builder-util "2.0.4"
+    builder-util-runtime "1.0.5"
     chalk "^2.1.0"
     chromium-pickle-js "^0.2.0"
     cuint "^0.2.2"
@@ -1992,7 +2021,7 @@ electron-builder@^19.29.1:
     ejs "^2.5.7"
     electron-download-tf "4.3.4"
     electron-osx-sign "0.4.7"
-    electron-publish "19.29.0"
+    electron-publish "19.30.0"
     fs-extra-p "^4.4.2"
     hosted-git-info "^2.5.0"
     is-ci "^1.0.10"
@@ -2071,13 +2100,13 @@ electron-osx-sign@0.4.7:
     minimist "^1.2.0"
     plist "^2.1.0"
 
-electron-publish@19.29.0:
-  version "19.29.0"
-  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-19.29.0.tgz#df54a7383b067ff0351ff83d2aaa70832080b054"
+electron-publish@19.30.0:
+  version "19.30.0"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-19.30.0.tgz#d266fb9d54821b06f19117da004f6209fab3dcb2"
   dependencies:
     bluebird-lst "^1.0.3"
-    builder-util "^2.0.2"
-    builder-util-runtime "^1.0.2"
+    builder-util "^2.0.3"
+    builder-util-runtime "^1.0.3"
     chalk "^2.1.0"
     fs-extra-p "^4.4.2"
     mime "^2.0.2"