Skip to content

Commit a3583a0

Browse files
committed
chore: resolve conflicts from develop
2 parents 59bcab9 + 7ef7eac commit a3583a0

File tree

243 files changed

+9919
-8624
lines changed

Some content is hidden

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

243 files changed

+9919
-8624
lines changed

.github/workflows/changelog-preview.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
# pulls all tags (needed for semantic release to correctly version)
1919
- run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
2020
- name: Use Node.js ${{ matrix.node-version }}
21-
uses: actions/setup-node@v2
21+
uses: actions/setup-node@v4
2222
with:
2323
node-version: ${{ matrix.node-version }}
2424
registry-url: 'https://registry.npmjs.org'

.github/workflows/check-pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ jobs:
1313
runs-on: ubuntu-latest
1414
strategy:
1515
matrix:
16-
node-version: [18.x]
16+
node-version: [22.x]
1717
steps:
1818
- uses: actions/checkout@v3
1919
with:
2020
# Disabling shallow clone is recommended for improving relevancy of reporting
2121
fetch-depth: 0
2222
- name: Use Node.js ${{ matrix.node-version }}
23-
uses: actions/setup-node@v3
23+
uses: actions/setup-node@v4
2424
with:
2525
node-version: ${{ matrix.node-version }}
2626
- name: Install && Build - SDK and Sample App

.github/workflows/next-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
node-version: [18.x]
13+
node-version: [22.x]
1414
steps:
1515
- uses: actions/checkout@v2
1616
with:
@@ -19,7 +19,7 @@ jobs:
1919
# pulls all tags (needed for semantic release to correctly version)
2020
- run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
2121
- name: Use Node.js ${{ matrix.node-version }}
22-
uses: actions/setup-node@v2
22+
uses: actions/setup-node@v4
2323
with:
2424
node-version: ${{ matrix.node-version }}
2525
registry-url: 'https://registry.npmjs.org'

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
node-version: [18.x]
13+
node-version: [22.x]
1414
steps:
1515
- uses: actions/checkout@v2
1616
with:
@@ -20,7 +20,7 @@ jobs:
2020
# pulls all tags (needed for semantic release to correctly version)
2121
- run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
2222
- name: Use Node.js ${{ matrix.node-version }}
23-
uses: actions/setup-node@v2
23+
uses: actions/setup-node@v4
2424
with:
2525
node-version: ${{ matrix.node-version }}
2626
registry-url: 'https://registry.npmjs.org'

.github/workflows/sample-distribution.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Install && Build - SDK and Sample App
2626
uses: ./.github/actions/install-and-build-sdk
2727
- name: Cache iOS pods
28-
uses: actions/cache@v2
28+
uses: actions/cache@v4
2929
with:
3030
path: examples/SampleApp/ios/Pods
3131
key: ${{ runner.os }}-pods-${{ hashFiles('examples/SampleApp/ios/Podfile.lock') }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ jobs:
2727

2828
- uses: ./.github/actions/ruby-cache
2929

30-
- uses: actions/setup-node@v3
30+
- uses: actions/setup-node@v4
3131
with:
32-
node-version: 18.x
32+
node-version: 22.x
3333
cache: 'yarn'
3434

3535
- name: Run SDK Size Metrics

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v20
1+
v22

examples/ExpoMessaging/package.json

Lines changed: 17 additions & 17 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.2",
13+
"@op-engineering/op-sqlite": "^11.4.7",
1414
"@react-native-community/netinfo": "11.4.1",
1515
"@react-navigation/elements": "^1.3.30",
16-
"expo": "~52.0.20",
16+
"expo": "~52.0.36",
1717
"expo-av": "~15.0.2",
1818
"expo-clipboard": "~7.0.1",
19-
"expo-constants": "~17.0.5",
20-
"expo-document-picker": "~13.0.2",
21-
"expo-file-system": "~18.0.7",
19+
"expo-constants": "~17.0.7",
20+
"expo-document-picker": "~13.0.3",
21+
"expo-file-system": "~18.0.11",
2222
"expo-haptics": "~14.0.1",
2323
"expo-image-manipulator": "~13.0.6",
24-
"expo-image-picker": "~16.0.4",
24+
"expo-image-picker": "~16.0.6",
2525
"expo-linking": "~7.0.5",
26-
"expo-media-library": "~17.0.5",
26+
"expo-media-library": "~17.0.6",
2727
"expo-router": "~4.0.17",
2828
"expo-sharing": "~13.0.1",
29-
"expo-splash-screen": "~0.29.21",
29+
"expo-splash-screen": "~0.29.22",
3030
"expo-status-bar": "~2.0.1",
3131
"react": "18.3.1",
3232
"react-dom": "18.3.1",
33-
"react-native": "0.76.6",
34-
"react-native-gesture-handler": "~2.20.2",
35-
"react-native-reanimated": "~3.16.1",
36-
"react-native-safe-area-context": "4.12.0",
37-
"react-native-screens": "~4.4.0",
38-
"react-native-svg": "15.8.0",
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",
3939
"react-native-web": "~0.19.13",
4040
"stream-chat-expo": "link:../../package/expo-package",
4141
"stream-chat-react-native-core": "link:../../package",
42-
"typescript": "~5.3.3"
42+
"typescript": "~5.7.3"
4343
},
4444
"devDependencies": {
4545
"@babel/core": "^7.25.2",
46-
"@rnx-kit/metro-config": "^1.3.15",
47-
"@rnx-kit/metro-resolver-symlinks": "^0.1.35"
46+
"@rnx-kit/metro-config": "^2.0.1",
47+
"@rnx-kit/metro-resolver-symlinks": "^0.2.1"
4848
},
4949
"private": true
5050
}

0 commit comments

Comments
 (0)