Skip to content

Commit 5d1d3d1

Browse files
khushal87khushal87
committed
chore: resolve conflicts from develop
2 parents ff2e947 + 5d81a97 commit 5d1d3d1

File tree

26 files changed

+73
-81
lines changed

26 files changed

+73
-81
lines changed

‎examples/ExpoMessaging/yarn.lock‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1881,14 +1881,6 @@
18811881
find-up "^5.0.0"
18821882
js-yaml "^4.1.0"
18831883

1884-
"@gorhom/bottom-sheet@^4.6.4":
1885-
version "4.6.4"
1886-
resolved "https://registry.yarnpkg.com/@gorhom/bottom-sheet/-/bottom-sheet-4.6.4.tgz#387d0f0f21e3470eb8575498cb81ce96f5108e79"
1887-
integrity sha512-0itLMblLBvepE065w3a60S030c2rNUsGshPC7wbWDm31VyqoaU2xjzh/ojH62YIJOcobBr5QoC30IxBBKDGovQ==
1888-
dependencies:
1889-
"@gorhom/portal" "1.0.14"
1890-
invariant "^2.2.4"
1891-
18921884
"@gorhom/bottom-sheet@^5.0.6":
18931885
version "5.0.6"
18941886
resolved "https://registry.yarnpkg.com/@gorhom/bottom-sheet/-/bottom-sheet-5.0.6.tgz#f20736502399c7bcf8c73ea09e6b571dc07fe0eb"
@@ -7034,12 +7026,12 @@ [email protected], stream-buffers@~2.2.0:
70347026
version "0.0.0"
70357027
uid ""
70367028

7037-
stream-chat-react-native-core@5.44.1:
7038-
version "5.44.1"
7039-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.44.1.tgz#0c4629ba01390574dabb963e2e805eb38602d2d4"
7040-
integrity sha512-cJqfsogmiTwK93kpPQhwaOl+whkH05JFl4k501r0VJbm6xlzv5eVb3NZfi6bX1z2xrILYHC5BFabM0RsX/xL/Q==
7029+
stream-chat-react-native-core@6.0.0:
7030+
version "6.0.0"
7031+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-6.0.0.tgz#77798c7082877572ef70223e1f799d22f0c78fe7"
7032+
integrity sha512-3cFao8iL2MjP7nhVRAl1vi526FbPlqUj4BHnYQ7sUNe+xb4z/HCEL6fKFh8kIfK5MEAacOQO4juPPQktoIf7zg==
70417033
dependencies:
7042-
"@gorhom/bottom-sheet" "^4.6.4"
7034+
"@gorhom/bottom-sheet" "^5.0.6"
70437035
dayjs "1.10.5"
70447036
emoji-regex "^10.3.0"
70457037
i18next "^21.6.14"

‎examples/SampleApp/CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# Change Log
22

3+
## [2.0.0](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v2.0.0) (2024-12-12)
4+
5+
6+
### ⚠ BREAKING CHANGES
7+
8+
* v6 release
9+
10+
### Features
11+
12+
* V6.0.0 ([#2844](https://github.com/GetStream/stream-chat-react-native/issues/2844)) ([8701379](https://github.com/GetStream/stream-chat-react-native/commit/87013795f795ae0428dabae9a2ce18562e674fdc)), closes [#2538](https://github.com/GetStream/stream-chat-react-native/issues/2538) [#2537](https://github.com/GetStream/stream-chat-react-native/issues/2537) [#2539](https://github.com/GetStream/stream-chat-react-native/issues/2539) [#2537](https://github.com/GetStream/stream-chat-react-native/issues/2537) [#2527](https://github.com/GetStream/stream-chat-react-native/issues/2527) [#2534](https://github.com/GetStream/stream-chat-react-native/issues/2534) [#2563](https://github.com/GetStream/stream-chat-react-native/issues/2563) [#2561](https://github.com/GetStream/stream-chat-react-native/issues/2561) [#2541](https://github.com/GetStream/stream-chat-react-native/issues/2541) [#2578](https://github.com/GetStream/stream-chat-react-native/issues/2578) [#2621](https://github.com/GetStream/stream-chat-react-native/issues/2621) [#2627](https://github.com/GetStream/stream-chat-react-native/issues/2627) [#2633](https://github.com/GetStream/stream-chat-react-native/issues/2633) [#2682](https://github.com/GetStream/stream-chat-react-native/issues/2682) [#2646](https://github.com/GetStream/stream-chat-react-native/issues/2646) [#2648](https://github.com/GetStream/stream-chat-react-native/issues/2648) [#2651](https://github.com/GetStream/stream-chat-react-native/issues/2651) [#2649](https://github.com/GetStream/stream-chat-react-native/issues/2649) [#2654](https://github.com/GetStream/stream-chat-react-native/issues/2654) [#2656](https://github.com/GetStream/stream-chat-react-native/issues/2656) [#2657](https://github.com/GetStream/stream-chat-react-native/issues/2657) [#2653](https://github.com/GetStream/stream-chat-react-native/issues/2653) [#2659](https://github.com/GetStream/stream-chat-react-native/issues/2659)
13+
314
### [1.33.2](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.33.2) (2024-12-10)
415

516

‎examples/SampleApp/ios/Podfile.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2166,7 +2166,7 @@ PODS:
21662166
- libwebp (~> 1.0)
21672167
- SDWebImage/Core (~> 5.10)
21682168
- SocketRocket (0.7.1)
2169-
- stream-chat-react-native (5.44.1):
2169+
- stream-chat-react-native (6.0.0):
21702170
- DoubleConversion
21712171
- glog
21722172
- hermes-engine
@@ -2578,9 +2578,9 @@ SPEC CHECKSUMS:
25782578
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
25792579
SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
25802580
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
2581-
stream-chat-react-native: ebdd490d850c18ea013e5e59fc7a0d4195ddfa36
2581+
stream-chat-react-native: 557a9b07b068fea9a1670302ca43f8589d884e33
25822582
Yoga: 83048fe4b4ce15018a5e9ccbf0b06bd76fc643d4
25832583

25842584
PODFILE CHECKSUM: 4f662370295f8f9cee909f1a4c59a614999a209d
25852585

2586-
COCOAPODS: 1.14.3
2586+
COCOAPODS: 1.16.2

‎examples/SampleApp/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sampleapp",
3-
"version": "1.33.2",
3+
"version": "2.0.0",
44
"private": true,
55
"repository": {
66
"type": "git",

‎examples/SampleApp/yarn.lock‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1473,14 +1473,6 @@
14731473
resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
14741474
integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
14751475

1476-
"@gorhom/bottom-sheet@^4.6.4":
1477-
version "4.6.4"
1478-
resolved "https://registry.yarnpkg.com/@gorhom/bottom-sheet/-/bottom-sheet-4.6.4.tgz#387d0f0f21e3470eb8575498cb81ce96f5108e79"
1479-
integrity sha512-0itLMblLBvepE065w3a60S030c2rNUsGshPC7wbWDm31VyqoaU2xjzh/ojH62YIJOcobBr5QoC30IxBBKDGovQ==
1480-
dependencies:
1481-
"@gorhom/portal" "1.0.14"
1482-
invariant "^2.2.4"
1483-
14841476
"@gorhom/bottom-sheet@^5.0.6":
14851477
version "5.0.6"
14861478
resolved "https://registry.yarnpkg.com/@gorhom/bottom-sheet/-/bottom-sheet-5.0.6.tgz#f20736502399c7bcf8c73ea09e6b571dc07fe0eb"
@@ -7364,12 +7356,12 @@ statuses@~1.5.0:
73647356
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
73657357
integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
73667358

7367-
stream-chat-react-native-core@5.44.1:
7368-
version "5.44.1"
7369-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.44.1.tgz#0c4629ba01390574dabb963e2e805eb38602d2d4"
7370-
integrity sha512-cJqfsogmiTwK93kpPQhwaOl+whkH05JFl4k501r0VJbm6xlzv5eVb3NZfi6bX1z2xrILYHC5BFabM0RsX/xL/Q==
7359+
stream-chat-react-native-core@6.0.0:
7360+
version "6.0.0"
7361+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-6.0.0.tgz#77798c7082877572ef70223e1f799d22f0c78fe7"
7362+
integrity sha512-3cFao8iL2MjP7nhVRAl1vi526FbPlqUj4BHnYQ7sUNe+xb4z/HCEL6fKFh8kIfK5MEAacOQO4juPPQktoIf7zg==
73717363
dependencies:
7372-
"@gorhom/bottom-sheet" "^4.6.4"
7364+
"@gorhom/bottom-sheet" "^5.0.6"
73737365
dayjs "1.10.5"
73747366
emoji-regex "^10.3.0"
73757367
i18next "^21.6.14"

‎examples/TypeScriptMessaging/ios/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1991,7 +1991,7 @@ PODS:
19911991
- ReactCommon/turbomodule/core
19921992
- Yoga
19931993
- SocketRocket (0.7.1)
1994-
- stream-chat-react-native (5.43.2):
1994+
- stream-chat-react-native (6.0.0):
19951995
- DoubleConversion
19961996
- glog
19971997
- hermes-engine
@@ -2344,7 +2344,7 @@ SPEC CHECKSUMS:
23442344
RNShare: 4305edead1b8f614ab994046c68193e8d50aaadc
23452345
RNSVG: 536cd3c866c878faf72beaba166c8b02fe2b762b
23462346
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
2347-
stream-chat-react-native: ad7a1338c67f023d3d7ebdfbdfb853376f1a36e3
2347+
stream-chat-react-native: ce121e8f3340eb04b54f69dc92709f4f3bbaa593
23482348
Yoga: db69236006b8b1c6d55ab453390c882306cbf219
23492349

23502350
PODFILE CHECKSUM: 6b7a4b74915b42bfe4ffddaf67cbf5e7a2bfeab3

‎examples/TypeScriptMessaging/yarn.lock‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,14 +1126,6 @@
11261126
resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2"
11271127
integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==
11281128

1129-
"@gorhom/bottom-sheet@^4.6.4":
1130-
version "4.6.4"
1131-
resolved "https://registry.yarnpkg.com/@gorhom/bottom-sheet/-/bottom-sheet-4.6.4.tgz#387d0f0f21e3470eb8575498cb81ce96f5108e79"
1132-
integrity sha512-0itLMblLBvepE065w3a60S030c2rNUsGshPC7wbWDm31VyqoaU2xjzh/ojH62YIJOcobBr5QoC30IxBBKDGovQ==
1133-
dependencies:
1134-
"@gorhom/portal" "1.0.14"
1135-
invariant "^2.2.4"
1136-
11371129
"@gorhom/bottom-sheet@^5.0.6":
11381130
version "5.0.6"
11391131
resolved "https://registry.yarnpkg.com/@gorhom/bottom-sheet/-/bottom-sheet-5.0.6.tgz#f20736502399c7bcf8c73ea09e6b571dc07fe0eb"
@@ -6815,12 +6807,12 @@ statuses@~1.5.0:
68156807
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
68166808
integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
68176809

6818-
stream-chat-react-native-core@5.44.1:
6819-
version "5.44.1"
6820-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.44.1.tgz#0c4629ba01390574dabb963e2e805eb38602d2d4"
6821-
integrity sha512-cJqfsogmiTwK93kpPQhwaOl+whkH05JFl4k501r0VJbm6xlzv5eVb3NZfi6bX1z2xrILYHC5BFabM0RsX/xL/Q==
6810+
stream-chat-react-native-core@6.0.0:
6811+
version "6.0.0"
6812+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-6.0.0.tgz#77798c7082877572ef70223e1f799d22f0c78fe7"
6813+
integrity sha512-3cFao8iL2MjP7nhVRAl1vi526FbPlqUj4BHnYQ7sUNe+xb4z/HCEL6fKFh8kIfK5MEAacOQO4juPPQktoIf7zg==
68226814
dependencies:
6823-
"@gorhom/bottom-sheet" "^4.6.4"
6815+
"@gorhom/bottom-sheet" "^5.0.6"
68246816
dayjs "1.10.5"
68256817
emoji-regex "^10.3.0"
68266818
i18next "^21.6.14"

‎package/CHANGELOG.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
# Change Log
22

3+
## [6.0.0](https://github.com/GetStream/stream-chat-react-native/compare/v5.44.2...v6.0.0) (2024-12-12)
4+
5+
6+
### ⚠ BREAKING CHANGES
7+
8+
* trigger v6 release
9+
* v6 release
10+
11+
### Features
12+
13+
* V6.0.0 ([#2844](https://github.com/GetStream/stream-chat-react-native/issues/2844)) ([8701379](https://github.com/GetStream/stream-chat-react-native/commit/87013795f795ae0428dabae9a2ce18562e674fdc)), closes [#2538](https://github.com/GetStream/stream-chat-react-native/issues/2538) [#2537](https://github.com/GetStream/stream-chat-react-native/issues/2537) [#2539](https://github.com/GetStream/stream-chat-react-native/issues/2539) [#2537](https://github.com/GetStream/stream-chat-react-native/issues/2537) [#2527](https://github.com/GetStream/stream-chat-react-native/issues/2527) [#2534](https://github.com/GetStream/stream-chat-react-native/issues/2534) [#2563](https://github.com/GetStream/stream-chat-react-native/issues/2563) [#2561](https://github.com/GetStream/stream-chat-react-native/issues/2561) [#2541](https://github.com/GetStream/stream-chat-react-native/issues/2541) [#2578](https://github.com/GetStream/stream-chat-react-native/issues/2578) [#2621](https://github.com/GetStream/stream-chat-react-native/issues/2621) [#2627](https://github.com/GetStream/stream-chat-react-native/issues/2627) [#2633](https://github.com/GetStream/stream-chat-react-native/issues/2633) [#2682](https://github.com/GetStream/stream-chat-react-native/issues/2682) [#2646](https://github.com/GetStream/stream-chat-react-native/issues/2646) [#2648](https://github.com/GetStream/stream-chat-react-native/issues/2648) [#2651](https://github.com/GetStream/stream-chat-react-native/issues/2651) [#2649](https://github.com/GetStream/stream-chat-react-native/issues/2649) [#2654](https://github.com/GetStream/stream-chat-react-native/issues/2654) [#2656](https://github.com/GetStream/stream-chat-react-native/issues/2656) [#2657](https://github.com/GetStream/stream-chat-react-native/issues/2657) [#2653](https://github.com/GetStream/stream-chat-react-native/issues/2653) [#2659](https://github.com/GetStream/stream-chat-react-native/issues/2659)
14+
15+
16+
### Bug Fixes
17+
18+
* dummy commit to trigger v6 release ([#2847](https://github.com/GetStream/stream-chat-react-native/issues/2847)) ([8b94767](https://github.com/GetStream/stream-chat-react-native/commit/8b94767f0295c60d59792f4f05bf9aa34c3c457c))
19+
320
### [5.44.2](https://github.com/GetStream/stream-chat-react-native/compare/v5.44.1...v5.44.2) (2024-12-10)
421

522

‎package/expo-package/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "stream-chat-expo",
33
"description": "The official Expo SDK for Stream Chat, a service for building chat applications",
4-
"version": "5.44.2",
4+
"version": "6.0.0",
55
"author": {
66
"company": "Stream.io Inc",
77
"name": "Stream.io Inc"
@@ -10,7 +10,7 @@
1010
"main": "src/index.js",
1111
"types": "types/index.d.ts",
1212
"dependencies": {
13-
"stream-chat-react-native-core": "5.44.2"
13+
"stream-chat-react-native-core": "6.0.0"
1414
},
1515
"peerDependencies": {
1616
"expo": ">=51.0.0",

‎package/expo-package/yarn.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,10 +1439,10 @@
14391439
find-up "^5.0.0"
14401440
js-yaml "^4.1.0"
14411441

1442-
"@gorhom/bottom-sheet@^4.6.4":
1443-
version "4.6.4"
1444-
resolved "https://registry.yarnpkg.com/@gorhom/bottom-sheet/-/bottom-sheet-4.6.4.tgz#387d0f0f21e3470eb8575498cb81ce96f5108e79"
1445-
integrity sha512-0itLMblLBvepE065w3a60S030c2rNUsGshPC7wbWDm31VyqoaU2xjzh/ojH62YIJOcobBr5QoC30IxBBKDGovQ==
1442+
"@gorhom/bottom-sheet@^5.0.6":
1443+
version "5.0.6"
1444+
resolved "https://registry.yarnpkg.com/@gorhom/bottom-sheet/-/bottom-sheet-5.0.6.tgz#f20736502399c7bcf8c73ea09e6b571dc07fe0eb"
1445+
integrity sha512-SI/AhPvgRfnCWN6/+wbE6TXwRE4X8F2fLyE4L/0bRwgE34Zenq585qLT139uEcfCIyovC2swC3ICqQpkmWEcFA==
14461446
dependencies:
14471447
"@gorhom/portal" "1.0.14"
14481448
invariant "^2.2.4"
@@ -5113,12 +5113,12 @@ [email protected], stream-buffers@~2.2.0:
51135113
resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4"
51145114
integrity sha512-uyQK/mx5QjHun80FLJTfaWE7JtwfRMKBLkMne6udYOmvH0CawotVa7TfgYHzAnpphn4+TweIx1QKMnRIbipmUg==
51155115

5116-
stream-chat-react-native-core@5.44.1:
5117-
version "5.44.1"
5118-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.44.1.tgz#0c4629ba01390574dabb963e2e805eb38602d2d4"
5119-
integrity sha512-cJqfsogmiTwK93kpPQhwaOl+whkH05JFl4k501r0VJbm6xlzv5eVb3NZfi6bX1z2xrILYHC5BFabM0RsX/xL/Q==
5116+
stream-chat-react-native-core@6.0.0:
5117+
version "6.0.0"
5118+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-6.0.0.tgz#77798c7082877572ef70223e1f799d22f0c78fe7"
5119+
integrity sha512-3cFao8iL2MjP7nhVRAl1vi526FbPlqUj4BHnYQ7sUNe+xb4z/HCEL6fKFh8kIfK5MEAacOQO4juPPQktoIf7zg==
51205120
dependencies:
5121-
"@gorhom/bottom-sheet" "^4.6.4"
5121+
"@gorhom/bottom-sheet" "^5.0.6"
51225122
dayjs "1.10.5"
51235123
emoji-regex "^10.3.0"
51245124
i18next "^21.6.14"

0 commit comments

Comments
 (0)