Merge branch 'v1' into release-1.55

Bump version to 1.55.1 build 423 (#6625 ) (#6626 )
* Bump app version number to 1.55.1 * Bump app build number to 423 (cherry picked from commit 149ebd6a15) Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
2023-01-03 15:20:31 +02:00 · 2022-09-07 09:21:25 -03:00 · 2022-09-01 08:21:38 -04:00 · 2022-09-01 08:20:52 -04:00 · 2022-08-11 09:06:35 -04:00 · 2022-08-04 16:59:35 -04:00
12 changed files with 24 additions and 24 deletions
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
-# Note: development on this repository has primarily moved to the `main` branch
-This `master`(now `v1`) branch is mostly in maintenance mode while we're working to getting our "v2" (code named "gekidou") to the GA stage. To contribute check out the [main](https://github.com/mattermost/mattermost-mobile/tree/main) branch in this repository.
+# Note: development on this repository has primarily moved to the `gekidou` branch
+This `master` branch is mostly in maintenance mode while we're working to getting our "v2" (code named "gekidou") to the GA stage. To contribute check out the [gekidou](https://github.com/mattermost/mattermost-mobile/tree/gekidou) branch in this repository.

 # Mattermost Mobile App
 [![Mattermost](https://user-images.githubusercontent.com/7205829/136108314-75cd2e1f-4147-4cfa-a16c-9b3b0313ea25.png)](https://mattermost.com)

- **Minimum Server versions:** Current ESR version (6.3.0)
+- **Minimum Server versions:** Current ESR version (7.1.0)
 - **Supported iOS versions:** 12.1+
 - **Supported Android versions:** 7.0+

--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -131,8 +131,8 @@ android {
        applicationId "com.mattermost.rnbeta"
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 436
-        versionName "1.56.0"
+        versionCode 423
+        versionName "1.55.1"
        multiDexEnabled = true
        testBuildType System.getProperty('testBuildType', 'debug')
        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
--- a/app/constants/calls.ts
+++ b/app/constants/calls.ts
@@ -4,9 +4,9 @@
 const RefreshConfigMillis = 20 * 60 * 1000; // Refresh config after 20 minutes

 const RequiredServer = {
-    FULL_VERSION: '6.3.0',
-    MAJOR_VERSION: 6,
-    MIN_VERSION: 3,
+    FULL_VERSION: '7.1.0',
+    MAJOR_VERSION: 7,
+    MIN_VERSION: 1,
    PATCH_VERSION: 0,
 };

--- a/app/constants/view.js
+++ b/app/constants/view.js
@@ -115,9 +115,9 @@ const ViewTypes = keyMirror({
 });

 const RequiredServer = {
-    FULL_VERSION: '5.37.0',
-    MAJOR_VERSION: 5,
-    MIN_VERSION: 37,
+    FULL_VERSION: '7.1.0',
+    MAJOR_VERSION: 7,
+    MIN_VERSION: 1,
    PATCH_VERSION: 0,
 };

--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -1,4 +1,4 @@
-Requires Mattermost Server v6.3.0+. Older servers may not be able to connect or have unexpected behavior.
+Requires Mattermost Server v7.1.0+. Older servers may not be able to connect or have unexpected behavior.

 -------

--- a/fastlane/metadata/changelog
+++ b/fastlane/metadata/changelog
@@ -1,4 +1,4 @@
-This version is compatible with Mattermost servers v6.3.0+.
+This version is compatible with Mattermost servers v7.1.0+.

 Please see [changelog](https://docs.mattermost.com/administration/mobile-changelog.html) for full release notes. If you're interested in helping beta test upcoming versions before they are released, please see our [documentation](https://github.com/mattermost/mattermost-mobile#testing).

--- a/ios/Mattermost.xcodeproj/project.pbxproj
+++ b/ios/Mattermost.xcodeproj/project.pbxproj
@@ -911,7 +911,7 @@
 				CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 436;
+				CURRENT_PROJECT_VERSION = 423;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = UQ8HT4Q2XM;
 				ENABLE_BITCODE = NO;
@@ -953,7 +953,7 @@
 				CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 436;
+				CURRENT_PROJECT_VERSION = 423;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = UQ8HT4Q2XM;
 				ENABLE_BITCODE = NO;
--- a/ios/Mattermost/Info.plist
+++ b/ios/Mattermost/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.56.0</string>
+	<string>1.55.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -37,7 +37,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>436</string>
+	<string>423</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
--- a/ios/MattermostShare/Info.plist
+++ b/ios/MattermostShare/Info.plist
@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.56.0</string>
+	<string>1.55.1</string>
 	<key>CFBundleVersion</key>
-	<string>436</string>
+	<string>423</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
--- a/ios/NotificationService/Info.plist
+++ b/ios/NotificationService/Info.plist
@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.56.0</string>
+	<string>1.55.1</string>
 	<key>CFBundleVersion</key>
-	<string>436</string>
+	<string>423</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "mattermost-mobile",
-  "version": "1.56.0",
+  "version": "1.55.1",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "mattermost-mobile",
-      "version": "1.56.0",
+      "version": "1.55.1",
      "hasInstallScript": true,
      "license": "Apache 2.0",
      "dependencies": {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "mattermost-mobile",
-  "version": "1.56.0",
+  "version": "1.55.1",
  "description": "Mattermost Mobile with React Native",
  "repository": "git@github.com:mattermost/mattermost-mobile.git",
  "author": "Mattermost, Inc.",
Author	SHA1	Message	Date
Elias Nahum	0bf036b4f7	Merge branch 'v1' into release-1.55	2023-01-03 15:20:31 +02:00
Mattermost Build	c831aea706	Bump version to 1.55.1 build 423 (#6625 ) (#6626 ) * Bump app version number to 1.55.1 * Bump app build number to 423 (cherry picked from commit `149ebd6a15`) Co-authored-by: Elias Nahum <nahumhbl@gmail.com>	2022-09-07 09:21:25 -03:00
Mattermost Build	7ef2ec982a	Fix convert channel to private (#6568 ) (#6610 )	2022-09-01 08:21:38 -04:00
Mattermost Build	242af6603d	MM-33993 Allow apps form and interactive dialogs to clear select fields (#5398 ) (#6609 )	2022-09-01 08:20:52 -04:00
Mattermost Build	cbee2449e2	Bump app build number to 418 (#6564 ) (#6565 ) (cherry picked from commit `6119ac46e1`) Co-authored-by: Elias Nahum <nahumhbl@gmail.com>	2022-08-11 09:06:35 -04:00
Mattermost Build	5bbf11ce33	[MM-38103] initialize select fields with the value (#5640 ) (#6548 )	2022-08-04 16:59:35 -04:00
Mattermost Build	8e26b4b2b5	[MM-41749] Fixed SettingsSidebar component added back to navigation stack (#6503 ) (#6545 ) Co-authored-by: Jean-Paul Manuel <jean-paulm@yoyowallet.com> (cherry picked from commit `8cbf57781b`) Co-authored-by: Jean-Paul Manuel <jpmastermind@gmail.com>	2022-08-04 09:41:32 -04:00
Mattermost Build	19be35c343	Bump version to 1.55.0 and build to 416 (#6538 ) (#6539 ) * Bump app version number to 1.55.0 * Bump app build number to 416 (cherry picked from commit `c4620963fa`) Co-authored-by: Elias Nahum <nahumhbl@gmail.com>	2022-08-03 13:59:43 -04:00
Mattermost Build	5c79b5152e	Accept text shared with image on Android (#6324 ) (#6533 ) (cherry picked from commit `cd4dc9528b`) Co-authored-by: t0mm0 <dev@onairsoftware.co.uk>	2022-08-02 10:38:52 -04:00