From 122676ef5d4adadb6bcc7309a1fbe7d4d7e89ae9 Mon Sep 17 00:00:00 2001 From: Mattermost Build Date: Mon, 17 Aug 2020 20:50:25 -0400 Subject: [PATCH] Upgrade react-native-mmkv-storage dependency (#4671) (#4691) (cherry picked from commit a90958302530d00292722fc2b4139cab0d8093f9) Co-authored-by: Elias Nahum --- ios/Podfile.lock | 16 ++++++++-------- package-lock.json | 6 +++--- package.json | 2 +- ...tch => react-native-mmkv-storage+0.3.5.patch} | 5 ++--- 4 files changed, 14 insertions(+), 15 deletions(-) rename patches/{react-native-mmkv-storage+0.3.2.patch => react-native-mmkv-storage+0.3.5.patch} (97%) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 739d0b3aa..64985e59c 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -32,9 +32,9 @@ PODS: - libwebp/mux (1.1.0): - libwebp/demux - libwebp/webp (1.1.0) - - MMKV (1.1.1): - - MMKVCore (~> 1.1.1) - - MMKVCore (1.1.2) + - MMKV (1.2.1): + - MMKVCore (~> 1.2.1) + - MMKVCore (1.2.1) - Permission-Camera (2.1.4): - RNPermissions - Permission-PhotoLibrary (2.1.4): @@ -220,8 +220,8 @@ PODS: - React - react-native-local-auth (1.6.0): - React - - react-native-mmkv-storage (0.3.2): - - MMKV (= 1.1.1) + - react-native-mmkv-storage (0.3.5): + - MMKV (= 1.2.1) - React - react-native-netinfo (5.9.5): - React @@ -593,8 +593,8 @@ SPEC CHECKSUMS: glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3 jail-monkey: d7c5048b2336f22ee9c9e0efa145f1f917338ea9 libwebp: 946cb3063cea9236285f7e9a8505d806d30e07f3 - MMKV: 5eb44526fcf38152328ebfeff5ec585972ace00d - MMKVCore: ae976ab3f019a3e4448f884353e0557b324ff136 + MMKV: 67253edee25a34edf332f91d73fa94a9e038b971 + MMKVCore: fe398984acac1fa33f92795d1b5fd0a334c944af Permission-Camera: 3ed116545ee8806cd706bca0e1a9a2c3cd36c6bd Permission-PhotoLibrary: 56e71522b008d9abca150680c1f8050f267cdffb RCTRequired: f13f25e7b12f925f1f6a6a8c69d929a03c0129fe @@ -614,7 +614,7 @@ SPEC CHECKSUMS: react-native-hw-keyboard-event: b517cefb8d5c659a38049c582de85ff43337dc53 react-native-image-picker: a6c3d644751a388b0fc8b56822ff7cbd398a3008 react-native-local-auth: 359af242caa1e5c501ac9dfe33b1e238ad8f08c6 - react-native-mmkv-storage: 49389227471de5258b4e5bae7857bfe0ad02c8f7 + react-native-mmkv-storage: be9f9ed4ce7c1af990f40bf610c8b8a59c88a944 react-native-netinfo: 7f3f3ed9e8f0e7ab3e7cac00cbfdc6997e25ecaf react-native-notifications: 24706907104a0f00c35c4bde7e0ca76a50f730e1 react-native-passcode-status: 88c4f6e074328bc278bd127646b6c694ad5a530a diff --git a/package-lock.json b/package-lock.json index 783b04314..c67407abe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18384,9 +18384,9 @@ "integrity": "sha512-W2MQxm6hzD549ZbZcbWzWtYJseY7S7WR2WgsNhm9ULmbwP7tXFfOTbkJjQoqgPXYSXogKN3srXhntVsNZL0Ksw==" }, "react-native-mmkv-storage": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-0.3.2.tgz", - "integrity": "sha512-YoY4BIHH/xu1wIoDBehBQh01JHkOh3NkltROth7GU99hmoqyWCmzAt+yz+heNUYtLZ3PI/JX2LFEX4DElmf0Ng==" + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/react-native-mmkv-storage/-/react-native-mmkv-storage-0.3.5.tgz", + "integrity": "sha512-xp0E55Qdi81k8CTeq3PUrXGwT2tMmfNfmYvZ7Emq9qWpvg3ko1/M6B1kXEXOgEou/hgqB503TGcsR/mpN5HSMA==" }, "react-native-navigation": { "version": "6.4.0", diff --git a/package.json b/package.json index 6ac3cf724..0fe1db7b1 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "react-native-linear-gradient": "2.5.6", "react-native-local-auth": "1.6.0", "react-native-localize": "1.4.0", - "react-native-mmkv-storage": "0.3.2", + "react-native-mmkv-storage": "0.3.5", "react-native-navigation": "6.4.0", "react-native-notifications": "2.1.7", "react-native-passcode-status": "1.1.2", diff --git a/patches/react-native-mmkv-storage+0.3.2.patch b/patches/react-native-mmkv-storage+0.3.5.patch similarity index 97% rename from patches/react-native-mmkv-storage+0.3.2.patch rename to patches/react-native-mmkv-storage+0.3.5.patch index bda317d1e..17cddf0e2 100644 --- a/patches/react-native-mmkv-storage+0.3.2.patch +++ b/patches/react-native-mmkv-storage+0.3.5.patch @@ -1,8 +1,8 @@ diff --git a/node_modules/react-native-mmkv-storage/ios/MMKVStorage.m b/node_modules/react-native-mmkv-storage/ios/MMKVStorage.m -index 6ce0b16..a1b3c56 100644 +index 34c764c..34fd83d 100644 --- a/node_modules/react-native-mmkv-storage/ios/MMKVStorage.m +++ b/node_modules/react-native-mmkv-storage/ios/MMKVStorage.m -@@ -45,7 +45,10 @@ - (id)init +@@ -37,7 +37,9 @@ - (id)init { self = [super init]; if (self) { @@ -10,7 +10,6 @@ index 6ce0b16..a1b3c56 100644 + NSString *APP_GROUP_ID = @"group.com.mattermost.rnbeta"; + NSString *groupDir = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:APP_GROUP_ID].path; + [MMKV initializeMMKV:nil groupDir:groupDir logLevel:MMKVLogInfo]; -+ secureStorage = [[SecureStorage alloc]init]; IdStore = [[IDStore alloc] initWithMMKV:[MMKV mmkvWithID:@"mmkvIdStore"]]; mmkvMap = [NSMutableDictionary dictionary];