Merge branch 'master' into beta

RocketChat · May 25, 2020 · daba0b2 · daba0b2
2 parents 1abd3ad + 933362e
commit daba0b2
Show file tree

Hide file tree

Showing 31 changed files with 1,243 additions and 3,168 deletions.
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -31,4 +31,4 @@ FLIPPER_VERSION=0.33.1
 
 # App properties
 VERSIONCODE=999999999
-BugsnagAPIKey=""
+BugsnagAPIKey=""
diff --git 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.11.0):
     - React
   - RNDateTimePicker (2.3.2):
     - React
@@ -458,12 +458,12 @@ PODS:
     - React
   - RNGestureHandler (1.6.1):
     - React
-  - RNImageCropPicker (0.28.0):
+  - RNImageCropPicker (0.30.0):
     - React-Core
     - React-RCTImage
-    - RNImageCropPicker/QBImagePickerController (= 0.28.0)
+    - RNImageCropPicker/QBImagePickerController (= 0.30.0)
     - RSKImageCropper
-  - RNImageCropPicker/QBImagePickerController (0.28.0):
+  - RNImageCropPicker/QBImagePickerController (0.30.0):
     - React-Core
     - React-RCTImage
     - RSKImageCropper
@@ -887,13 +887,13 @@ SPEC CHECKSUMS:
   rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba
   RNAudio: cae2991f2dccb75163f260b60da8051717b959fa
   RNBootSplash: 7cb9b4fe7e94177edc0d11010f7631d79db2f5e9
-  RNCAsyncStorage: 453cd7c335ec9ba3b877e27d02238956b76f3268
+  RNCAsyncStorage: d059c3ee71738c39834a627476322a5a8cd5bf36
   RNDateTimePicker: 4bd49e09f91ca73d69119a9e1173b0d43b82f5e5
   RNDeviceInfo: e2102056bde3ad5d137fd029d8d431510a00486a
   RNFastImage: 35ae972d6727c84ee3f5c6897e07f84d0a3445e9
   RNFirebase: 37daa9a346d070f9f6ee1f3b4aaf4c8e3b1d5d1c
   RNGestureHandler: 8f09cd560f8d533eb36da5a6c5a843af9f056b38
-  RNImageCropPicker: cf129d17e042ce3e96fb9ada967c28f21f977c82
+  RNImageCropPicker: a606d65f71c6c05caa3c850c16fb1ba2a4718608
   RNLocalize: b6df30cc25ae736d37874f9bce13351db2f56796
   RNReanimated: 955cf4068714003d2f1a6e2bae3fb1118f359aff
   RNRootView: 895a4813dedeaca82db2fa868ca1c333d790e494

diff --git a/ios/Pods/Headers/Private/yoga/yoga/CompactValue.h b/ios/Pods/Headers/Private/yoga/yoga/CompactValue.h
diff --git a/ios/Pods/Headers/Private/yoga/yoga/Utils.h b/ios/Pods/Headers/Private/yoga/yoga/Utils.h
diff --git a/ios/Pods/Headers/Private/yoga/yoga/YGConfig.h b/ios/Pods/Headers/Private/yoga/yoga/YGConfig.h
diff --git a/ios/Pods/Headers/Private/yoga/yoga/YGEnums.h b/ios/Pods/Headers/Private/yoga/yoga/YGEnums.h
diff --git a/ios/Pods/Headers/Private/yoga/yoga/YGFloatOptional.h b/ios/Pods/Headers/Private/yoga/yoga/YGFloatOptional.h
diff --git a/ios/Pods/Headers/Private/yoga/yoga/YGLayout.h b/ios/Pods/Headers/Private/yoga/yoga/YGLayout.h
diff --git a/ios/Pods/Headers/Private/yoga/yoga/YGMacros.h b/ios/Pods/Headers/Private/yoga/yoga/YGMacros.h
diff --git a/ios/Pods/Headers/Private/yoga/yoga/YGNode.h b/ios/Pods/Headers/Private/yoga/yoga/YGNode.h
diff --git a/ios/Pods/Headers/Private/yoga/yoga/YGNodePrint.h b/ios/Pods/Headers/Private/yoga/yoga/YGNodePrint.h
diff --git a/ios/Pods/Headers/Private/yoga/yoga/YGStyle.h b/ios/Pods/Headers/Private/yoga/yoga/YGStyle.h
diff --git a/ios/Pods/Headers/Private/yoga/yoga/YGValue.h b/ios/Pods/Headers/Private/yoga/yoga/YGValue.h
diff --git a/ios/Pods/Headers/Private/yoga/yoga/Yoga-internal.h b/ios/Pods/Headers/Private/yoga/yoga/Yoga-internal.h
diff --git a/ios/Pods/Headers/Private/yoga/yoga/Yoga.h b/ios/Pods/Headers/Private/yoga/yoga/Yoga.h
diff --git a/ios/Pods/Headers/Private/yoga/yoga/event.h b/ios/Pods/Headers/Private/yoga/yoga/event.h
diff --git a/ios/Pods/Headers/Private/yoga/yoga/experiments-inl.h b/ios/Pods/Headers/Private/yoga/yoga/experiments-inl.h
diff --git a/ios/Pods/Headers/Private/yoga/yoga/experiments.h b/ios/Pods/Headers/Private/yoga/yoga/experiments.h
diff --git a/ios/Pods/Headers/Private/yoga/yoga/log.h b/ios/Pods/Headers/Private/yoga/yoga/log.h
diff --git a/ios/Pods/Headers/Public/yoga/yoga/YGEnums.h b/ios/Pods/Headers/Public/yoga/yoga/YGEnums.h
diff --git a/ios/Pods/Headers/Public/yoga/yoga/YGMacros.h b/ios/Pods/Headers/Public/yoga/yoga/YGMacros.h
diff --git a/ios/Pods/Headers/Public/yoga/yoga/YGValue.h b/ios/Pods/Headers/Public/yoga/yoga/YGValue.h
diff --git a/ios/Pods/Headers/Public/yoga/yoga/Yoga.h b/ios/Pods/Headers/Public/yoga/yoga/Yoga.h
diff --git a/ios/Pods/Local Podspecs/RNCAsyncStorage.podspec.json b/ios/Pods/Local Podspecs/RNCAsyncStorage.podspec.json
diff --git a/ios/Pods/Local Podspecs/RNImageCropPicker.podspec.json b/ios/Pods/Local Podspecs/RNImageCropPicker.podspec.json
diff --git a/ios/Pods/Manifest.lock b/ios/Pods/Manifest.lock
diff --git a/...Support Files/RNImageCropPicker/ResourceBundle-QBImagePicker-RNImageCropPicker-Info.plist b/...Support Files/RNImageCropPicker/ResourceBundle-QBImagePicker-RNImageCropPicker-Info.plist
diff --git a/ios/Pods/Target Support Files/yoga/yoga-dummy.m b/ios/Pods/Target Support Files/yoga/yoga-dummy.m
diff --git a/ios/Pods/Target Support Files/yoga/yoga-prefix.pch b/ios/Pods/Target Support Files/yoga/yoga-prefix.pch
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     }
   },
   "dependencies": {
-    "@nozbe/watermelondb": "^0.16.0",
+    "@nozbe/watermelondb": "0.16.0",
     "@react-native-community/art": "^1.2.0",
     "@react-native-community/async-storage": "^1.9.0",
     "@react-native-community/cameraroll": "1.6.0",