diff --git a/android/app/build.gradle b/android/app/build.gradle
index fcb86d8d0..ef0498e43 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -134,7 +134,7 @@ android {
applicationId "com.mattermost.rnbeta"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode 434
+ versionCode 435
versionName "1.56.0"
multiDexEnabled = true
testBuildType System.getProperty('testBuildType', 'debug')
diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj
index 01f210136..fa3cad59f 100644
--- a/ios/Mattermost.xcodeproj/project.pbxproj
+++ b/ios/Mattermost.xcodeproj/project.pbxproj
@@ -906,7 +906,7 @@
CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- CURRENT_PROJECT_VERSION = 434;
+ CURRENT_PROJECT_VERSION = 435;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = UQ8HT4Q2XM;
ENABLE_BITCODE = NO;
@@ -948,7 +948,7 @@
CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- CURRENT_PROJECT_VERSION = 434;
+ CURRENT_PROJECT_VERSION = 435;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = UQ8HT4Q2XM;
ENABLE_BITCODE = NO;
diff --git a/ios/Mattermost/Info.plist b/ios/Mattermost/Info.plist
index 8aa6dfa02..57d405d9b 100644
--- a/ios/Mattermost/Info.plist
+++ b/ios/Mattermost/Info.plist
@@ -37,7 +37,7 @@
CFBundleVersion
- 434
+ 435
ITSAppUsesNonExemptEncryption
LSRequiresIPhoneOS
diff --git a/ios/MattermostShare/Info.plist b/ios/MattermostShare/Info.plist
index 11189949e..cfae8a2d5 100644
--- a/ios/MattermostShare/Info.plist
+++ b/ios/MattermostShare/Info.plist
@@ -21,7 +21,7 @@
CFBundleShortVersionString
1.56.0
CFBundleVersion
- 434
+ 435
NSAppTransportSecurity
NSAllowsArbitraryLoads
diff --git a/ios/NotificationService/Info.plist b/ios/NotificationService/Info.plist
index fee54688a..70c637c44 100644
--- a/ios/NotificationService/Info.plist
+++ b/ios/NotificationService/Info.plist
@@ -21,7 +21,7 @@
CFBundleShortVersionString
1.56.0
CFBundleVersion
- 434
+ 435
NSExtension
NSExtensionPointIdentifier
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 5437bf968..175dd6de7 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -88,8 +88,8 @@ PODS:
- libwebp/mux (1.2.3):
- libwebp/demux
- libwebp/webp (1.2.3)
- - MMKV (1.2.13):
- - MMKVCore (~> 1.2.13)
+ - MMKV (1.2.10):
+ - MMKVCore (~> 1.2.10)
- MMKVCore (1.2.14)
- OpenSSL-Universal (1.1.1100)
- Permission-Camera (3.6.1):
@@ -328,8 +328,8 @@ PODS:
- React-Core
- react-native-local-auth (1.6.0):
- React
- - react-native-mmkv-storage (0.8.0):
- - MMKV (= 1.2.13)
+ - react-native-mmkv-storage (0.6.11):
+ - MMKV (= 1.2.10)
- React-Core
- react-native-netinfo (9.3.6):
- React-Core
@@ -865,7 +865,7 @@ SPEC CHECKSUMS:
jail-monkey: de7eab0c9cbe4e7cdd2f80d04f812337ae94b2e0
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
libwebp: 60305b2e989864154bd9be3d772730f08fc6a59c
- MMKV: aac95d817a100479445633f2b3ed8961b4ac5043
+ MMKV: 76033b9ace2006623308910a3afcc0e25eba3140
MMKVCore: 89f5c8a66bba2dcd551779dea4d412eeec8ff5bb
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
Permission-Camera: bf6791b17c7f614b6826019fcfdcc286d3a107f6
@@ -895,7 +895,7 @@ SPEC CHECKSUMS:
react-native-hw-keyboard-event: b517cefb8d5c659a38049c582de85ff43337dc53
react-native-image-picker: 4bc9ed38c8be255b515d8c88babbaf74973f91a8
react-native-local-auth: 49d336dcf0cb0268a930100013a6525844093844
- react-native-mmkv-storage: 8ba3c0216a6df283ece11205b442a3e435aec4e5
+ react-native-mmkv-storage: 2b57ca101fae52428f6cef6552793f83c0cdbc46
react-native-netinfo: f80db8cac2151405633324cb645c60af098ee461
react-native-notifications: 33ec77006f7987bb22de8f1665889abc633b9196
react-native-passcode-status: e78f76b3c8db613e6ced6bd40b54aa4f53374173
diff --git a/package-lock.json b/package-lock.json
index 73d7d77c5..2704bfa1c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -66,7 +66,7 @@
"react-native-local-auth": "1.6.0",
"react-native-localize": "2.2.4",
"react-native-math-view": "3.9.5",
- "react-native-mmkv-storage": "0.8.0",
+ "react-native-mmkv-storage": "0.6.11",
"react-native-navigation": "7.30.0",
"react-native-notifications": "4.3.1",
"react-native-passcode-status": "1.1.2",
@@ -19949,9 +19949,9 @@
}
},
"node_modules/react-native-mmkv-storage": {
- "version": "0.8.0",
- "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-0.8.0.tgz",
- "integrity": "sha512-L782Le5IuDYlDLGXF/qimbnzvkbYsSmV5PiDleo1DSS8Kr8Q31UK8YWtUICrDGQ9Fm7Xx4PxP9ffe2XzGeWaHQ==",
+ "version": "0.6.11",
+ "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-0.6.11.tgz",
+ "integrity": "sha512-PaxUxbTwr+PHfzoYt6E1Mds9/CjV5uOFVstuBW0laFUWlGrTHgiaLWR8VwJt0EPScSl5Lz4RM8IiqmXbIUSbbw==",
"bin": {
"mmkv-link": "autolink/postlink/run.js"
},
@@ -39427,9 +39427,9 @@
}
},
"react-native-mmkv-storage": {
- "version": "0.8.0",
- "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-0.8.0.tgz",
- "integrity": "sha512-L782Le5IuDYlDLGXF/qimbnzvkbYsSmV5PiDleo1DSS8Kr8Q31UK8YWtUICrDGQ9Fm7Xx4PxP9ffe2XzGeWaHQ==",
+ "version": "0.6.11",
+ "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-0.6.11.tgz",
+ "integrity": "sha512-PaxUxbTwr+PHfzoYt6E1Mds9/CjV5uOFVstuBW0laFUWlGrTHgiaLWR8VwJt0EPScSl5Lz4RM8IiqmXbIUSbbw==",
"requires": {}
},
"react-native-navigation": {
diff --git a/package.json b/package.json
index 887c86f1a..ebfc012ee 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
"react-native-local-auth": "1.6.0",
"react-native-localize": "2.2.4",
"react-native-math-view": "3.9.5",
- "react-native-mmkv-storage": "0.8.0",
+ "react-native-mmkv-storage": "0.6.11",
"react-native-navigation": "7.30.0",
"react-native-notifications": "4.3.1",
"react-native-passcode-status": "1.1.2",
diff --git a/patches/react-native-mmkv-storage+0.6.11.patch b/patches/react-native-mmkv-storage+0.6.11.patch
new file mode 100644
index 000000000..400419f38
--- /dev/null
+++ b/patches/react-native-mmkv-storage+0.6.11.patch
@@ -0,0 +1,30 @@
+diff --git a/node_modules/react-native-mmkv-storage/ios/MMKVNative.mm b/node_modules/react-native-mmkv-storage/ios/MMKVNative.mm
+index 352a28f..0f63009 100644
+--- a/node_modules/react-native-mmkv-storage/ios/MMKVNative.mm
++++ b/node_modules/react-native-mmkv-storage/ios/MMKVNative.mm
+@@ -71,11 +71,12 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install)
+
+ NSArray *paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory,
+ NSUserDomainMask, YES);
+- NSString *libraryPath = (NSString *)[paths firstObject];
+- NSString *rootDir = [libraryPath stringByAppendingPathComponent:@"mmkv"];
+- rPath = rootDir;
++ NSBundle *bundle = [NSBundle mainBundle];
++ NSString *APP_GROUP_ID = [bundle objectForInfoDictionaryKey:@"AppGroupIdentifier"];
++ NSString *groupDir = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:APP_GROUP_ID].path;
++ rPath = groupDir;
+ _secureStorage = [[SecureStorage alloc] init];
+- [MMKV initializeMMKV:rootDir];
++ [MMKV initializeMMKV:nil groupDir:groupDir logLevel:MMKVLogInfo];
+ [self migrate];
+ install(*(jsi::Runtime *)jsiRuntime);
+ return @true;
+@@ -179,7 +180,7 @@ static void install(jsi::Runtime &jsiRuntime) {
+ jsiRuntime, PropNameID::forAscii(jsiRuntime, "initializeMMKV"), 0,
+ [](Runtime &runtime, const Value &thisValue, const Value *arguments,
+ size_t count) -> Value {
+- [MMKV initializeMMKV:rPath];
++ [MMKV initializeMMKV:nil groupDir:rPath logLevel:MMKVLogInfo];
+ return Value::undefined();
+ });
+
diff --git a/patches/react-native-mmkv-storage+0.8.0.patch b/patches/react-native-mmkv-storage+0.8.0.patch
deleted file mode 100644
index 8128ad8bc..000000000
--- a/patches/react-native-mmkv-storage+0.8.0.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/node_modules/react-native-mmkv-storage/ios/MMKVNative.mm b/node_modules/react-native-mmkv-storage/ios/MMKVNative.mm
-index 9af089d..fb38ec0 100644
---- a/node_modules/react-native-mmkv-storage/ios/MMKVNative.mm
-+++ b/node_modules/react-native-mmkv-storage/ios/MMKVNative.mm
-@@ -32,11 +32,12 @@ RCT_EXPORT_MODULE()
- RCTExecuteOnMainQueue(^{
- NSArray *paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory,
- NSUserDomainMask, YES);
-- NSString *libraryPath = (NSString *)[paths firstObject];
-- NSString *rootDir = [libraryPath stringByAppendingPathComponent:@"mmkv"];
-- rPath = rootDir;
-+ NSBundle *bundle = [NSBundle mainBundle];
-+ NSString *APP_GROUP_ID = [bundle objectForInfoDictionaryKey:@"AppGroupIdentifier"];
-+ NSString *groupDir = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:APP_GROUP_ID].path;
-+ rPath = groupDir;
- _secureStorage = [[SecureStorage alloc] init];
-- [MMKV initializeMMKV:rootDir];
-+ [MMKV initializeMMKV:nil groupDir:groupDir logLevel:MMKVLogInfo];
- });
-
-
-@@ -186,7 +187,7 @@ static void install(jsi::Runtime &jsiRuntime) {
- jsiRuntime, PropNameID::forAscii(jsiRuntime, "initializeMMKV"), 0,
- [](Runtime &runtime, const Value &thisValue, const Value *arguments,
- size_t count) -> Value {
-- [MMKV initializeMMKV:rPath];
-+ [MMKV initializeMMKV:nil groupDir:rPath logLevel:MMKVLogInfo];
- return Value::undefined();
- });
-