From 61dc320a68cff3348790fd54224397ff5683eea4 Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Mon, 21 Nov 2022 16:16:53 -0300 Subject: [PATCH] Chore: Update react-native-mmkv-storage to 0.8.0 (#4695) --- ios/Podfile.lock | 16 ++--- package.json | 2 +- ... => react-native-mmkv-storage+0.8.0.patch} | 61 +++---------------- yarn.lock | 8 +-- 4 files changed, 20 insertions(+), 67 deletions(-) rename patches/{react-native-mmkv-storage+0.7.6.patch => react-native-mmkv-storage+0.8.0.patch} (59%) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 9f1650b1e..8770f6271 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -118,9 +118,9 @@ PODS: - libwebp/mux (1.2.1): - libwebp/demux - libwebp/webp (1.2.1) - - MMKV (1.2.10): - - MMKVCore (~> 1.2.10) - - MMKVCore (1.2.13) + - MMKV (1.2.13): + - MMKVCore (~> 1.2.13) + - MMKVCore (1.2.14) - nanopb (2.30908.0): - nanopb/decode (= 2.30908.0) - nanopb/encode (= 2.30908.0) @@ -365,8 +365,8 @@ PODS: - react-native-jitsi-meet (3.6.0): - JitsiMeetSDK (= 3.6.0) - React - - react-native-mmkv-storage (0.7.6): - - MMKV (= 1.2.10) + - react-native-mmkv-storage (0.8.0): + - MMKV (= 1.2.13) - React-Core - react-native-netinfo (6.0.0): - React-Core @@ -919,8 +919,8 @@ SPEC CHECKSUMS: KeyCommands: f66c535f698ed14b3d3a4e58859d79a827ea907e libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc - MMKV: 76033b9ace2006623308910a3afcc0e25eba3140 - MMKVCore: 3388952ded307e41b3ed8a05892736a236ed1b8e + MMKV: aac95d817a100479445633f2b3ed8961b4ac5043 + MMKVCore: 89f5c8a66bba2dcd551779dea4d412eeec8ff5bb nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c PromisesObjC: 99b6f43f9e1044bd87a95a60beff28c2c44ddb72 @@ -944,7 +944,7 @@ SPEC CHECKSUMS: react-native-cookies: f54fcded06bb0cda05c11d86788020b43528a26c react-native-document-picker: f5ec1a712ca2a975c233117f044817bb8393cad4 react-native-jitsi-meet: 3e3ac5d0445091154119f94342efd55c8b1124ce - react-native-mmkv-storage: ba38e5e813ea3d5d37af834a9d867b1ce10aa96d + react-native-mmkv-storage: 8ba3c0216a6df283ece11205b442a3e435aec4e5 react-native-netinfo: e849fc21ca2f4128a5726c801a82fc6f4a6db50d react-native-notifications: 83b4fd4a127a6c918fc846cae90da60f84819e44 react-native-orientation-locker: f0ca1a8e5031dab6b74bfb4ab33a17ed2c2fcb0d diff --git a/package.json b/package.json index 15b49ca15..f2faa864a 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "react-native-localize": "2.1.1", "react-native-math-view": "^3.9.5", "react-native-mime-types": "2.3.0", - "react-native-mmkv-storage": "^0.7.6", + "react-native-mmkv-storage": "^0.8.0", "react-native-modal": "13.0.1", "react-native-navigation-bar-color": "2.0.1", "react-native-notifications": "^4.3.3", diff --git a/patches/react-native-mmkv-storage+0.7.6.patch b/patches/react-native-mmkv-storage+0.8.0.patch similarity index 59% rename from patches/react-native-mmkv-storage+0.7.6.patch rename to patches/react-native-mmkv-storage+0.8.0.patch index 36c43cf7d..dd23c802c 100644 --- a/patches/react-native-mmkv-storage+0.7.6.patch +++ b/patches/react-native-mmkv-storage+0.8.0.patch @@ -1,55 +1,8 @@ -diff --git a/node_modules/react-native-mmkv-storage/ios/MMKVNative.h b/node_modules/react-native-mmkv-storage/ios/MMKVNative.h -index 60a2a03..ca6fdfd 100644 ---- a/node_modules/react-native-mmkv-storage/ios/MMKVNative.h -+++ b/node_modules/react-native-mmkv-storage/ios/MMKVNative.h -@@ -1,6 +1,6 @@ - --#if __has_include("RCTBridgeModule.h") --#import "RCTBridgeModule.h" -+#if __has_include() -+#import - #else - #import - #import -diff --git a/node_modules/react-native-mmkv-storage/ios/MMKVStorage.h b/node_modules/react-native-mmkv-storage/ios/MMKVStorage.h -index b5f5823..62e2afa 100644 ---- a/node_modules/react-native-mmkv-storage/ios/MMKVStorage.h -+++ b/node_modules/react-native-mmkv-storage/ios/MMKVStorage.h -@@ -1,6 +1,6 @@ - --#if __has_include("RCTBridgeModule.h") --#import "RCTBridgeModule.h" -+#if __has_include() -+#import - #else - #import - #import -diff --git a/node_modules/react-native-mmkv-storage/ios/SecureStorage.h b/node_modules/react-native-mmkv-storage/ios/SecureStorage.h -index b804a64..291cc7e 100644 ---- a/node_modules/react-native-mmkv-storage/ios/SecureStorage.h -+++ b/node_modules/react-native-mmkv-storage/ios/SecureStorage.h -@@ -1,6 +1,6 @@ - --#if __has_include("RCTBridgeModule.h") --#import "RCTBridgeModule.h" -+#if __has_include() -+#import - #else - #import - #endif diff --git a/node_modules/react-native-mmkv-storage/ios/SecureStorage.m b/node_modules/react-native-mmkv-storage/ios/SecureStorage.m -index 1c4e1c2..fd6ef68 100644 +index dbea26b..7b2083c 100644 --- a/node_modules/react-native-mmkv-storage/ios/SecureStorage.m +++ b/node_modules/react-native-mmkv-storage/ios/SecureStorage.m -@@ -1,5 +1,5 @@ --#if __has_include("RCTBridgeModule.h") --#import "RCTBridgeModule.h" -+#if __has_include() -+#import - #else - #import - #endif -@@ -45,14 +45,14 @@ - (NSString *) getSecureKey:(NSString *)key +@@ -40,14 +40,14 @@ - (NSString *) getSecureKey:(NSString *)key @try { [self handleAppUninstallation]; NSString *value = [self searchKeychainCopyMatching:key]; @@ -72,7 +25,7 @@ index 1c4e1c2..fd6ef68 100644 if (value == nil) { NSString* errorMessage = @"key does not present"; -@@ -105,6 +105,9 @@ - (void) removeSecureKey:(NSString *)key +@@ -100,6 +100,9 @@ - (void) removeSecureKey:(NSString *)key - (NSMutableDictionary *)newSearchDictionary:(NSString *)identifier { NSMutableDictionary *searchDictionary = [[NSMutableDictionary alloc] init]; @@ -82,17 +35,17 @@ index 1c4e1c2..fd6ef68 100644 if(serviceName == nil){ serviceName = [[NSBundle mainBundle] bundleIdentifier]; } -@@ -116,6 +119,9 @@ - (NSMutableDictionary *)newSearchDictionary:(NSString *)identifier { +@@ -111,6 +114,9 @@ - (NSMutableDictionary *)newSearchDictionary:(NSString *)identifier { [searchDictionary setObject:encodedIdentifier forKey:(id)kSecAttrAccount]; [searchDictionary setObject:serviceName forKey:(id)kSecAttrService]; - + + NSString *keychainGroup = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"KeychainGroup"]; + [searchDictionary setObject:keychainGroup forKey:(id)kSecAttrAccessGroup]; -+ ++ return searchDictionary; } -@@ -217,11 +223,14 @@ - (void)clearSecureKeyStore +@@ -212,11 +218,14 @@ - (void)clearSecureKeyStore - (void)handleAppUninstallation { diff --git a/yarn.lock b/yarn.lock index ab1a14d7b..cfa4f0a37 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17203,10 +17203,10 @@ react-native-mime-types@2.3.0: dependencies: mime-db "~1.37.0" -react-native-mmkv-storage@^0.7.6: - version "0.7.6" - resolved "https://registry.yarnpkg.com/react-native-mmkv-storage/-/react-native-mmkv-storage-0.7.6.tgz#c4b2d6d342efda91f69edb6ba4b9c0ff6c34d70c" - integrity sha512-Uxc8U3vRJMAeLIu9Dr8VpbaaCUlMd4vJfkEme2sXh2GGCYrbXqrE3XPLjtuA/fSd2VBKZNFBkJhyf4RzU9VX3A== +react-native-mmkv-storage@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/react-native-mmkv-storage/-/react-native-mmkv-storage-0.8.0.tgz#2ece5f441a6a818224a85315c68e105e0d6446b5" + integrity sha512-L782Le5IuDYlDLGXF/qimbnzvkbYsSmV5PiDleo1DSS8Kr8Q31UK8YWtUICrDGQ9Fm7Xx4PxP9ffe2XzGeWaHQ== react-native-modal@13.0.1: version "13.0.1"