toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into mark-as-unread

Browse source
This commit is contained in:
Harrison Healey 2019-10-21 13:36:20 -04:00
commit fe5e414546
7 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/app/build.gradle
View file

@ -123,8 +123,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
missingDimensionStrategy "RNN.reactNativeVersion", "reactNative57_5"
versionCode 239
versionName "1.24.0"
versionCode 240
versionName "1.25.0"
multiDexEnabled = true
ndk {
abiFilters 'armeabi-v7a','arm64-v8a','x86','x86_64'

4
ios/Mattermost.xcodeproj/project.pbxproj
View file

@ -2856,7 +2856,7 @@
CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 239;
CURRENT_PROJECT_VERSION = 240;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = UQ8HT4Q2XM;
ENABLE_BITCODE = NO;
@ -2917,7 +2917,7 @@
CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 239;
CURRENT_PROJECT_VERSION = 240;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = UQ8HT4Q2XM;
ENABLE_BITCODE = NO;

4
ios/Mattermost/Info.plist
View file

@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.24.0</string>
<string>1.25.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@ -34,7 +34,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>239</string>
<string>240</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>

4
ios/MattermostShare/Info.plist
View file

@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>1.24.0</string>
<string>1.25.0</string>
<key>CFBundleVersion</key>
<string>239</string>
<string>240</string>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>

4
ios/MattermostTests/Info.plist
View file

@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.24.0</string>
<string>1.25.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>239</string>
<string>240</string>
</dict>
</plist>

4
ios/NotificationService/Info.plist
View file

@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>1.24.0</string>
<string>1.25.0</string>
<key>CFBundleVersion</key>
<string>239</string>
<string>240</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>

4
package.json
View file

@ -1,6 +1,6 @@
{
"name": "mattermost-mobile",
"version": "1.23.0",
"version": "1.25.0",
"description": "Mattermost Mobile with React Native",
"repository": "git@github.com:mattermost/mattermost-mobile.git",
"author": "Mattermost, Inc.",
@ -152,4 +152,4 @@
"node_modules/(?!react-native|jail-monkey)"
]
}
}
}