Compare commits

...

4 Commits

Author SHA1 Message Date
Elias Nahum
f337b3690e Bump app version number to 1.31.2 (#4361) 2020-05-27 15:46:24 -04:00
Elias Nahum
700b3d1a2f Bump app build number to 296 (#4360) 2020-05-27 15:39:26 -04:00
Mattermost Build
0618ad432b Bump upload timeout to 1 min (#4358)
Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
2020-05-27 13:02:26 -04:00
Mattermost Build
680ead2f57 Invalidate versions for iOS (#4355)
Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
2020-05-27 12:44:07 -04:00
9 changed files with 18 additions and 14 deletions

View File

@@ -130,8 +130,8 @@ android {
applicationId "com.mattermost.rnbeta"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 295
versionName "1.31.1"
versionCode 296
versionName "1.31.2"
multiDexEnabled = true
ndk {
abiFilters 'armeabi-v7a','arm64-v8a','x86','x86_64'

View File

@@ -153,7 +153,7 @@ export default class FileUploadItem extends PureComponent {
const certificate = await mattermostBucket.getPreference('cert');
const options = {
timeout: 10000,
timeout: 60000,
certificate,
};
this.uploadPromise = RNFetchBlob.config(options).fetch('POST', Client4.getFilesRoute(), headers, data);

View File

@@ -1,7 +1,7 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
import {Alert} from 'react-native';
import {Alert, Platform} from 'react-native';
import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
import {Posts} from '@mm-redux/constants';
@@ -86,6 +86,10 @@ export function isPendingPost(postId, userId) {
}
export function validatePreviousVersion(previousVersion) {
if (Platform.OS === 'ios') {
INVALID_VERSIONS.push('1.31.0', '1.31.1');
}
if (!previousVersion || INVALID_VERSIONS.includes(previousVersion)) {
return false;
}

View File

@@ -926,7 +926,7 @@
CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 295;
CURRENT_PROJECT_VERSION = 296;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = UQ8HT4Q2XM;
ENABLE_BITCODE = NO;
@@ -964,7 +964,7 @@
CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 295;
CURRENT_PROJECT_VERSION = 296;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = UQ8HT4Q2XM;
ENABLE_BITCODE = NO;

View File

@@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.31.1</string>
<string>1.31.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@@ -34,7 +34,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>295</string>
<string>296</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>

View File

@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>1.31.1</string>
<string>1.31.2</string>
<key>CFBundleVersion</key>
<string>295</string>
<string>296</string>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>

View File

@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>1.31.1</string>
<string>1.31.2</string>
<key>CFBundleVersion</key>
<string>295</string>
<string>296</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "mattermost-mobile",
"version": "1.31.1",
"version": "1.31.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@@ -1,6 +1,6 @@
{
"name": "mattermost-mobile",
"version": "1.31.1",
"version": "1.31.2",
"description": "Mattermost Mobile with React Native",
"repository": "git@github.com:mattermost/mattermost-mobile.git",
"author": "Mattermost, Inc.",