summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2020-05-06 13:47:15 +0200
committerLinus Färnstrand <linus@mullvad.net>2020-05-06 18:33:06 +0200
commitc9dfec0bcd9d1ba9663e6bf08407440598e896c6 (patch)
tree6060ff245ad04a05bbe0c6fc06f1137ecf84e0e1
parentc2fa456471a592d9cb96f4f8d8281fee9a93cddd (diff)
downloadmullvadvpn-c9dfec0bcd9d1ba9663e6bf08407440598e896c6.tar.xz
mullvadvpn-c9dfec0bcd9d1ba9663e6bf08407440598e896c6.zip
Bring in version bump from 2020.4-beta4
-rw-r--r--Cargo.lock14
-rw-r--r--android/build.gradle4
-rw-r--r--dist-assets/windows/version.h2
-rw-r--r--gui/package-lock.json2
-rw-r--r--gui/package.json2
-rw-r--r--mullvad-cli/Cargo.toml2
-rw-r--r--mullvad-daemon/Cargo.toml2
-rw-r--r--mullvad-problem-report/Cargo.toml2
-rw-r--r--mullvad-setup/Cargo.toml2
-rw-r--r--talpid-openvpn-plugin/Cargo.toml2
10 files changed, 17 insertions, 17 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 39d9181646..40d529824b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1344,7 +1344,7 @@ dependencies = [
[[package]]
name = "mullvad-cli"
-version = "2020.4.0-beta3"
+version = "2020.4.0-beta4"
dependencies = [
"base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
"chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1365,7 +1365,7 @@ dependencies = [
[[package]]
name = "mullvad-daemon"
-version = "2020.4.0-beta3"
+version = "2020.4.0-beta4"
dependencies = [
"android_logger 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)",
"cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1442,9 +1442,9 @@ dependencies = [
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"log-panics 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "mullvad-daemon 2020.4.0-beta3",
+ "mullvad-daemon 2020.4.0-beta4",
"mullvad-paths 0.1.0",
- "mullvad-problem-report 2020.4.0-beta3",
+ "mullvad-problem-report 2020.4.0-beta4",
"mullvad-rpc 0.1.0",
"mullvad-types 0.1.0",
"talpid-core 0.1.0",
@@ -1462,7 +1462,7 @@ dependencies = [
[[package]]
name = "mullvad-problem-report"
-version = "2020.4.0-beta3"
+version = "2020.4.0-beta4"
dependencies = [
"clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
"dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1509,7 +1509,7 @@ dependencies = [
[[package]]
name = "mullvad-setup"
-version = "2020.4.0-beta3"
+version = "2020.4.0-beta4"
dependencies = [
"clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2785,7 +2785,7 @@ dependencies = [
[[package]]
name = "talpid-openvpn-plugin"
-version = "2020.4.0-beta3"
+version = "2020.4.0-beta4"
dependencies = [
"env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"err-derive 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/android/build.gradle b/android/build.gradle
index d3eeab64d8..47ce428f2c 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -23,8 +23,8 @@ android {
applicationId "net.mullvad.mullvadvpn"
minSdkVersion 24
targetSdkVersion 28
- versionCode 20040003
- versionName "2020.4-beta3"
+ versionCode 20040004
+ versionName "2020.4-beta4"
}
if (keystorePropertiesFile.exists()) {
diff --git a/dist-assets/windows/version.h b/dist-assets/windows/version.h
index bbe1e612b1..9d2e099f16 100644
--- a/dist-assets/windows/version.h
+++ b/dist-assets/windows/version.h
@@ -1,4 +1,4 @@
#define MAJOR_VERSION 2020
#define MINOR_VERSION 4
#define PATCH_VERSION 0
-#define PRODUCT_VERSION "2020.4-beta3"
+#define PRODUCT_VERSION "2020.4-beta4"
diff --git a/gui/package-lock.json b/gui/package-lock.json
index 39498f6d79..c4553d49d7 100644
--- a/gui/package-lock.json
+++ b/gui/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "mullvad-vpn",
- "version": "2020.4.0-beta3",
+ "version": "2020.4.0-beta4",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/gui/package.json b/gui/package.json
index 0f43c8e144..5ec0624eff 100644
--- a/gui/package.json
+++ b/gui/package.json
@@ -1,6 +1,6 @@
{
"name": "mullvad-vpn",
- "version": "2020.4.0-beta3",
+ "version": "2020.4.0-beta4",
"productName": "Mullvad VPN",
"private": true,
"description": "Mullvad VPN client",
diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml
index 829c32d178..a245340629 100644
--- a/mullvad-cli/Cargo.toml
+++ b/mullvad-cli/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "mullvad-cli"
-version = "2020.4.0-beta3"
+version = "2020.4.0-beta4"
authors = ["Mullvad VPN"]
description = "Manage the Mullvad VPN daemon via a convenient CLI"
license = "GPL-3.0"
diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml
index e8fd7e31f3..82aeb39b66 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "mullvad-daemon"
-version = "2020.4.0-beta3"
+version = "2020.4.0-beta4"
authors = ["Mullvad VPN"]
description = "Mullvad VPN daemon. Runs and controls the VPN tunnels"
license = "GPL-3.0"
diff --git a/mullvad-problem-report/Cargo.toml b/mullvad-problem-report/Cargo.toml
index c013c3058f..6c18485e5a 100644
--- a/mullvad-problem-report/Cargo.toml
+++ b/mullvad-problem-report/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "mullvad-problem-report"
-version = "2020.4.0-beta3"
+version = "2020.4.0-beta4"
authors = ["Mullvad VPN"]
description = "Collect Mullvad VPN logs into a report and send it to support"
license = "GPL-3.0"
diff --git a/mullvad-setup/Cargo.toml b/mullvad-setup/Cargo.toml
index 082fddf057..5fd94b11a3 100644
--- a/mullvad-setup/Cargo.toml
+++ b/mullvad-setup/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "mullvad-setup"
-version = "2020.4.0-beta3"
+version = "2020.4.0-beta4"
authors = ["Mullvad VPN"]
description = "Tool used to manage daemon setup"
license = "GPL-3.0"
diff --git a/talpid-openvpn-plugin/Cargo.toml b/talpid-openvpn-plugin/Cargo.toml
index 39bf0fecb3..2712d6dfda 100644
--- a/talpid-openvpn-plugin/Cargo.toml
+++ b/talpid-openvpn-plugin/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "talpid-openvpn-plugin"
-version = "2020.4.0-beta3"
+version = "2020.4.0-beta4"
authors = ["Mullvad VPN"]
description = "OpenVPN shared library plugin for relaying OpenVPN events to talpid_core"
license = "GPL-3.0"