Skip to content

Commit 97a0491

Browse files
committed
chore: resolve conflicts from V8
2 parents 20713f0 + d680811 commit 97a0491

File tree

145 files changed

+11877
-11459
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+11877
-11459
lines changed

.github/workflows/check-pr.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
- develop
77
- main
88
- 'v[0-9]+.[0-9]+.[0-9]+*beta*'
9+
- V8
910
types: [opened, synchronize]
1011

1112
jobs:

.github/workflows/lint-pr-title.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
branches:
66
- develop
77
- 'v[0-9]+.[0-9]+.[0-9]+'
8+
- V8
89
types: [opened, edited, synchronize]
910

1011
jobs:

.github/workflows/next-release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- develop
7+
- V8
78

89
jobs:
910
publish-next:

.github/workflows/sample-distribution.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313

1414
jobs:
1515
build_and_deploy_ios_testflight_qa:
16-
name: Build SampleApp iOS and Deploy-${{ github.ref == 'refs/heads/develop' }}
16+
name: Build SampleApp iOS and Deploy-${{ github.ref == 'refs/heads/V8' }}
1717
runs-on: [macos-15]
1818
steps:
1919
- name: Connect Bot
@@ -34,18 +34,21 @@ jobs:
3434
- name: iOS Pods setup
3535
working-directory: examples/SampleApp/ios
3636
run: |
37-
pod update hermes-engine --no-repo-update
37+
rm -rf Pods
38+
rm -f Podfile.lock
39+
rm -rf build
40+
rm -rf ~/Library/Developer/Xcode/DerivedData
3841
bundle exec pod install
3942
- name: Build and release Testflight QA
4043
working-directory: examples/SampleApp
41-
run: bundle exec fastlane deploy_to_testflight_qa deploy:${{ github.ref == 'refs/heads/develop' }};
44+
run: bundle exec fastlane deploy_to_testflight_qa deploy:${{ github.ref == 'refs/heads/V8' }};
4245
env:
4346
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
4447
MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
4548
APPSTORE_API_KEY: ${{ secrets.APPSTORE_API_KEY }}
4649

4750
build_and_deploy_android_s3:
48-
name: Build SampleApp Android and Deploy-${{ github.ref == 'refs/heads/develop' }}
51+
name: Build SampleApp Android and Deploy-${{ github.ref == 'refs/heads/V8' }}
4952
runs-on: ubuntu-latest
5053
steps:
5154
- uses: actions/checkout@v2
@@ -66,13 +69,13 @@ jobs:
6669
rm -rf $HOME/.gradle/caches/ && ./gradlew assembleRelease
6770
- name: Configure AWS credentials
6871
uses: aws-actions/configure-aws-credentials@v1
69-
if: ${{ github.ref == 'refs/heads/develop' }}
72+
if: ${{ github.ref == 'refs/heads/V8' }}
7073
with:
7174
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
7275
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
7376
aws-region: us-east-1
7477
- name: Upload APK
75-
if: ${{ github.ref == 'refs/heads/develop' }}
78+
if: ${{ github.ref == 'refs/heads/V8' }}
7679
# https://getstream.io/downloads/rn-sample-app.apk
7780
run: |
7881
cp examples/SampleApp/android/app/build/outputs/apk/release/app-release.apk rn-sample-app.apk

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[![NPM](https://img.shields.io/npm/v/stream-chat-react-native.svg)](https://www.npmjs.com/package/stream-chat-react-native)
1111
[![Build Status](https://github.com/GetStream/stream-chat-react-native/actions/workflows/release.yml/badge.svg)](https://github.com/GetStream/stream-chat-react-native/actions)
1212
[![Component Reference](https://img.shields.io/badge/docs-component%20reference-blue.svg)](https://getstream.io/chat/docs/sdk/reactnative)
13-
![JS Bundle Size](https://img.shields.io/badge/js_bundle_size-459%20KB-blue)
13+
![JS Bundle Size](https://img.shields.io/badge/js_bundle_size-450%20KB-blue)
1414

1515
<img align="right" src="https://getstream.imgix.net/images/ios-chat-tutorial/[email protected]?auto=format,enhance" width="50%" />
1616

examples/ExpoMessaging/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ yarn install
2626
cd package && yarn install
2727
```
2828

29-
3. Move to the `expo-package` directory and install the dependencies:
29+
3. Move to the `package/expo-package` directory and install the dependencies:
3030

3131
```bash
3232
cd expo-package && yarn install
@@ -68,4 +68,4 @@ hermesEnabled=true
6868
# disables the check for multiple instances for gesture handler
6969
# this is needed for react-native-gesture-handler to be both a devDep of core and be a dep on the expo sample app
7070
disableMultipleInstancesCheck=true
71-
```
71+
```

examples/ExpoMessaging/app.json

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,25 @@
1515
"updates": {
1616
"fallbackToCacheTimeout": 0
1717
},
18-
"assetBundlePatterns": ["**/*"],
18+
"assetBundlePatterns": [
19+
"**/*"
20+
],
1921
"ios": {
2022
"supportsTablet": true,
2123
"usesIcloudStorage": true,
22-
"bundleIdentifier": "io.stream.expomessagingapp"
24+
"bundleIdentifier": "io.stream.expomessagingapp",
25+
"appleTeamId": "EHV7XZLAHA"
2326
},
2427
"android": {
2528
"package": "io.stream.expomessagingapp",
2629
"adaptiveIcon": {
2730
"foregroundImage": "./assets/adaptive-icon.png",
2831
"backgroundColor": "#ffffff"
29-
}
32+
},
33+
"permissions": [
34+
"android.permission.RECORD_AUDIO",
35+
"android.permission.MODIFY_AUDIO_SETTINGS"
36+
]
3037
},
3138
"web": {
3239
"favicon": "./assets/favicon.png",
@@ -44,16 +51,16 @@
4451
}
4552
],
4653
[
47-
"expo-av",
54+
"expo-video",
4855
{
49-
"microphonePermission": "$(PRODUCT_NAME) would like to use your microphone for voice recording."
56+
"supportsBackgroundPlayback": true,
57+
"supportsPictureInPicture": true
5058
}
5159
],
5260
[
53-
"expo-video",
61+
"expo-audio",
5462
{
55-
"supportsBackgroundPlayback": true,
56-
"supportsPictureInPicture": true
63+
"microphonePermission": "$(PRODUCT_NAME) would like to use your microphone for voice recording."
5764
}
5865
]
5966
]

examples/ExpoMessaging/app/channel/[cid]/index.tsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import React, { useContext, useEffect } from 'react';
1+
import React, { useContext } from 'react';
22
import { SafeAreaView, View } from 'react-native';
3-
import { Channel, MessageInput, MessageList, useAttachmentPickerContext } from 'stream-chat-expo';
3+
import { Channel, MessageInput, MessageList } from 'stream-chat-expo';
44
import { Stack, useRouter } from 'expo-router';
55
import { AuthProgressLoader } from '../../../components/AuthProgressLoader';
66
import { AppContext } from '../../../context/AppContext';
@@ -9,13 +9,8 @@ import { useHeaderHeight } from '@react-navigation/elements';
99
export default function ChannelScreen() {
1010
const router = useRouter();
1111
const { setThread, channel } = useContext(AppContext);
12-
const { setTopInset } = useAttachmentPickerContext();
1312
const headerHeight = useHeaderHeight();
1413

15-
useEffect(() => {
16-
setTopInset(headerHeight);
17-
}, [headerHeight, setTopInset]);
18-
1914
if (!channel) {
2015
return <AuthProgressLoader />;
2116
}

examples/ExpoMessaging/components/ChatWrapper.tsx

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { PropsWithChildren, useRef } from 'react';
1+
import React, { PropsWithChildren } from 'react';
22
import {
33
Chat,
44
OverlayProvider,
@@ -8,19 +8,17 @@ import {
88
} from 'stream-chat-expo';
99
import { AuthProgressLoader } from './AuthProgressLoader';
1010
import { STREAM_API_KEY, user, userToken } from '../constants';
11-
import { useSafeAreaInsets } from 'react-native-safe-area-context';
1211
import { useStreamChatTheme } from '../useStreamChatTheme';
1312

1413
const streami18n = new Streami18n({
1514
language: 'en',
1615
});
1716

1817
SqliteClient.logger = (level, message, extraData) => {
19-
console.log(level, `SqliteClient: ${message}`, extraData);
18+
// console.log(level, `SqliteClient: ${message}`, extraData);
2019
};
2120

2221
export const ChatWrapper = ({ children }: PropsWithChildren<{}>) => {
23-
const { bottom } = useSafeAreaInsets();
2422
const chatClient = useCreateChatClient({
2523
apiKey: STREAM_API_KEY,
2624
userData: user,
@@ -33,11 +31,7 @@ export const ChatWrapper = ({ children }: PropsWithChildren<{}>) => {
3331
}
3432

3533
return (
36-
<OverlayProvider
37-
bottomInset={bottom}
38-
i18nInstance={streami18n}
39-
value={{ style: theme }}
40-
>
34+
<OverlayProvider i18nInstance={streami18n} value={{ style: theme }}>
4135
<Chat client={chatClient} i18nInstance={streami18n}>
4236
{children}
4337
</Chat>

examples/ExpoMessaging/package.json

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,41 +10,41 @@
1010
"eject": "expo eject"
1111
},
1212
"dependencies": {
13-
"@op-engineering/op-sqlite": "^11.4.7",
13+
"@op-engineering/op-sqlite": "^14.0.4",
1414
"@react-native-community/netinfo": "11.4.1",
15-
"@react-navigation/elements": "^1.3.30",
16-
"expo": "~52.0.36",
17-
"expo-av": "~15.0.2",
18-
"expo-clipboard": "~7.0.1",
19-
"expo-constants": "~17.0.7",
20-
"expo-document-picker": "~13.0.3",
21-
"expo-file-system": "~18.0.11",
22-
"expo-haptics": "~14.0.1",
23-
"expo-image-manipulator": "~13.0.6",
24-
"expo-image-picker": "~16.0.6",
25-
"expo-linking": "~7.0.5",
26-
"expo-router": "~4.0.17",
27-
"expo-sharing": "~13.0.1",
28-
"expo-splash-screen": "~0.29.22",
29-
"expo-status-bar": "~2.0.1",
30-
"expo-video": "^2.0.5",
31-
"react": "18.3.1",
32-
"react-dom": "18.3.1",
33-
"react-native": "0.77.1",
34-
"react-native-gesture-handler": "~2.24.0",
35-
"react-native-reanimated": "~3.16.7",
36-
"react-native-safe-area-context": "5.2.0",
37-
"react-native-screens": "~4.8.0",
38-
"react-native-svg": "15.11.1",
39-
"react-native-web": "~0.19.13",
15+
"@react-navigation/elements": "^1.3.31",
16+
"expo": "^53.0.12",
17+
"expo-audio": "~0.4.6",
18+
"expo-clipboard": "~7.1.4",
19+
"expo-constants": "~17.1.6",
20+
"expo-document-picker": "~13.1.5",
21+
"expo-file-system": "~18.1.10",
22+
"expo-haptics": "~14.1.4",
23+
"expo-image-manipulator": "~13.1.7",
24+
"expo-image-picker": "~16.1.4",
25+
"expo-linking": "~7.1.5",
26+
"expo-router": "~5.1.0",
27+
"expo-sharing": "~13.1.5",
28+
"expo-splash-screen": "~0.30.9",
29+
"expo-status-bar": "~2.2.3",
30+
"expo-video": "~2.2.1",
31+
"react": "19.0.0",
32+
"react-dom": "19.0.0",
33+
"react-native": "0.79.3",
34+
"react-native-gesture-handler": "~2.26.0",
35+
"react-native-reanimated": "~3.17.4",
36+
"react-native-safe-area-context": "5.4.0",
37+
"react-native-screens": "~4.11.1",
38+
"react-native-svg": "15.11.2",
39+
"react-native-web": "^0.20.0",
4040
"stream-chat-expo": "link:../../package/expo-package",
4141
"stream-chat-react-native-core": "link:../../package",
42-
"typescript": "~5.7.3"
42+
"typescript": "~5.8.3"
4343
},
4444
"devDependencies": {
45-
"@babel/core": "^7.25.2",
46-
"@rnx-kit/metro-config": "^2.0.1",
47-
"@rnx-kit/metro-resolver-symlinks": "^0.2.1"
45+
"@babel/core": "^7.27.4",
46+
"@rnx-kit/metro-config": "^2.1.0",
47+
"@rnx-kit/metro-resolver-symlinks": "^0.2.5"
4848
},
4949
"resolutions": {
5050
"@types/react": "^19.0.0"

0 commit comments

Comments
 (0)