Skip to content

Commit ff2e947

Browse files
committed
chore: resolve conflicts from v6
2 parents 6b40415 + f3c3ee3 commit ff2e947

File tree

20 files changed

+186
-80
lines changed

20 files changed

+186
-80
lines changed

.github/workflows/check-pr.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ on:
55
branches:
66
- develop
77
- main
8-
- v6.0.0
98
- 'v[0-9]+.[0-9]+.[0-9]+*beta*'
109
types: [opened, synchronize]
1110

.github/workflows/docusaurus.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ on:
55
branches:
66
- main # default branch name for each repo that docs should be push from
77
- develop
8-
- v6.0.0
98
env:
10-
branch_map: '{"refs/heads/main": "production", "refs/heads/develop": "staging", "refs/heads/v6.0.0": "production"}'
9+
branch_map: '{"refs/heads/main": "production", "refs/heads/develop": "staging"}'
1110
jobs:
1211
push_docusaurus:
1312
runs-on: ubuntu-latest

.github/workflows/next-release.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches:
66
- develop
7-
- v6.0.0
87

98
jobs:
109
publish-next:

.github/workflows/sample-distribution.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
name: sample-distribution
22

3-
## TODO: Make sure to revert the changes here when moving this to main. We want them right now to be able to have the SampleApp live with V6.
4-
53
concurrency:
64
group: sample-distribution-${{ github.ref }}
75
cancel-in-progress: true
@@ -15,7 +13,7 @@ on:
1513

1614
jobs:
1715
build_and_deploy_ios_testflight_qa:
18-
name: Build SampleApp iOS and Deploy-${{ github.ref == 'refs/heads/v6.0.0' }}
16+
name: Build SampleApp iOS and Deploy-${{ github.ref == 'refs/heads/develop' }}
1917
runs-on: [macos-14]
2018
steps:
2119
- name: Connect Bot
@@ -40,14 +38,14 @@ jobs:
4038
bundle exec pod install
4139
- name: Build and release Testflight QA
4240
working-directory: examples/SampleApp
43-
run: bundle exec fastlane deploy_to_testflight_qa deploy:${{ github.ref == 'refs/heads/v6.0.0' }};
41+
run: bundle exec fastlane deploy_to_testflight_qa deploy:${{ github.ref == 'refs/heads/develop' }};
4442
env:
4543
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
4644
MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
4745
APPSTORE_API_KEY: ${{ secrets.APPSTORE_API_KEY }}
4846

4947
build_and_deploy_android_s3:
50-
name: Build SampleApp Android and Deploy-${{ github.ref == 'refs/heads/v6.0.0' }}
48+
name: Build SampleApp Android and Deploy-${{ github.ref == 'refs/heads/develop' }}
5149
runs-on: ubuntu-latest
5250
steps:
5351
- uses: actions/checkout@v2
@@ -68,13 +66,13 @@ jobs:
6866
rm -rf $HOME/.gradle/caches/ && ./gradlew assembleRelease
6967
- name: Configure AWS credentials
7068
uses: aws-actions/configure-aws-credentials@v1
71-
if: ${{ github.ref == 'refs/heads/v6.0.0' }}
69+
if: ${{ github.ref == 'refs/heads/develop' }}
7270
with:
7371
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
7472
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
7573
aws-region: us-east-1
7674
- name: Upload APK
77-
if: ${{ github.ref == 'refs/heads/v6.0.0' }}
75+
if: ${{ github.ref == 'refs/heads/develop' }}
7876
# https://getstream.io/downloads/rn-sample-app.apk
7977
run: |
8078
cp examples/SampleApp/android/app/build/outputs/apk/release/app-release.apk rn-sample-app.apk

.github/workflows/sdk-size-metrics.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ on:
99
branches:
1010
- develop
1111
- main
12-
- v6.0.0
1312

1413
env:
1514
HOMEBREW_NO_INSTALL_CLEANUP: 1 # Disable cleanup for homebrew, we don't need it on CI

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-452%20KB-blue)
13+
![JS Bundle Size](https://img.shields.io/badge/js_bundle_size-453%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/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.33.2](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.33.2) (2024-12-10)
4+
5+
6+
### Workspaces
7+
8+
* Following linked packages updated: [stream-chat-react-native]
9+
310
### [1.33.1](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.33.1) (2024-12-05)
411

512

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.1",
3+
"version": "1.33.2",
44
"private": true,
55
"repository": {
66
"type": "git",

package/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+
### [5.44.2](https://github.com/GetStream/stream-chat-react-native/compare/v5.44.1...v5.44.2) (2024-12-10)
4+
5+
6+
### Bug Fixes
7+
8+
* only disable message input ui when capabilities change ([#2836](https://github.com/GetStream/stream-chat-react-native/issues/2836)) ([8cc863d](https://github.com/GetStream/stream-chat-react-native/commit/8cc863de0a9b5fd9c641d8bcde352b7c10bd94f4))
9+
310
### [5.44.1](https://github.com/GetStream/stream-chat-react-native/compare/v5.44.0...v5.44.1) (2024-12-05)
411

512

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.1",
4+
"version": "5.44.2",
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.1"
13+
"stream-chat-react-native-core": "5.44.2"
1414
},
1515
"peerDependencies": {
1616
"expo": ">=51.0.0",

0 commit comments

Comments
 (0)