Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CHORE] Update WatermelonDB to 0.16.2 #2166

Merged
merged 3 commits into from
Jun 5, 2020
Merged

[CHORE] Update WatermelonDB to 0.16.2 #2166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f19ac1
[CHORE] Update WatermelonDB to 0.16.2
diegolmello Jun 4, 2020
7590e0b
Patch watermelon
diegolmello Jun 5, 2020
7378d2b
Merge branch 'develop' into update-wm
diegolmello Jun 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -887,7 +887,7 @@ SPEC CHECKSUMS:
rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba
RNAudio: cae2991f2dccb75163f260b60da8051717b959fa
RNBootSplash: 7cb9b4fe7e94177edc0d11010f7631d79db2f5e9
RNCAsyncStorage: 453cd7c335ec9ba3b877e27d02238956b76f3268
RNCAsyncStorage: 6d99641f8e6f15d169d695d8ef184bf187903f11
RNDateTimePicker: 4bd49e09f91ca73d69119a9e1173b0d43b82f5e5
RNDeviceInfo: e2102056bde3ad5d137fd029d8d431510a00486a
RNFastImage: 35ae972d6727c84ee3f5c6897e07f84d0a3445e9
Expand Down
4 changes: 2 additions & 2 deletions ios/Pods/Local Podspecs/RNCAsyncStorage.podspec.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ios/Pods/Manifest.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
20 changes: 9 additions & 11 deletions patches/@nozbe+watermelondb+0.16.0.patch → patches/@nozbe+watermelondb+0.16.2.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 = (
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected].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"
Expand Down