From 4f3545e1a7c2346cb0e4ede6ef5fc4f988b48d1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20F=C3=A4rnstrand?= Date: Wed, 10 Feb 2021 10:27:47 +0100 Subject: [PATCH] Updating version in package files --- Cargo.lock | 12 ++++++------ android/build.gradle | 4 ++-- dist-assets/windows/version.h | 2 +- gui/package-lock.json | 2 +- gui/package.json | 5 +++-- mullvad-cli/Cargo.toml | 2 +- mullvad-daemon/Cargo.toml | 2 +- mullvad-exclude/Cargo.toml | 2 +- mullvad-problem-report/Cargo.toml | 2 +- mullvad-setup/Cargo.toml | 2 +- talpid-openvpn-plugin/Cargo.toml | 2 +- 11 files changed, 19 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fb45d1a7034f..40debeaf729b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1203,7 +1203,7 @@ dependencies = [ [[package]] name = "mullvad-cli" -version = "2021.1.0-beta2" +version = "2021.1.0" dependencies = [ "base64", "chrono", @@ -1224,7 +1224,7 @@ dependencies = [ [[package]] name = "mullvad-daemon" -version = "2021.1.0-beta2" +version = "2021.1.0" dependencies = [ "android_logger", "cfg-if 1.0.0", @@ -1265,7 +1265,7 @@ dependencies = [ [[package]] name = "mullvad-exclude" -version = "2021.1.0-beta2" +version = "2021.1.0" dependencies = [ "err-derive", "nix 0.19.0", @@ -1323,7 +1323,7 @@ dependencies = [ [[package]] name = "mullvad-problem-report" -version = "2021.1.0-beta2" +version = "2021.1.0" dependencies = [ "clap", "dirs-next", @@ -1370,7 +1370,7 @@ dependencies = [ [[package]] name = "mullvad-setup" -version = "2021.1.0-beta2" +version = "2021.1.0" dependencies = [ "clap", "env_logger", @@ -2585,7 +2585,7 @@ dependencies = [ [[package]] name = "talpid-openvpn-plugin" -version = "2021.1.0-beta2" +version = "2021.1.0" dependencies = [ "env_logger", "err-derive", diff --git a/android/build.gradle b/android/build.gradle index b1dc6cdd7ebf..dc6a7252069a 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "net.mullvad.mullvadvpn" minSdkVersion 24 targetSdkVersion 29 - versionCode 21010002 - versionName "2021.1-beta2" + versionCode 21010099 + versionName "2021.1" } if (keystorePropertiesFile.exists()) { diff --git a/dist-assets/windows/version.h b/dist-assets/windows/version.h index 495190bc86f3..e47a96952363 100644 --- a/dist-assets/windows/version.h +++ b/dist-assets/windows/version.h @@ -1,4 +1,4 @@ #define MAJOR_VERSION 2021 #define MINOR_VERSION 1 #define PATCH_VERSION 0 -#define PRODUCT_VERSION "2021.1-beta2" +#define PRODUCT_VERSION "2021.1" diff --git a/gui/package-lock.json b/gui/package-lock.json index 3949f09648d4..1c5cac8dae9f 100644 --- a/gui/package-lock.json +++ b/gui/package-lock.json @@ -1,6 +1,6 @@ { "name": "mullvad-vpn", - "version": "2021.1.0-beta2", + "version": "2021.1.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/gui/package.json b/gui/package.json index 78082e5f3180..55e4e9a9bc52 100644 --- a/gui/package.json +++ b/gui/package.json @@ -1,6 +1,6 @@ { "name": "mullvad-vpn", - "version": "2021.1.0-beta2", + "version": "2021.1.0", "productName": "Mullvad VPN", "private": true, "description": "Mullvad VPN client", @@ -30,7 +30,8 @@ "redux": "^4.0.5", "sprintf-js": "^1.1.2", "styled-components": "^5.1.1", - "uuid": "^3.0.1" + "uuid": "^3.0.1", + "nseventmonitor": "^0.0.19" }, "optionalDependencies": { "nseventmonitor": "^0.0.19" diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml index e0ee8f2f46a9..4811e2c5d982 100644 --- a/mullvad-cli/Cargo.toml +++ b/mullvad-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mullvad-cli" -version = "2021.1.0-beta2" +version = "2021.1.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 dca5cb288c88..7039b77a80d4 100644 --- a/mullvad-daemon/Cargo.toml +++ b/mullvad-daemon/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mullvad-daemon" -version = "2021.1.0-beta2" +version = "2021.1.0" authors = ["Mullvad VPN"] description = "Mullvad VPN daemon. Runs and controls the VPN tunnels" license = "GPL-3.0" diff --git a/mullvad-exclude/Cargo.toml b/mullvad-exclude/Cargo.toml index d90ab85aea5a..dd4e0bbbdebd 100644 --- a/mullvad-exclude/Cargo.toml +++ b/mullvad-exclude/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mullvad-exclude" -version = "2021.1.0-beta2" +version = "2021.1.0" authors = ["Mullvad VPN"] license = "GPL-3.0" edition = "2018" diff --git a/mullvad-problem-report/Cargo.toml b/mullvad-problem-report/Cargo.toml index 14f9de4cce4a..4b1f37694716 100644 --- a/mullvad-problem-report/Cargo.toml +++ b/mullvad-problem-report/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mullvad-problem-report" -version = "2021.1.0-beta2" +version = "2021.1.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 33daa1e55a81..ac04196f955b 100644 --- a/mullvad-setup/Cargo.toml +++ b/mullvad-setup/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mullvad-setup" -version = "2021.1.0-beta2" +version = "2021.1.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 1e5e6de5b8fe..cf42ca8ea2b9 100644 --- a/talpid-openvpn-plugin/Cargo.toml +++ b/talpid-openvpn-plugin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "talpid-openvpn-plugin" -version = "2021.1.0-beta2" +version = "2021.1.0" authors = ["Mullvad VPN"] description = "OpenVPN shared library plugin for relaying OpenVPN events to talpid_core" license = "GPL-3.0"