From ec7417c29ce28e54a9b43c659c1c0e3191ec4b15 Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Fri, 5 Jun 2020 12:58:14 -0300 Subject: [PATCH] [CHORE] Update WatermelonDB to 0.16.2 (#2166) * [CHORE] Update WatermelonDB to 0.16.2 * Patch watermelon --- ios/Podfile.lock | 4 ++-- .../RNCAsyncStorage.podspec.json | 4 ++-- ios/Pods/Manifest.lock | 4 ++-- package.json | 2 +- ...patch => @nozbe+watermelondb+0.16.2.patch} | 20 +++++++++---------- yarn.lock | 8 ++++---- 6 files changed, 20 insertions(+), 22 deletions(-) rename patches/{@nozbe+watermelondb+0.16.0.patch => @nozbe+watermelondb+0.16.2.patch} (55%) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 2d8776991..3803e81ee 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -437,7 +437,7 @@ PODS: - React - RNBootSplash (2.2.4): - React - - RNCAsyncStorage (1.9.0): + - RNCAsyncStorage (1.10.0): - React - RNDateTimePicker (2.3.2): - React @@ -887,7 +887,7 @@ SPEC CHECKSUMS: rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba RNAudio: cae2991f2dccb75163f260b60da8051717b959fa RNBootSplash: 7cb9b4fe7e94177edc0d11010f7631d79db2f5e9 - RNCAsyncStorage: 453cd7c335ec9ba3b877e27d02238956b76f3268 + RNCAsyncStorage: 6d99641f8e6f15d169d695d8ef184bf187903f11 RNDateTimePicker: 4bd49e09f91ca73d69119a9e1173b0d43b82f5e5 RNDeviceInfo: e2102056bde3ad5d137fd029d8d431510a00486a RNFastImage: 35ae972d6727c84ee3f5c6897e07f84d0a3445e9 diff --git a/ios/Pods/Local Podspecs/RNCAsyncStorage.podspec.json b/ios/Pods/Local Podspecs/RNCAsyncStorage.podspec.json index 68cd767c3..d3e56d09a 100644 --- a/ios/Pods/Local Podspecs/RNCAsyncStorage.podspec.json +++ b/ios/Pods/Local Podspecs/RNCAsyncStorage.podspec.json @@ -1,6 +1,6 @@ { "name": "RNCAsyncStorage", - "version": "1.9.0", + "version": "1.10.0", "summary": "Asynchronous, persistent, key-value storage system for React Native.", "license": "MIT", "authors": "Krzysztof Borowy ", @@ -11,7 +11,7 @@ }, "source": { "git": "https://github.com/react-native-community/react-native-async-storage.git", - "tag": "v1.9.0" + "tag": "v1.10.0" }, "source_files": "ios/**/*.{h,m}", "dependencies": { diff --git a/ios/Pods/Manifest.lock b/ios/Pods/Manifest.lock index 2d8776991..3803e81ee 100644 --- a/ios/Pods/Manifest.lock +++ b/ios/Pods/Manifest.lock @@ -437,7 +437,7 @@ PODS: - React - RNBootSplash (2.2.4): - React - - RNCAsyncStorage (1.9.0): + - RNCAsyncStorage (1.10.0): - React - RNDateTimePicker (2.3.2): - React @@ -887,7 +887,7 @@ SPEC CHECKSUMS: rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba RNAudio: cae2991f2dccb75163f260b60da8051717b959fa RNBootSplash: 7cb9b4fe7e94177edc0d11010f7631d79db2f5e9 - RNCAsyncStorage: 453cd7c335ec9ba3b877e27d02238956b76f3268 + RNCAsyncStorage: 6d99641f8e6f15d169d695d8ef184bf187903f11 RNDateTimePicker: 4bd49e09f91ca73d69119a9e1173b0d43b82f5e5 RNDeviceInfo: e2102056bde3ad5d137fd029d8d431510a00486a RNFastImage: 35ae972d6727c84ee3f5c6897e07f84d0a3445e9 diff --git a/package.json b/package.json index 8008e3867..5ee6f9051 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ } }, "dependencies": { - "@nozbe/watermelondb": "^0.16.0", + "@nozbe/watermelondb": "0.16.2", "@react-native-community/art": "^1.2.0", "@react-native-community/async-storage": "^1.9.0", "@react-native-community/cameraroll": "1.6.0", diff --git a/patches/@nozbe+watermelondb+0.16.0.patch b/patches/@nozbe+watermelondb+0.16.2.patch similarity index 55% rename from patches/@nozbe+watermelondb+0.16.0.patch rename to patches/@nozbe+watermelondb+0.16.2.patch index cd6585ea8..6cbdb5507 100644 --- a/patches/@nozbe+watermelondb+0.16.0.patch +++ b/patches/@nozbe+watermelondb+0.16.2.patch @@ -1,22 +1,20 @@ diff --git a/node_modules/@nozbe/watermelondb/native/ios/WatermelonDB.xcodeproj/project.pbxproj b/node_modules/@nozbe/watermelondb/native/ios/WatermelonDB.xcodeproj/project.pbxproj -index 0bec236..1afad3a 100644 +index 63e6ef9..45c092b 100644 --- a/node_modules/@nozbe/watermelondb/native/ios/WatermelonDB.xcodeproj/project.pbxproj +++ b/node_modules/@nozbe/watermelondb/native/ios/WatermelonDB.xcodeproj/project.pbxproj -@@ -353,7 +354,7 @@ - "$(SRCROOT)/../../../react-native/React/**", - "$(SRCROOT)/../../node_modules/react-native/Libraries/**", +@@ -374,6 +374,7 @@ "$(SRCROOT)/../../../../node_modules/react-native/Libraries/**", -- "$(SRCROOT)/../../../../../ios/Pods/Headers/Public/**", -+ "$(SRCROOT)/../../../../../ios/Pods/Headers/Public/React-Core/**", + "$(SRCROOT)/../../../../../ios/Pods/Headers/Public/React-Core/**", + "$(SRCROOT)/../../../../../../native/ios/Pods/Headers/Public/React-Core", ++ "$(SRCROOT)/../../../../../ios/Pods/Headers/Public/React-jsi/**", ); IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( -@@ -404,7 +405,7 @@ - "$(SRCROOT)/../../../react-native/React/**", - "$(SRCROOT)/../../node_modules/react-native/Libraries/**", +@@ -426,6 +427,7 @@ "$(SRCROOT)/../../../../node_modules/react-native/Libraries/**", -- "$(SRCROOT)/../../../../../ios/Pods/Headers/Public/**", -+ "$(SRCROOT)/../../../../../ios/Pods/Headers/Public/React-Core/**", + "$(SRCROOT)/../../../../../ios/Pods/Headers/Public/React-Core/**", + "$(SRCROOT)/../../../../../../native/ios/Pods/Headers/Public/React-Core", ++ "$(SRCROOT)/../../../../../ios/Pods/Headers/Public/React-jsi/**", ); IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( diff --git a/yarn.lock b/yarn.lock index a8856d70b..a073435ef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2428,10 +2428,10 @@ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b" integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw== -"@nozbe/watermelondb@^0.16.0": - version "0.16.0" - resolved "https://registry.yarnpkg.com/@nozbe/watermelondb/-/watermelondb-0.16.0.tgz#4fa3f0e83442b889d8c805707ccd8ed89264451d" - integrity sha512-WzV7YL8iPUVZ6KLQqzY9z1g913z3laFt4ZWCejcIZMWon89kZ8K9NlniufNUBkTCKrt007U4HSJw6bmTHrDnQA== +"@nozbe/watermelondb@0.16.2": + version "0.16.2" + resolved "https://registry.yarnpkg.com/@nozbe/watermelondb/-/watermelondb-0.16.2.tgz#9c29c426bedb3d3af5d38304344bb49d60ddd1af" + integrity sha512-LLOEl13bVCiLsZf8QCHt5KUmuks7QnMtsXuhBB2rSb1vBDjc3mG2HmkH/eTzbgJnGIdFzH/XtoVUHlS/ll7Log== dependencies: lodash.clonedeep "^4.5.0" lokijs "git+https://github.com/Nozbe/LokiJS.git#d08f660"