Skip to content

Commit 42864f1

Browse files
committed
Merge branch 'develop' into mads/upgrade-expo
# Conflicts: # examples/ExpoMessaging/ios/Podfile.lock # examples/ExpoMessaging/yarn.lock # package/expo-package/yarn.lock
2 parents 4c6296b + 27f964d commit 42864f1

File tree

30 files changed

+188
-558
lines changed

30 files changed

+188
-558
lines changed

PULL_REQUEST_TEMPLATE.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,9 @@
6666

6767
- [ ] I have signed the [Stream CLA](https://docs.google.com/forms/d/e/1FAIpQLScFKsKkAJI7mhCr7K9rEIOpqIDThrWxuvxnwUq2XkHyG154vQ/viewform) (required)
6868
- [ ] PR targets the `develop` branch
69-
- [ ] Commits follow the [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/) spec
70-
- [ ] New code is covered by tests
71-
- [ ] Screenshots added for visual changes
7269
- [ ] Documentation is updated
70+
- [ ] New code is tested in main example apps, including all possible scenarios
71+
- [ ] SampleApp iOS and Android
72+
- [ ] Expo iOS and Android
73+
7374

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Besides, our team maintains a dedicated repository for fully-fledged sample appl
6161

6262
2. Minor releases may come with some breaking changes, so always check the release notes before upgrading the minor version.
6363

64-
You can see detailed documentation about the components at <https://getstream.github.io/stream-chat-react-native>
64+
You can see detailed documentation about the components at <https://getstream.io/chat/docs/sdk/reactnative/>
6565

6666
## 👏 Contributing
6767

docusaurus/docs/reactnative/basics/troubleshooting.mdx

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,13 +214,18 @@ android {
214214
Opening an external link doesn't work without permissions on `targetSdkVersion` >= 30. So, the following permission must be included in the `AndroidManifest.xml` file.
215215

216216
```xml
217-
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
217+
<queries>
218+
<intent>
219+
<action android:name="android.intent.action.VIEW" />
220+
<data android:scheme="http" android:host="*" />
221+
</intent>
222+
<intent>
223+
<action android:name="android.intent.action.VIEW" />
224+
<data android:scheme="https" android:host="*" />
225+
</intent>
226+
</queries>
218227
```
219228

220-
:::caution
221-
**Note:** Make sure you are aware of [upcoming policies](https://support.google.com/googleplay/android-developer/answer/10158779) that this change will be subjected to.
222-
:::
223-
224229
## GIF and WebP not displaying
225230

226231
### Android

examples/ExpoMessaging/ios/Podfile.lock

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ PODS:
33
- DoubleConversion (1.1.6)
44
- EXApplication (4.0.2):
55
- ExpoModulesCore
6-
- EXAV (10.2.1):
7-
- ExpoModulesCore
8-
- ReactCommon/turbomodule/core
96
- EXBlur (11.0.0):
107
- ExpoModulesCore
118
- EXConstants (13.0.2):
@@ -353,7 +350,6 @@ PODS:
353350
DEPENDENCIES:
354351
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
355352
- EXApplication (from `../node_modules/expo-application/ios`)
356-
- EXAV (from `../node_modules/expo-av/ios`)
357353
- EXBlur (from `../node_modules/expo-blur/ios`)
358354
- EXConstants (from `../node_modules/expo-constants/ios`)
359355
- EXDocumentPicker (from `../node_modules/expo-document-picker/ios`)
@@ -415,8 +411,6 @@ EXTERNAL SOURCES:
415411
:podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
416412
EXApplication:
417413
:path: "../node_modules/expo-application/ios"
418-
EXAV:
419-
:path: "../node_modules/expo-av/ios"
420414
EXBlur:
421415
:path: "../node_modules/expo-blur/ios"
422416
EXConstants:
@@ -520,7 +514,6 @@ SPEC CHECKSUMS:
520514
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
521515
DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
522516
EXApplication: 54fe5bd6268d697771645e8f1aef8b806a65247a
523-
EXAV: b9ed0c201092244c46aa78f907f5c66176bed236
524517
EXBlur: 82055865de17cf2cf797ff064c50fb59fcbe703f
525518
EXConstants: 88bf79622fbd9b476c96d8ec57fe97ca44fe8e3c
526519
EXDocumentPicker: d3eb6a207e1f370e496bea959b3ac145126560f5
@@ -537,7 +530,7 @@ SPEC CHECKSUMS:
537530
EXSharing: 328228a9f14503cfdec68892796478a7a15b8d4d
538531
EXSplashScreen: 21669e598804ee810547dbb6692c8deb5dd8dbf3
539532
FBLazyVector: c71c5917ec0ad2de41d5d06a5855f6d5eda06971
540-
FBReactNativeSpec: 930f93628736d9ceda5877ffd82a5d16e4f59a92
533+
FBReactNativeSpec: 75f96b4f31372bd31374ad070b12c4b6c884ad4c
541534
glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
542535
RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c
543536
RCTRequired: d34bf57e17cb6e3b2681f4809b13843c021feb6c
@@ -573,4 +566,4 @@ SPEC CHECKSUMS:
573566

574567
PODFILE CHECKSUM: 8089780b20a2c230f15d6573003c7a651b171fa4
575568

576-
COCOAPODS: 1.11.2
569+
COCOAPODS: 1.11.3

examples/ExpoMessaging/yarn.lock

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1682,27 +1682,6 @@
16821682
xcode "^3.0.1"
16831683
xml2js "0.4.23"
16841684

1685-
"@expo/config-plugins@^4.0.14":
1686-
version "4.1.5"
1687-
resolved "https://registry.yarnpkg.com/@expo/config-plugins/-/config-plugins-4.1.5.tgz#9d357d2cda9c095e511b51583ede8a3b76174068"
1688-
integrity sha512-RVvU40RtZt12HavuDAe+LDIq9lHj7sheOfMEHdmpJ/uTA8pgvkbc56XF6JHQD+yRr6+uhhb+JnAasGq49dsQbw==
1689-
dependencies:
1690-
"@expo/config-types" "^45.0.0"
1691-
"@expo/json-file" "8.2.36"
1692-
"@expo/plist" "0.0.18"
1693-
"@expo/sdk-runtime-versions" "^1.0.0"
1694-
"@react-native/normalize-color" "^2.0.0"
1695-
chalk "^4.1.2"
1696-
debug "^4.3.1"
1697-
find-up "~5.0.0"
1698-
getenv "^1.0.0"
1699-
glob "7.1.6"
1700-
resolve-from "^5.0.0"
1701-
semver "^7.3.5"
1702-
slash "^3.0.0"
1703-
xcode "^3.0.1"
1704-
xml2js "0.4.23"
1705-
17061685
"@expo/config-types@^43.0.1":
17071686
version "43.0.1"
17081687
resolved "https://registry.yarnpkg.com/@expo/config-types/-/config-types-43.0.1.tgz#3e047dccb371741a540980eaff26fb0c95039c30"
@@ -1713,11 +1692,6 @@
17131692
resolved "https://registry.yarnpkg.com/@expo/config-types/-/config-types-44.0.0.tgz#d3480fe2c99f9e895dae4ebba58b74ed72d03e26"
17141693
integrity sha512-d+gpdKOAhqaD5RmcMzGgKzNtvE1w+GCqpFQNSXLliYlXjj+Tv0eL8EPeAdPtvke0vowpPFwd5McXLA90dgY6Jg==
17151694

1716-
"@expo/config-types@^45.0.0":
1717-
version "45.0.0"
1718-
resolved "https://registry.yarnpkg.com/@expo/config-types/-/config-types-45.0.0.tgz#963c2fdce8fbcbd003758b92ed8a25375f437ef6"
1719-
integrity sha512-/QGhhLWyaGautgEyU50UJr5YqKJix5t77ePTwreOVAhmZH+ff3nrrtYTTnccx+qF08ZNQmfAyYMCD3rQfzpiJA==
1720-
17211695
"@expo/[email protected]", "@expo/config@^6.0.6":
17221696
version "6.0.19"
17231697
resolved "https://registry.yarnpkg.com/@expo/config/-/config-6.0.19.tgz#26a7f7ffb6419cc6e6d4205b3c7764aa9ecb551a"
@@ -1801,15 +1775,6 @@
18011775
json5 "^1.0.1"
18021776
write-file-atomic "^2.3.0"
18031777

1804-
1805-
version "8.2.36"
1806-
resolved "https://registry.yarnpkg.com/@expo/json-file/-/json-file-8.2.36.tgz#62a505cb7f30a34d097386476794680a3f7385ff"
1807-
integrity sha512-tOZfTiIFA5KmMpdW9KF7bc6CFiGjb0xnbieJhTGlHrLL+ps2G0OkqmuZ3pFEXBOMnJYUVpnSy++52LFxvpa5ZQ==
1808-
dependencies:
1809-
"@babel/code-frame" "~7.10.4"
1810-
json5 "^1.0.1"
1811-
write-file-atomic "^2.3.0"
1812-
18131778
"@expo/metro-config@~0.2.6":
18141779
version "0.2.8"
18151780
resolved "https://registry.yarnpkg.com/@expo/metro-config/-/metro-config-0.2.8.tgz#c0fd56723e2fb9bb352e788e8f8fe0e218aaf663"
@@ -1839,15 +1804,6 @@
18391804
base64-js "^1.2.3"
18401805
xmlbuilder "^14.0.0"
18411806

1842-
1843-
version "0.0.18"
1844-
resolved "https://registry.yarnpkg.com/@expo/plist/-/plist-0.0.18.tgz#9abcde78df703a88f6d9fa1a557ee2f045d178b0"
1845-
integrity sha512-+48gRqUiz65R21CZ/IXa7RNBXgAI/uPSdvJqoN9x1hfL44DNbUoWHgHiEXTx7XelcATpDwNTz6sHLfy0iNqf+w==
1846-
dependencies:
1847-
"@xmldom/xmldom" "~0.7.0"
1848-
base64-js "^1.2.3"
1849-
xmlbuilder "^14.0.0"
1850-
18511807
"@expo/prebuild-config@^3.0.15":
18521808
version "3.1.0"
18531809
resolved "https://registry.yarnpkg.com/@expo/prebuild-config/-/prebuild-config-3.1.0.tgz#9fa10f12745ecaa6d3d4957ba97142edb8747a85"
@@ -3522,20 +3478,6 @@ expo-asset@~8.4.6:
35223478
path-browserify "^1.0.0"
35233479
url-parse "^1.4.4"
35243480

3525-
expo-av@^11.2.3:
3526-
version "11.2.3"
3527-
resolved "https://registry.yarnpkg.com/expo-av/-/expo-av-11.2.3.tgz#254242dae76e3cd60ef9d9c33618e4a12d37aa33"
3528-
integrity sha512-ptTe96s33Ct0eOsOmNTvtaWFx4B0SDkQmDfPbiuX/C2afqbLQf8geEopw7BRO8ZZl7Qe3qBMH6YLHXKTkZkTyQ==
3529-
dependencies:
3530-
"@expo/config-plugins" "^4.0.14"
3531-
3532-
expo-av@~10.2.0:
3533-
version "10.2.1"
3534-
resolved "https://registry.yarnpkg.com/expo-av/-/expo-av-10.2.1.tgz#c08bce464d673d0e90c68cac082bfb75a9437f25"
3535-
integrity sha512-thrkHVg4HVn8L+jHKVnXYd4TLkJQblFE8QXd3d1hwrYG63gehQT2nK4DM0Frl50EcdV8YN9XjhwHobtK5oMc9A==
3536-
dependencies:
3537-
"@expo/config-plugins" "^4.0.2"
3538-
35393481
expo-blur@~11.0.0:
35403482
version "11.0.0"
35413483
resolved "https://registry.yarnpkg.com/expo-blur/-/expo-blur-11.0.0.tgz#3542afed5c0037554657d98c31a5933dd78098dd"

examples/SampleApp/CHANGELOG.md

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

3+
### [1.7.3](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.7.3) (2022-06-22)
4+
5+
6+
### Workspaces
7+
8+
* Following linked packages updated: [stream-chat-react-native]
9+
310
### [1.7.2](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.7.2) (2022-06-17)
411

512

examples/SampleApp/android/app/src/main/AndroidManifest.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,19 @@
44
<uses-permission android:name="android.permission.INTERNET" />
55
<uses-permission android:name="android.permission.CAMERA" />
66
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
7-
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
87
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
98

9+
<queries>
10+
<intent>
11+
<action android:name="android.intent.action.VIEW" />
12+
<data android:scheme="http" android:host="*" />
13+
</intent>
14+
<intent>
15+
<action android:name="android.intent.action.VIEW" />
16+
<data android:scheme="https" android:host="*" />
17+
</intent>
18+
</queries>
19+
1020
<application
1121
android:usesCleartextTraffic="true"
1222
android:name=".MainApplication"

examples/SampleApp/ios/SampleApp.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@
514514
CLANG_ENABLE_MODULES = YES;
515515
CODE_SIGN_ENTITLEMENTS = SampleApp/SampleAppDebug.entitlements;
516516
CODE_SIGN_IDENTITY = "iPhone Developer";
517-
CURRENT_PROJECT_VERSION = 122;
517+
CURRENT_PROJECT_VERSION = 126;
518518
DEVELOPMENT_TEAM = EHV7XZLAHA;
519519
ENABLE_BITCODE = NO;
520520
INFOPLIST_FILE = SampleApp/Info.plist;
@@ -545,7 +545,7 @@
545545
CODE_SIGN_ENTITLEMENTS = SampleApp/SampleAppRelease.entitlements;
546546
CODE_SIGN_IDENTITY = "iPhone Distribution";
547547
CODE_SIGN_STYLE = Manual;
548-
CURRENT_PROJECT_VERSION = 122;
548+
CURRENT_PROJECT_VERSION = 126;
549549
DEVELOPMENT_TEAM = EHV7XZLAHA;
550550
INFOPLIST_FILE = SampleApp/Info.plist;
551551
LD_RUNPATH_SEARCH_PATHS = (

examples/SampleApp/ios/SampleApp/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.7.2</string>
20+
<string>1.7.3</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>
24-
<string>122</string>
24+
<string>126</string>
2525
<key>LSRequiresIPhoneOS</key>
2626
<true />
2727
<key>NSAppTransportSecurity</key>

examples/SampleApp/ios/SampleAppTests/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.7.2</string>
18+
<string>1.7.3</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>122</string>
22+
<string>126</string>
2323
</dict>
2424
</plist>

0 commit comments

Comments
 (0)