summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2020-10-20 11:19:20 +0200
committerLinus Färnstrand <linus@mullvad.net>2020-10-20 13:18:48 +0200
commit9ea7649572b7c70bfb466fd497106bb38b00055a (patch)
tree24a328e0771066d1eb0c49d1f4971ab3de78c4ae
parentd893c8e8e9ad7c82afd7668935b7f3697e56ecab (diff)
downloadmullvadvpn-9ea7649572b7c70bfb466fd497106bb38b00055a.tar.xz
mullvadvpn-9ea7649572b7c70bfb466fd497106bb38b00055a.zip
Updating version in package files
-rw-r--r--Cargo.lock12
-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-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, 17 insertions, 17 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 5ac9b8e35c..47780e42b5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1232,7 +1232,7 @@ dependencies = [
[[package]]
name = "mullvad-cli"
-version = "2020.6.0-beta3"
+version = "2020.6.0"
dependencies = [
"base64",
"chrono",
@@ -1253,7 +1253,7 @@ dependencies = [
[[package]]
name = "mullvad-daemon"
-version = "2020.6.0-beta3"
+version = "2020.6.0"
dependencies = [
"android_logger",
"cfg-if 1.0.0",
@@ -1293,7 +1293,7 @@ dependencies = [
[[package]]
name = "mullvad-exclude"
-version = "2020.6.0-beta3"
+version = "2020.6.0"
dependencies = [
"err-derive",
"nix 0.18.0",
@@ -1352,7 +1352,7 @@ dependencies = [
[[package]]
name = "mullvad-problem-report"
-version = "2020.6.0-beta3"
+version = "2020.6.0"
dependencies = [
"clap",
"dirs",
@@ -1398,7 +1398,7 @@ dependencies = [
[[package]]
name = "mullvad-setup"
-version = "2020.6.0-beta3"
+version = "2020.6.0"
dependencies = [
"clap",
"env_logger",
@@ -2600,7 +2600,7 @@ dependencies = [
[[package]]
name = "talpid-openvpn-plugin"
-version = "2020.6.0-beta3"
+version = "2020.6.0"
dependencies = [
"env_logger",
"err-derive",
diff --git a/android/build.gradle b/android/build.gradle
index 775c5eaeba..2b418455d1 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,8 +21,8 @@ android {
applicationId "net.mullvad.mullvadvpn"
minSdkVersion 24
targetSdkVersion 29
- versionCode 20060003
- versionName "2020.6-beta3"
+ versionCode 20060099
+ versionName "2020.6"
}
if (keystorePropertiesFile.exists()) {
diff --git a/dist-assets/windows/version.h b/dist-assets/windows/version.h
index 5f47c57772..dd3b2d16c4 100644
--- a/dist-assets/windows/version.h
+++ b/dist-assets/windows/version.h
@@ -1,4 +1,4 @@
#define MAJOR_VERSION 2020
#define MINOR_VERSION 6
#define PATCH_VERSION 0
-#define PRODUCT_VERSION "2020.6-beta3"
+#define PRODUCT_VERSION "2020.6"
diff --git a/gui/package-lock.json b/gui/package-lock.json
index 670cede96c..fb04578764 100644
--- a/gui/package-lock.json
+++ b/gui/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "mullvad-vpn",
- "version": "2020.6.0-beta3",
+ "version": "2020.6.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/gui/package.json b/gui/package.json
index 660efb8cd7..7bef24afb9 100644
--- a/gui/package.json
+++ b/gui/package.json
@@ -1,6 +1,6 @@
{
"name": "mullvad-vpn",
- "version": "2020.6.0-beta3",
+ "version": "2020.6.0",
"productName": "Mullvad VPN",
"private": true,
"description": "Mullvad VPN client",
diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml
index 365c5f14b4..9153b3cb6a 100644
--- a/mullvad-cli/Cargo.toml
+++ b/mullvad-cli/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "mullvad-cli"
-version = "2020.6.0-beta3"
+version = "2020.6.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 350bdfde90..ef23c95b29 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "mullvad-daemon"
-version = "2020.6.0-beta3"
+version = "2020.6.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 4946642063..413eb2ca94 100644
--- a/mullvad-exclude/Cargo.toml
+++ b/mullvad-exclude/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "mullvad-exclude"
-version = "2020.6.0-beta3"
+version = "2020.6.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 9b32d40ba9..ccbc6cf09b 100644
--- a/mullvad-problem-report/Cargo.toml
+++ b/mullvad-problem-report/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "mullvad-problem-report"
-version = "2020.6.0-beta3"
+version = "2020.6.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 8802c40085..4f20ded3df 100644
--- a/mullvad-setup/Cargo.toml
+++ b/mullvad-setup/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "mullvad-setup"
-version = "2020.6.0-beta3"
+version = "2020.6.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 16767fc001..82bf12d728 100644
--- a/talpid-openvpn-plugin/Cargo.toml
+++ b/talpid-openvpn-plugin/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "talpid-openvpn-plugin"
-version = "2020.6.0-beta3"
+version = "2020.6.0"
authors = ["Mullvad VPN"]
description = "OpenVPN shared library plugin for relaying OpenVPN events to talpid_core"
license = "GPL-3.0"