Skip to content

Commit 7045f84

Browse files
committed
Merge branch 'main' into develop
# Conflicts: # projects/SlackClone/package.json # projects/SlackClone/yarn.lock # projects/iMessageClone/package.json # projects/iMessageClone/yarn.lock
2 parents 3de7c08 + 61ec1f8 commit 7045f84

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

projects/SlackClone/ios/Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ PODS:
294294
- React
295295
- react-native-blur (0.8.0):
296296
- React
297-
- react-native-cameraroll (4.0.4):
297+
- react-native-cameraroll (5.0.1):
298298
- React-Core
299299
- react-native-document-picker (5.2.0):
300300
- React-Core
@@ -481,7 +481,7 @@ DEPENDENCIES:
481481
- React-logger (from `../node_modules/react-native/ReactCommon/logger`)
482482
- react-native-appearance (from `../node_modules/react-native-appearance`)
483483
- "react-native-blur (from `../node_modules/@react-native-community/blur`)"
484-
- "react-native-cameraroll (from `../node_modules/@react-native-community/cameraroll`)"
484+
- "react-native-cameraroll (from `../node_modules/@react-native-camera-roll/camera-roll`)"
485485
- react-native-document-picker (from `../node_modules/react-native-document-picker`)
486486
- react-native-image-resizer (from `../node_modules/react-native-image-resizer`)
487487
- "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
@@ -574,7 +574,7 @@ EXTERNAL SOURCES:
574574
react-native-blur:
575575
:path: "../node_modules/@react-native-community/blur"
576576
react-native-cameraroll:
577-
:path: "../node_modules/@react-native-community/cameraroll"
577+
:path: "../node_modules/@react-native-camera-roll/camera-roll"
578578
react-native-document-picker:
579579
:path: "../node_modules/react-native-document-picker"
580580
react-native-image-resizer:
@@ -671,7 +671,7 @@ SPEC CHECKSUMS:
671671
React-logger: 1e10789cb84f99288479ba5f20822ce43ced6ffe
672672
react-native-appearance: 0f0e5fc2fcef70e03d48c8fe6b00b9158c2ba8aa
673673
react-native-blur: cad4d93b364f91e7b7931b3fa935455487e5c33c
674-
react-native-cameraroll: 88f4e62d9ecd0e1f253abe4f685474f2ea14bfa2
674+
react-native-cameraroll: c7b7b52aff5d3bfa10ee566020fa31c8a4c0e2f2
675675
react-native-document-picker: f1b5398801b332c77bc62ae0eae2116f49bdff26
676676
react-native-image-resizer: d9fb629a867335bdc13230ac2a58702bb8c8828f
677677
react-native-netinfo: e849fc21ca2f4128a5726c801a82fc6f4a6db50d

projects/SlackClone/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
},
1414
"dependencies": {
1515
"@gorhom/bottom-sheet": "^3.6.5",
16+
"@react-native-camera-roll/camera-roll": "^5.0.1",
1617
"@react-native-community/async-storage": "^1.12.1",
1718
"@react-native-community/blur": "^3.6.0",
18-
"@react-native-community/cameraroll": "^4.0.4",
1919
"@react-native-community/checkbox": "^0.5.8",
2020
"@react-native-community/clipboard": "^1.5.1",
2121
"@react-native-community/masked-view": "^0.1.11",
@@ -54,7 +54,7 @@
5454
"jest": "^26.6.3",
5555
"metro-react-native-babel-preset": "^0.64.0",
5656
"react-test-renderer": "17.0.1",
57-
"stream-chat-test-data-cli": "0.1.0-beta.3"
57+
"stream-chat-test-data-cli": "0.1.0-beta.4"
5858
},
5959
"jest": {
6060
"preset": "react-native"

0 commit comments

Comments
 (0)