From 5fb93907595f83b73f0a66a22ec4de751af295ba Mon Sep 17 00:00:00 2001 From: enahum Date: Tue, 14 Nov 2017 11:06:18 -0300 Subject: [PATCH] IOS Version Bump to 64 (#1142) * Update Mattermost redux (#1086) * Fix middleware * Upgrade mattermost-redux * another middleware fix * Bump app version to 1.4.1 * Version Bump to 64 --- android/app/build.gradle | 2 +- app/store/middleware.js | 1 - ios/Mattermost.xcodeproj/project.pbxproj | 4 ++-- ios/Mattermost/Info.plist | 4 ++-- ios/MattermostTests/Info.plist | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 0830f2317..532b80d67 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -107,7 +107,7 @@ android { minSdkVersion 21 targetSdkVersion 23 versionCode 63 - versionName "1.4.0" + versionName "1.4.1" multiDexEnabled true ndk { abiFilters "armeabi-v7a", "x86" diff --git a/app/store/middleware.js b/app/store/middleware.js index 42db91216..bc6a8aac7 100644 --- a/app/store/middleware.js +++ b/app/store/middleware.js @@ -23,7 +23,6 @@ export function messageRetention() { // Keep only the last 60 messages for the last 5 viewed channels in each team // and apply data retention on those posts if applies - return next(cleanupState(action)); } else if (action.type === ViewTypes.DATA_CLEANUP) { const nextAction = cleanupState(action, true); diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj index 8e4edb450..e78b56dfa 100644 --- a/ios/Mattermost.xcodeproj/project.pbxproj +++ b/ios/Mattermost.xcodeproj/project.pbxproj @@ -1954,7 +1954,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 63; + CURRENT_PROJECT_VERSION = 64; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = UQ8HT4Q2XM; ENABLE_BITCODE = NO; @@ -2001,7 +2001,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 63; + CURRENT_PROJECT_VERSION = 64; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = UQ8HT4Q2XM; ENABLE_BITCODE = NO; diff --git a/ios/Mattermost/Info.plist b/ios/Mattermost/Info.plist index 4eace5c55..626d2b687 100644 --- a/ios/Mattermost/Info.plist +++ b/ios/Mattermost/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.4.0 + 1.4.1 CFBundleSignature ???? CFBundleURLTypes @@ -32,7 +32,7 @@ CFBundleVersion - 63 + 64 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ios/MattermostTests/Info.plist b/ios/MattermostTests/Info.plist index b2468887c..6d1dfa508 100644 --- a/ios/MattermostTests/Info.plist +++ b/ios/MattermostTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 63 + 64