From fbf6d44d5e57553e9ad0c652e302a0e44d91cc32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20F=C3=A4rnstrand?= Date: Tue, 12 May 2020 09:56:23 +0200 Subject: [PATCH] Updating version in package files --- Cargo.lock | 14 +++++++------- android/build.gradle | 4 ++-- dist-assets/windows/version.h | 2 +- gui/package-lock.json | 2 +- gui/package.json | 2 +- mullvad-cli/Cargo.toml | 2 +- mullvad-daemon/Cargo.toml | 2 +- mullvad-problem-report/Cargo.toml | 2 +- mullvad-setup/Cargo.toml | 2 +- talpid-openvpn-plugin/Cargo.toml | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 40d529824bd9..2a7331c39e1b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1344,7 +1344,7 @@ dependencies = [ [[package]] name = "mullvad-cli" -version = "2020.4.0-beta4" +version = "2020.4.0" 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-beta4" +version = "2020.4.0" 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-beta4", + "mullvad-daemon 2020.4.0", "mullvad-paths 0.1.0", - "mullvad-problem-report 2020.4.0-beta4", + "mullvad-problem-report 2020.4.0", "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-beta4" +version = "2020.4.0" 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-beta4" +version = "2020.4.0" 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-beta4" +version = "2020.4.0" 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 cb45e9257b58..1b6402418e90 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -23,8 +23,8 @@ android { applicationId "net.mullvad.mullvadvpn" minSdkVersion 19 targetSdkVersion 28 - versionCode 20040004 - versionName "2020.4-beta4" + versionCode 20040099 + versionName "2020.4" } if (keystorePropertiesFile.exists()) { diff --git a/dist-assets/windows/version.h b/dist-assets/windows/version.h index 9d2e099f168a..60c947bd567a 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-beta4" +#define PRODUCT_VERSION "2020.4" diff --git a/gui/package-lock.json b/gui/package-lock.json index 60dd78a2a9c3..d1549d018856 100644 --- a/gui/package-lock.json +++ b/gui/package-lock.json @@ -1,6 +1,6 @@ { "name": "mullvad-vpn", - "version": "2020.4.0-beta4", + "version": "2020.4.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/gui/package.json b/gui/package.json index 273ca7771037..3a6db6e0c3bf 100644 --- a/gui/package.json +++ b/gui/package.json @@ -1,6 +1,6 @@ { "name": "mullvad-vpn", - "version": "2020.4.0-beta4", + "version": "2020.4.0", "productName": "Mullvad VPN", "private": true, "description": "Mullvad VPN client", diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml index a245340629f6..e2ce7fbc5016 100644 --- a/mullvad-cli/Cargo.toml +++ b/mullvad-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mullvad-cli" -version = "2020.4.0-beta4" +version = "2020.4.0" 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 82aeb39b664e..de7d46aaaed4 100644 --- a/mullvad-daemon/Cargo.toml +++ b/mullvad-daemon/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mullvad-daemon" -version = "2020.4.0-beta4" +version = "2020.4.0" 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 6c18485e5ac9..4c2997824fa4 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-beta4" +version = "2020.4.0" 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 5fd94b11a3fb..8998ea24821c 100644 --- a/mullvad-setup/Cargo.toml +++ b/mullvad-setup/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mullvad-setup" -version = "2020.4.0-beta4" +version = "2020.4.0" 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 2712d6dfda84..7e94eb8bf4fc 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-beta4" +version = "2020.4.0" authors = ["Mullvad VPN"] description = "OpenVPN shared library plugin for relaying OpenVPN events to talpid_core" license = "GPL-3.0"