summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2020-08-20 15:21:55 +0200
committerLinus Färnstrand <linus@mullvad.net>2020-08-20 15:26:05 +0200
commit7919516166c4991541408b7ddadb80fc74e6569b (patch)
tree50d6c90dc45b94b08867d2d2f991eb960c4a5fc1
parent97ceaa3ed6b4dbe0a889b7fa79753074f95c0eb3 (diff)
downloadmullvadvpn-7919516166c4991541408b7ddadb80fc74e6569b.tar.xz
mullvadvpn-7919516166c4991541408b7ddadb80fc74e6569b.zip
Updating version in package files
-rw-r--r--Cargo.lock14
-rw-r--r--android/build.gradle4
-rw-r--r--dist-assets/windows/version.h4
-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, 18 insertions, 18 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 1f78c3f373..aa6beb92aa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1180,7 +1180,7 @@ dependencies = [
[[package]]
name = "mullvad-cli"
-version = "2020.5.0"
+version = "2020.6.0-beta1"
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)",
@@ -1202,7 +1202,7 @@ dependencies = [
[[package]]
name = "mullvad-daemon"
-version = "2020.5.0"
+version = "2020.6.0-beta1"
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)",
@@ -1267,9 +1267,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.5.0",
+ "mullvad-daemon 2020.6.0-beta1",
"mullvad-paths 0.1.0",
- "mullvad-problem-report 2020.5.0",
+ "mullvad-problem-report 2020.6.0-beta1",
"mullvad-rpc 0.1.0",
"mullvad-types 0.1.0",
"nix 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1307,7 +1307,7 @@ dependencies = [
[[package]]
name = "mullvad-problem-report"
-version = "2020.5.0"
+version = "2020.6.0-beta1"
dependencies = [
"clap 2.33.3 (registry+https://github.com/rust-lang/crates.io-index)",
"dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1355,7 +1355,7 @@ dependencies = [
[[package]]
name = "mullvad-setup"
-version = "2020.5.0"
+version = "2020.6.0-beta1"
dependencies = [
"clap 2.33.3 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2611,7 +2611,7 @@ dependencies = [
[[package]]
name = "talpid-openvpn-plugin"
-version = "2020.5.0"
+version = "2020.6.0-beta1"
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 3ec109fbeb..607dc2f01c 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,8 +21,8 @@ android {
applicationId "net.mullvad.mullvadvpn"
minSdkVersion 24
targetSdkVersion 28
- versionCode 20050099
- versionName "2020.5"
+ versionCode 20060001
+ versionName "2020.6-beta1"
}
if (keystorePropertiesFile.exists()) {
diff --git a/dist-assets/windows/version.h b/dist-assets/windows/version.h
index 4e7a32578e..c382954ce6 100644
--- a/dist-assets/windows/version.h
+++ b/dist-assets/windows/version.h
@@ -1,4 +1,4 @@
#define MAJOR_VERSION 2020
-#define MINOR_VERSION 5
+#define MINOR_VERSION 6
#define PATCH_VERSION 0
-#define PRODUCT_VERSION "2020.5"
+#define PRODUCT_VERSION "2020.6-beta1"
diff --git a/gui/package-lock.json b/gui/package-lock.json
index 57840f46f4..aaffe0d2b0 100644
--- a/gui/package-lock.json
+++ b/gui/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "mullvad-vpn",
- "version": "2020.5.0",
+ "version": "2020.6.0-beta1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/gui/package.json b/gui/package.json
index 927db17ba9..68aae86602 100644
--- a/gui/package.json
+++ b/gui/package.json
@@ -1,6 +1,6 @@
{
"name": "mullvad-vpn",
- "version": "2020.5.0",
+ "version": "2020.6.0-beta1",
"productName": "Mullvad VPN",
"private": true,
"description": "Mullvad VPN client",
diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml
index 1746993bff..9883f34bba 100644
--- a/mullvad-cli/Cargo.toml
+++ b/mullvad-cli/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "mullvad-cli"
-version = "2020.5.0"
+version = "2020.6.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 f752b677a3..8aa84715f1 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "mullvad-daemon"
-version = "2020.5.0"
+version = "2020.6.0-beta1"
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 a69246cdcb..1353053ff2 100644
--- a/mullvad-problem-report/Cargo.toml
+++ b/mullvad-problem-report/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "mullvad-problem-report"
-version = "2020.5.0"
+version = "2020.6.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 04da0d49ca..05719d85ab 100644
--- a/mullvad-setup/Cargo.toml
+++ b/mullvad-setup/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "mullvad-setup"
-version = "2020.5.0"
+version = "2020.6.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 c81550fd25..7b619e4220 100644
--- a/talpid-openvpn-plugin/Cargo.toml
+++ b/talpid-openvpn-plugin/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "talpid-openvpn-plugin"
-version = "2020.5.0"
+version = "2020.6.0-beta1"
authors = ["Mullvad VPN"]
description = "OpenVPN shared library plugin for relaying OpenVPN events to talpid_core"
license = "GPL-3.0"