Skip to content

Commit 01efbed

Browse files
authored
Merge pull request #49 from sendbird/feat/upgrade-react-native-version
feat/upgrade-react-native-version
2 parents f6f0c1c + c4b63a6 commit 01efbed

Some content is hidden

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

50 files changed

+4553
-4885
lines changed

.circleci/config.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2.1
33
executors:
44
default:
55
docker:
6-
- image: cimg/node:16.14.0
6+
- image: cimg/node:18.20.5
77
working_directory: ~/project
88

99
commands:
@@ -64,6 +64,15 @@ jobs:
6464
command: |
6565
yarn typescript
6666
67+
sample-typescript:
68+
executor: default
69+
steps:
70+
- attach_project
71+
- run:
72+
name: Typecheck sample files
73+
command: |
74+
yarn sample:tsc
75+
6776
unit-tests:
6877
executor: default
6978
steps:
@@ -95,6 +104,9 @@ workflows:
95104
- typescript:
96105
requires:
97106
- install-dependencies
107+
- sample-typescript:
108+
requires:
109+
- install-dependencies
98110
- unit-tests:
99111
requires:
100112
- install-dependencies

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,4 @@ lib/
6565

6666
env.ts
6767
src/version.ts
68+
/package-lock.json

ios/RNSendbirdCalls.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ @interface RCT_EXTERN_MODULE(RNSendbirdCalls, NSObject)
143143
: (NSString *)callId
144144
: (NSNumber *)videoViewId)
145145

146-
RCT_EXTERN_METHOD(updateRemmoteVideoView
146+
RCT_EXTERN_METHOD(updateRemoteVideoView
147147
: (NSString *)callId
148148
: (NSNumber *)videoViewId)
149149

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"release": "release-it",
3434
"release:local": "npx yalc publish",
3535
"sample": "yarn --cwd sample",
36+
"sample:tsc": "cd sample && npx tsc --noEmit",
3637
"pods": "cd sample && pod-install --quiet",
3738
"bootstrap": "yarn sample && yarn && yarn pods",
3839
"lint": "yarn lint:eslint && yarn lint:prettier",

sample/.gitignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,12 @@ buck-out/
5959
# Ruby / CocoaPods
6060
/ios/Pods/
6161
/vendor/bundle/
62+
/ios/.xcode.env.local
63+
/ios/Podfile.lock
64+
.pnp.*
65+
.yarn/*
66+
!.yarn/patches
67+
!.yarn/plugins
68+
!.yarn/releases
69+
!.yarn/sdks
70+
!.yarn/versions

sample/Gemfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
source 'https://rubygems.org'
22

33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
4-
ruby '2.7.4'
4+
ruby ">= 2.6.10"
55

6-
gem 'cocoapods', '~> 1.11', '>= 1.11.2'
6+
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
7+
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
8+
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'

sample/Gemfile.lock

Lines changed: 48 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,53 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.5)
4+
CFPropertyList (3.0.7)
5+
base64
6+
nkf
57
rexml
6-
activesupport (6.1.5)
8+
activesupport (7.1.5.1)
9+
base64
10+
benchmark (>= 0.3)
11+
bigdecimal
712
concurrent-ruby (~> 1.0, >= 1.0.2)
13+
connection_pool (>= 2.2.5)
14+
drb
815
i18n (>= 1.6, < 2)
16+
logger (>= 1.4.2)
917
minitest (>= 5.1)
18+
mutex_m
19+
securerandom (>= 0.3)
1020
tzinfo (~> 2.0)
11-
zeitwerk (~> 2.3)
12-
addressable (2.8.0)
13-
public_suffix (>= 2.0.2, < 5.0)
21+
addressable (2.8.7)
22+
public_suffix (>= 2.0.2, < 7.0)
1423
algoliasearch (1.27.5)
1524
httpclient (~> 2.8, >= 2.8.3)
1625
json (>= 1.5.1)
1726
atomos (0.1.3)
27+
base64 (0.2.0)
28+
benchmark (0.4.0)
29+
bigdecimal (3.1.9)
1830
claide (1.1.0)
19-
cocoapods (1.11.3)
31+
cocoapods (1.16.2)
2032
addressable (~> 2.8)
2133
claide (>= 1.0.2, < 2.0)
22-
cocoapods-core (= 1.11.3)
34+
cocoapods-core (= 1.16.2)
2335
cocoapods-deintegrate (>= 1.0.3, < 2.0)
24-
cocoapods-downloader (>= 1.4.0, < 2.0)
36+
cocoapods-downloader (>= 2.1, < 3.0)
2537
cocoapods-plugins (>= 1.0.0, < 2.0)
2638
cocoapods-search (>= 1.0.0, < 2.0)
27-
cocoapods-trunk (>= 1.4.0, < 2.0)
39+
cocoapods-trunk (>= 1.6.0, < 2.0)
2840
cocoapods-try (>= 1.1.0, < 2.0)
2941
colored2 (~> 3.1)
3042
escape (~> 0.0.4)
3143
fourflusher (>= 2.3.0, < 3.0)
3244
gh_inspector (~> 1.0)
3345
molinillo (~> 0.8.0)
3446
nap (~> 1.0)
35-
ruby-macho (>= 1.0, < 3.0)
36-
xcodeproj (>= 1.21.0, < 2.0)
37-
cocoapods-core (1.11.3)
38-
activesupport (>= 5.0, < 7)
47+
ruby-macho (>= 2.3.0, < 3.0)
48+
xcodeproj (>= 1.27.0, < 2.0)
49+
cocoapods-core (1.16.2)
50+
activesupport (>= 5.0, < 8)
3951
addressable (~> 2.8)
4052
algoliasearch (~> 1.0)
4153
concurrent-ruby (~> 1.1)
@@ -45,7 +57,7 @@ GEM
4557
public_suffix (~> 4.0)
4658
typhoeus (~> 1.0)
4759
cocoapods-deintegrate (1.0.5)
48-
cocoapods-downloader (1.6.3)
60+
cocoapods-downloader (2.1)
4961
cocoapods-plugins (1.0.0)
5062
nap
5163
cocoapods-search (1.0.1)
@@ -54,44 +66,50 @@ GEM
5466
netrc (~> 0.11)
5567
cocoapods-try (1.2.0)
5668
colored2 (3.1.2)
57-
concurrent-ruby (1.1.10)
69+
concurrent-ruby (1.3.4)
70+
connection_pool (2.5.0)
71+
drb (2.2.1)
5872
escape (0.0.4)
59-
ethon (0.15.0)
73+
ethon (0.16.0)
6074
ffi (>= 1.15.0)
61-
ffi (1.15.5)
75+
ffi (1.17.1-arm64-darwin)
6276
fourflusher (2.3.1)
6377
fuzzy_match (2.0.4)
6478
gh_inspector (1.1.3)
6579
httpclient (2.8.3)
66-
i18n (1.10.0)
80+
i18n (1.14.6)
6781
concurrent-ruby (~> 1.0)
68-
json (2.6.1)
69-
minitest (5.15.0)
82+
json (2.9.1)
83+
logger (1.6.5)
84+
minitest (5.25.4)
7085
molinillo (0.8.0)
71-
nanaimo (0.3.0)
86+
mutex_m (0.3.0)
87+
nanaimo (0.4.0)
7288
nap (1.1.0)
7389
netrc (0.11.0)
74-
public_suffix (4.0.6)
75-
rexml (3.2.5)
90+
nkf (0.2.0)
91+
public_suffix (4.0.7)
92+
rexml (3.4.0)
7693
ruby-macho (2.5.1)
77-
typhoeus (1.4.0)
94+
securerandom (0.3.2)
95+
typhoeus (1.4.1)
7896
ethon (>= 0.9.0)
79-
tzinfo (2.0.4)
97+
tzinfo (2.0.6)
8098
concurrent-ruby (~> 1.0)
81-
xcodeproj (1.21.0)
99+
xcodeproj (1.27.0)
82100
CFPropertyList (>= 2.3.3, < 4.0)
83101
atomos (~> 0.1.3)
84102
claide (>= 1.0.2, < 2.0)
85103
colored2 (~> 3.1)
86-
nanaimo (~> 0.3.0)
87-
rexml (~> 3.2.4)
88-
zeitwerk (2.5.4)
104+
nanaimo (~> 0.4.0)
105+
rexml (>= 3.3.6, < 4.0)
89106

90107
PLATFORMS
91108
ruby
92109

93110
DEPENDENCIES
94-
cocoapods (~> 1.11, >= 1.11.2)
111+
activesupport (>= 6.1.7.5, != 7.1.0)
112+
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
95113

96114
RUBY VERSION
97115
ruby 2.7.4p191

0 commit comments

Comments
 (0)