From b78c08a30a8977ba93762d636387803e0b99b9c0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 16 Jul 2018 22:43:44 +0300
Subject: [PATCH] Bump version to 1.3.13.
---
Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
Telegram/Resources/winrc/Telegram.rc | 8 ++++----
Telegram/Resources/winrc/Updater.rc | 8 ++++----
Telegram/SourceFiles/core/version.h | 6 +++---
Telegram/SourceFiles/storage/serialize_common.cpp | 6 +-----
Telegram/SourceFiles/storage/serialize_document.cpp | 6 +-----
Telegram/build/version | 8 ++++----
7 files changed, 18 insertions(+), 26 deletions(-)
diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 91bbeceaa..a8513ecb2 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -9,7 +9,7 @@
<Identity Name="TelegramMessengerLLP.TelegramDesktop"
ProcessorArchitecture="ARCHITECTURE"
Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
- Version="1.3.12.0" />
+ Version="1.3.13.0" />
<Properties>
<DisplayName>Telegram Desktop</DisplayName>
<PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 0f91d5efd..57cb8b054 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,12,0
- PRODUCTVERSION 1,3,12,0
+ FILEVERSION 1,3,13,0
+ PRODUCTVERSION 1,3,13,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -52,10 +52,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileDescription", "Telegram Desktop"
- VALUE "FileVersion", "1.3.12.0"
+ VALUE "FileVersion", "1.3.13.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2018"
VALUE "ProductName", "Telegram Desktop"
- VALUE "ProductVersion", "1.3.12.0"
+ VALUE "ProductVersion", "1.3.13.0"
END
END
BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index c4982ad41..8aa8eb085 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,12,0
- PRODUCTVERSION 1,3,12,0
+ FILEVERSION 1,3,13,0
+ PRODUCTVERSION 1,3,13,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -43,10 +43,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileDescription", "Telegram Desktop Updater"
- VALUE "FileVersion", "1.3.12.0"
+ VALUE "FileVersion", "1.3.13.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2018"
VALUE "ProductName", "Telegram Desktop"
- VALUE "ProductVersion", "1.3.12.0"
+ VALUE "ProductVersion", "1.3.13.0"
END
END
BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 52e623a1e..380713ef6 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#define BETA_VERSION_MACRO (0ULL)
-constexpr int AppVersion = 1003012;
-constexpr str_const AppVersionStr = "1.3.12";
-constexpr bool AppAlphaVersion = true;
+constexpr int AppVersion = 1003013;
+constexpr str_const AppVersionStr = "1.3.13";
+constexpr bool AppAlphaVersion = false;
constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO;
diff --git a/Telegram/SourceFiles/storage/serialize_common.cpp b/Telegram/SourceFiles/storage/serialize_common.cpp
index fad0feb02..6f4a834b7 100644
--- a/Telegram/SourceFiles/storage/serialize_common.cpp
+++ b/Telegram/SourceFiles/storage/serialize_common.cpp
@@ -29,11 +29,7 @@ StorageImageLocation readStorageImageLocation(
quint64 volume, secret;
QByteArray fileReference;
stream >> width >> height >> dc >> volume >> local >> secret;
-#ifdef _DEBUG
- if (streamAppVersion >= 1003013 || true) { // #TODO testing
-#else
-#error "test"
-#endif
+ if (streamAppVersion >= 1003013) {
stream >> fileReference;
}
return StorageImageLocation(
diff --git a/Telegram/SourceFiles/storage/serialize_document.cpp b/Telegram/SourceFiles/storage/serialize_document.cpp
index b00838bef..c73747b4d 100644
--- a/Telegram/SourceFiles/storage/serialize_document.cpp
+++ b/Telegram/SourceFiles/storage/serialize_document.cpp
@@ -59,11 +59,7 @@ DocumentData *Document::readFromStreamHelper(int streamAppVersion, QDataStream &
QByteArray fileReference;
stream >> id >> access >> date;
if (streamAppVersion >= 9061) {
-#ifdef _DEBUG
- if (streamAppVersion >= 1003013 || true) { // #TODO testing
-#else
-#error "test"
-#endif
+ if (streamAppVersion >= 1003013) {
stream >> fileReference;
}
stream >> version;
diff --git a/Telegram/build/version b/Telegram/build/version
index b2108e053..d9adfc4f4 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,6 +1,6 @@
-AppVersion 1003012
+AppVersion 1003013
AppVersionStrMajor 1.3
-AppVersionStrSmall 1.3.12
-AppVersionStr 1.3.12
-AlphaChannel 1
+AppVersionStrSmall 1.3.13
+AppVersionStr 1.3.13
+AlphaChannel 0
BetaVersion 0