summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2021-02-18 09:19:47 +0100
committerLinus Färnstrand <linus@mullvad.net>2021-02-18 09:19:56 +0100
commita3d4e3e365b299ed9f392ddb07015c9e79072e5f (patch)
tree9dcfa32e6f5227879a12f545a5e9bcd953d52923
parent900bb3d034e5751542f675050f36691c0e01f9af (diff)
downloadmullvadvpn-a3d4e3e365b299ed9f392ddb07015c9e79072e5f.tar.xz
mullvadvpn-a3d4e3e365b299ed9f392ddb07015c9e79072e5f.zip
Bump version to 2021.2-beta1
-rw-r--r--Cargo.lock12
-rw-r--r--android/build.gradle4
-rw-r--r--dist-assets/windows/version.h4
-rw-r--r--gui/package-lock.json4
-rw-r--r--gui/package.json5
-rw-r--r--mullvad-cli/Cargo.toml2
-rw-r--r--mullvad-daemon/Cargo.toml2
-rw-r--r--mullvad-exclude/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
11 files changed, 21 insertions, 20 deletions
diff --git a/Cargo.lock b/Cargo.lock
index aec551d796..edd4ab9cfc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1245,7 +1245,7 @@ dependencies = [
[[package]]
name = "mullvad-cli"
-version = "2021.1.0"
+version = "2021.2.0-beta1"
dependencies = [
"base64 0.13.0",
"chrono",
@@ -1266,7 +1266,7 @@ dependencies = [
[[package]]
name = "mullvad-daemon"
-version = "2021.1.0"
+version = "2021.2.0-beta1"
dependencies = [
"android_logger",
"cfg-if 1.0.0",
@@ -1307,7 +1307,7 @@ dependencies = [
[[package]]
name = "mullvad-exclude"
-version = "2021.1.0"
+version = "2021.2.0-beta1"
dependencies = [
"err-derive 0.3.0",
"nix 0.19.1",
@@ -1365,7 +1365,7 @@ dependencies = [
[[package]]
name = "mullvad-problem-report"
-version = "2021.1.0"
+version = "2021.2.0-beta1"
dependencies = [
"clap",
"dirs-next",
@@ -1414,7 +1414,7 @@ dependencies = [
[[package]]
name = "mullvad-setup"
-version = "2021.1.0"
+version = "2021.2.0-beta1"
dependencies = [
"clap",
"env_logger 0.8.2",
@@ -2693,7 +2693,7 @@ dependencies = [
[[package]]
name = "talpid-openvpn-plugin"
-version = "2021.1.0"
+version = "2021.2.0-beta1"
dependencies = [
"env_logger 0.8.2",
"err-derive 0.3.0",
diff --git a/android/build.gradle b/android/build.gradle
index 6271a20bef..38a1f53359 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -22,8 +22,8 @@ android {
applicationId "net.mullvad.mullvadvpn"
minSdkVersion 24
targetSdkVersion 30
- versionCode 21010099
- versionName "2021.1"
+ versionCode 21020001
+ versionName "2021.2-beta1"
}
if (keystorePropertiesFile.exists()) {
diff --git a/dist-assets/windows/version.h b/dist-assets/windows/version.h
index e47a969523..fa13c0c0f3 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 MINOR_VERSION 2
#define PATCH_VERSION 0
-#define PRODUCT_VERSION "2021.1"
+#define PRODUCT_VERSION "2021.2-beta1"
diff --git a/gui/package-lock.json b/gui/package-lock.json
index bfce9e27a2..3e42b5e480 100644
--- a/gui/package-lock.json
+++ b/gui/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "mullvad-vpn",
- "version": "2021.1.0",
+ "version": "2021.2.0-beta1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "mullvad-vpn",
- "version": "2021.1.0",
+ "version": "2021.2.0-beta1",
"hasInstallScript": true,
"license": "GPL-3.0",
"dependencies": {
diff --git a/gui/package.json b/gui/package.json
index 519bbee336..e9a6c546e8 100644
--- a/gui/package.json
+++ b/gui/package.json
@@ -1,6 +1,6 @@
{
"name": "mullvad-vpn",
- "version": "2021.1.0",
+ "version": "2021.2.0-beta1",
"productName": "Mullvad VPN",
"private": true,
"description": "Mullvad VPN client",
@@ -29,7 +29,8 @@
"redux": "^4.0.5",
"sprintf-js": "^1.1.2",
"styled-components": "^5.1.1",
- "uuid": "^3.0.1"
+ "uuid": "^3.0.1",
+ "nseventmonitor": "^1.0.0"
},
"optionalDependencies": {
"nseventmonitor": "^1.0.0"
diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml
index 37e8df63da..0bf902f420 100644
--- a/mullvad-cli/Cargo.toml
+++ b/mullvad-cli/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "mullvad-cli"
-version = "2021.1.0"
+version = "2021.2.0-beta1"
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 f176a38434..b3b3d28353 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "mullvad-daemon"
-version = "2021.1.0"
+version = "2021.2.0-beta1"
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 b6d029fa6a..cfbd1f5cd5 100644
--- a/mullvad-exclude/Cargo.toml
+++ b/mullvad-exclude/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "mullvad-exclude"
-version = "2021.1.0"
+version = "2021.2.0-beta1"
authors = ["Mullvad VPN"]
license = "GPL-3.0"
edition = "2018"
diff --git a/mullvad-problem-report/Cargo.toml b/mullvad-problem-report/Cargo.toml
index c8769652bf..d43ebee50a 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"
+version = "2021.2.0-beta1"
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 6b63801a3b..645481bf3e 100644
--- a/mullvad-setup/Cargo.toml
+++ b/mullvad-setup/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "mullvad-setup"
-version = "2021.1.0"
+version = "2021.2.0-beta1"
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 6914de4fe0..a118fab73a 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"
+version = "2021.2.0-beta1"
authors = ["Mullvad VPN"]
description = "OpenVPN shared library plugin for relaying OpenVPN events to talpid_core"
license = "GPL-3.0"