Skip to content

Commit 5bd2188

Browse files
feat: update dogfood to rn 76 (#1584)
## Setup remove the podfile lock from iOS first, as repos are out of date now ``` bundle install yarn bundle exec pod install --project-directory=ios ``` **Note:** Android studio must be updated if you want to run android app from there, since we have updated the gradle version in this PR. ## Whats new - App runs in new architecture + bridgeless mode, webrtc SDK and its deps run in interop mode ### Devtools ![Screenshot 2024-11-21 at 09 44 30](https://github.com/user-attachments/assets/0d894e30-179f-4d64-bddc-227b2c7dcaa4) --------- Co-authored-by: Oliver Lazoroski <oliver.lazoroski@gmail.com>
1 parent 380b0a3 commit 5bd2188

File tree

28 files changed

+4414
-2267
lines changed

28 files changed

+4414
-2267
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
REACT_NATIVE_DOGFOOD_APP_ENVIRONMENT=pronto

sample-apps/react-native/dogfood/.gitignore

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ DerivedData
2020
*.hmap
2121
*.ipa
2222
*.xcuserstate
23-
ios/.xcode.env.local
23+
**/.xcode.env.local
2424

2525
# Android/IntelliJ
2626
#
@@ -58,7 +58,7 @@ yarn-error.log
5858
*.jsbundle
5959

6060
# Ruby / CocoaPods
61-
/ios/Pods/
61+
**/Pods/
6262
/vendor/bundle/
6363

6464
# Temporary files created by Metro to check the health of the file watcher
@@ -72,3 +72,11 @@ yarn-error.log
7272
.env.production
7373
.env.development
7474
.env.test
75+
76+
# Yarn
77+
.yarn/*
78+
!.yarn/patches
79+
!.yarn/plugins
80+
!.yarn/releases
81+
!.yarn/sdks
82+
!.yarn/versions

sample-apps/react-native/dogfood/.node-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

sample-apps/react-native/dogfood/.nvmrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

sample-apps/react-native/dogfood/Gemfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ source 'https://rubygems.org'
33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
44
ruby '>= 2.6.10'
55

6-
# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
7-
# bound in the template on Cocoapods with next React Native release.
8-
gem 'cocoapods', '>= 1.13', '< 1.15'
9-
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
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'
9+
gem 'xcodeproj', '< 1.26.0'
10+
1011
gem 'fastlane'
1112

1213
# Rubocop gems are needed to lint the Fastfile and other Ruby files

sample-apps/react-native/dogfood/Gemfile.lock

Lines changed: 60 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,18 @@ GEM
55
base64
66
nkf
77
rexml
8-
activesupport (7.0.8)
9-
concurrent-ruby (~> 1.0, >= 1.0.2)
8+
activesupport (7.2.2)
9+
base64
10+
benchmark (>= 0.3)
11+
bigdecimal
12+
concurrent-ruby (~> 1.0, >= 1.3.1)
13+
connection_pool (>= 2.2.5)
14+
drb
1015
i18n (>= 1.6, < 2)
16+
logger (>= 1.4.2)
1117
minitest (>= 5.1)
12-
tzinfo (~> 2.0)
18+
securerandom (>= 0.3)
19+
tzinfo (~> 2.0, >= 2.0.5)
1320
addressable (2.8.7)
1421
public_suffix (>= 2.0.2, < 7.0)
1522
algoliasearch (1.27.5)
@@ -19,28 +26,30 @@ GEM
1926
ast (2.4.2)
2027
atomos (0.1.3)
2128
aws-eventstream (1.3.0)
22-
aws-partitions (1.962.0)
23-
aws-sdk-core (3.201.3)
29+
aws-partitions (1.1011.0)
30+
aws-sdk-core (3.213.0)
2431
aws-eventstream (~> 1, >= 1.3.0)
25-
aws-partitions (~> 1, >= 1.651.0)
26-
aws-sigv4 (~> 1.8)
32+
aws-partitions (~> 1, >= 1.992.0)
33+
aws-sigv4 (~> 1.9)
2734
jmespath (~> 1, >= 1.6.1)
28-
aws-sdk-kms (1.88.0)
29-
aws-sdk-core (~> 3, >= 3.201.0)
35+
aws-sdk-kms (1.96.0)
36+
aws-sdk-core (~> 3, >= 3.210.0)
3037
aws-sigv4 (~> 1.5)
31-
aws-sdk-s3 (1.157.0)
32-
aws-sdk-core (~> 3, >= 3.201.0)
38+
aws-sdk-s3 (1.172.0)
39+
aws-sdk-core (~> 3, >= 3.210.0)
3340
aws-sdk-kms (~> 1)
3441
aws-sigv4 (~> 1.5)
35-
aws-sigv4 (1.9.1)
42+
aws-sigv4 (1.10.1)
3643
aws-eventstream (~> 1, >= 1.0.2)
3744
babosa (1.0.4)
3845
base64 (0.2.0)
46+
benchmark (0.4.0)
47+
bigdecimal (3.1.8)
3948
claide (1.1.0)
40-
cocoapods (1.14.3)
49+
cocoapods (1.15.2)
4150
addressable (~> 2.8)
4251
claide (>= 1.0.2, < 2.0)
43-
cocoapods-core (= 1.14.3)
52+
cocoapods-core (= 1.15.2)
4453
cocoapods-deintegrate (>= 1.0.3, < 2.0)
4554
cocoapods-downloader (>= 2.1, < 3.0)
4655
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -55,7 +64,7 @@ GEM
5564
nap (~> 1.0)
5665
ruby-macho (>= 2.3.0, < 3.0)
5766
xcodeproj (>= 1.23.0, < 2.0)
58-
cocoapods-core (1.14.3)
67+
cocoapods-core (1.15.2)
5968
activesupport (>= 5.0, < 8)
6069
addressable (~> 2.8)
6170
algoliasearch (~> 1.0)
@@ -78,18 +87,20 @@ GEM
7887
colored2 (3.1.2)
7988
commander (4.6.0)
8089
highline (~> 2.0.0)
81-
concurrent-ruby (1.2.3)
90+
concurrent-ruby (1.3.4)
91+
connection_pool (2.4.1)
8292
declarative (0.0.20)
8393
digest-crc (0.6.5)
8494
rake (>= 12.0.0, < 14.0.0)
8595
domain_name (0.6.20240107)
8696
dotenv (2.8.1)
97+
drb (2.2.1)
8798
emoji_regex (3.2.3)
8899
escape (0.0.4)
89100
ethon (0.16.0)
90101
ffi (>= 1.15.0)
91-
excon (0.111.0)
92-
faraday (1.10.3)
102+
excon (0.112.0)
103+
faraday (1.10.4)
93104
faraday-em_http (~> 1.0)
94105
faraday-em_synchrony (~> 1.0)
95106
faraday-excon (~> 1.1)
@@ -115,10 +126,10 @@ GEM
115126
faraday-patron (1.0.0)
116127
faraday-rack (1.0.0)
117128
faraday-retry (1.0.3)
118-
faraday_middleware (1.2.0)
129+
faraday_middleware (1.2.1)
119130
faraday (~> 1.0)
120131
fastimage (2.3.1)
121-
fastlane (2.222.0)
132+
fastlane (2.225.0)
122133
CFPropertyList (>= 2.3, < 4.0.0)
123134
addressable (>= 2.8, < 3.0.0)
124135
artifactory (~> 3.0)
@@ -134,6 +145,7 @@ GEM
134145
faraday-cookie_jar (~> 0.0.6)
135146
faraday_middleware (~> 1.0)
136147
fastimage (>= 2.1.0, < 3.0.0)
148+
fastlane-sirp (>= 1.0.0)
137149
gh_inspector (>= 1.1.2, < 2.0.0)
138150
google-apis-androidpublisher_v3 (~> 0.3)
139151
google-apis-playcustomapp_v1 (~> 0.1)
@@ -164,7 +176,9 @@ GEM
164176
fastlane-plugin-load_json (0.0.1)
165177
fastlane-plugin-stream_actions (0.3.16)
166178
xctest_list (= 1.2.1)
167-
ffi (1.16.3)
179+
fastlane-sirp (1.0.0)
180+
sysrandom (~> 1.0)
181+
ffi (1.17.0)
168182
fourflusher (2.3.1)
169183
fuzzy_match (2.0.4)
170184
gh_inspector (1.1.3)
@@ -205,19 +219,20 @@ GEM
205219
os (>= 0.9, < 2.0)
206220
signet (>= 0.16, < 2.a)
207221
highline (2.0.3)
208-
http-cookie (1.0.6)
222+
http-cookie (1.0.7)
209223
domain_name (~> 0.5)
210224
httpclient (2.8.3)
211-
i18n (1.14.1)
225+
i18n (1.14.6)
212226
concurrent-ruby (~> 1.0)
213227
jmespath (1.6.2)
214-
json (2.7.2)
215-
jwt (2.8.2)
228+
json (2.8.2)
229+
jwt (2.9.3)
216230
base64
217231
language_server-protocol (3.17.0.3)
232+
logger (1.6.1)
218233
mini_magick (4.13.2)
219234
mini_mime (1.1.5)
220-
minitest (5.22.2)
235+
minitest (5.25.1)
221236
molinillo (0.8.0)
222237
multi_json (1.15.0)
223238
multipart-post (2.4.1)
@@ -226,25 +241,24 @@ GEM
226241
naturally (2.2.1)
227242
netrc (0.11.0)
228243
nkf (0.2.0)
229-
optparse (0.5.0)
244+
optparse (0.6.0)
230245
os (1.1.4)
231-
parallel (1.24.0)
232-
parser (3.3.0.5)
246+
parallel (1.26.3)
247+
parser (3.3.6.0)
233248
ast (~> 2.4.1)
234249
racc
235250
plist (3.7.1)
236251
public_suffix (4.0.7)
237-
racc (1.7.3)
252+
racc (1.8.1)
238253
rainbow (3.1.1)
239254
rake (13.2.1)
240-
regexp_parser (2.9.0)
255+
regexp_parser (2.9.2)
241256
representable (3.2.0)
242257
declarative (< 0.1.0)
243258
trailblazer-option (>= 0.1.1, < 0.2.0)
244259
uber (< 0.2.0)
245260
retriable (3.1.2)
246-
rexml (3.3.4)
247-
strscan
261+
rexml (3.3.9)
248262
rouge (2.0.7)
249263
rubocop (1.60.2)
250264
json (~> 2.3)
@@ -257,17 +271,18 @@ GEM
257271
rubocop-ast (>= 1.30.0, < 2.0)
258272
ruby-progressbar (~> 1.7)
259273
unicode-display_width (>= 2.4.0, < 3.0)
260-
rubocop-ast (1.30.0)
261-
parser (>= 3.2.1.0)
262-
rubocop-performance (1.20.2)
274+
rubocop-ast (1.36.1)
275+
parser (>= 3.3.1.0)
276+
rubocop-performance (1.23.0)
263277
rubocop (>= 1.48.1, < 2.0)
264-
rubocop-ast (>= 1.30.0, < 2.0)
278+
rubocop-ast (>= 1.31.1, < 2.0)
265279
rubocop-require_tools (0.1.2)
266280
rubocop (>= 0.49.1)
267281
ruby-macho (2.5.1)
268282
ruby-progressbar (1.13.0)
269283
ruby2_keywords (0.0.5)
270284
rubyzip (2.3.2)
285+
securerandom (0.3.2)
271286
security (0.1.5)
272287
signet (0.19.0)
273288
addressable (~> 2.8)
@@ -277,7 +292,7 @@ GEM
277292
simctl (1.6.10)
278293
CFPropertyList
279294
naturally
280-
strscan (3.1.0)
295+
sysrandom (1.0.5)
281296
terminal-notifier (2.0.0)
282297
terminal-table (3.0.2)
283298
unicode-display_width (>= 1.1.1, < 3)
@@ -291,15 +306,15 @@ GEM
291306
tzinfo (2.0.6)
292307
concurrent-ruby (~> 1.0)
293308
uber (0.1.0)
294-
unicode-display_width (2.5.0)
309+
unicode-display_width (2.6.0)
295310
word_wrap (1.0.0)
296-
xcodeproj (1.25.0)
311+
xcodeproj (1.25.1)
297312
CFPropertyList (>= 2.3.3, < 4.0)
298313
atomos (~> 0.1.3)
299314
claide (>= 1.0.2, < 2.0)
300315
colored2 (~> 3.1)
301316
nanaimo (~> 0.3.0)
302-
rexml (>= 3.3.2, < 4.0)
317+
rexml (>= 3.3.6, < 4.0)
303318
xcpretty (0.3.0)
304319
rouge (~> 2.0.7)
305320
xcpretty-travis-formatter (1.0.1)
@@ -310,8 +325,8 @@ PLATFORMS
310325
ruby
311326

312327
DEPENDENCIES
313-
activesupport (>= 6.1.7.5, < 7.1.0)
314-
cocoapods (>= 1.13, < 1.15)
328+
activesupport (>= 6.1.7.5, != 7.1.0)
329+
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
315330
fastlane
316331
fastlane-plugin-increment_version_code
317332
fastlane-plugin-increment_version_name
@@ -320,9 +335,10 @@ DEPENDENCIES
320335
rubocop (= 1.60.2)
321336
rubocop-performance
322337
rubocop-require_tools
338+
xcodeproj (< 1.26.0)
323339

324340
RUBY VERSION
325341
ruby 3.2.3p157
326342

327343
BUNDLED WITH
328-
2.3.21
344+
2.4.19

sample-apps/react-native/dogfood/android/app/build.gradle

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,27 @@ apply plugin: "com.google.gms.google-services"
55

66
import com.android.build.OutputFile
77

8+
/**
9+
* This is the configuration block to customize your React Native Android app.
10+
* By default you don't need to apply any configuration, just uncomment the lines you need.
11+
*/
812
react {
913
/* Folders */
10-
// The root of your project, i.e. where "package.json" lives. Default is '..'
11-
// root = file("../")
12-
// The folder where the react-native NPM package is. Default is ../node_modules/react-native
13-
// reactNativeDir = file("../node_modules/react-native")
14-
// The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
15-
// codegenDir = file("../node_modules/@react-native/codegen")
16-
// The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
17-
// cliFile = file("../node_modules/react-native/cli.js")
14+
// The root of your project, i.e. where "package.json" lives. Default is '../..'
15+
// root = file("../../")
16+
// The folder where the react-native NPM package is. Default is ../../node_modules/react-native
17+
// reactNativeDir = file("../../node_modules/react-native")
18+
// The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
19+
// codegenDir = file("../../node_modules/@react-native/codegen")
20+
// The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
21+
// cliFile = file("../../node_modules/react-native/cli.js")
22+
1823
/* Variants */
1924
// The list of variants to that are debuggable. For those we're going to
2025
// skip the bundling of the JS bundle and the assets. By default is just 'debug'.
2126
// If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
2227
// debuggableVariants = ["liteDebug", "prodDebug"]
28+
2329
/* Bundling */
2430
// A list containing the node command and its flags. Default is just 'node'.
2531
// nodeExecutableAndArgs = ["node"]
@@ -39,12 +45,16 @@ react {
3945
// A list of extra flags to pass to the 'bundle' commands.
4046
// See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle
4147
// extraPackagerArgs = []
48+
4249
/* Hermes Commands */
4350
// The hermes compiler command to run. By default it is 'hermesc'
4451
// hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc"
4552
//
4653
// The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
4754
// hermesFlags = ["-O", "-output-source-map"]
55+
56+
/* Autolinking */
57+
autolinkLibrariesWithApp()
4858
}
4959

5060
/**
@@ -109,17 +119,13 @@ android {
109119
dependencies {
110120
implementation (project(':react-native-callkeep'))
111121
implementation (project(':react-native-incall-manager'))
112-
implementation "com.android.support:support-v4:28.0.0" // needed for incall manager
113122

114123
// The version of react-native is set by the React Native Gradle Plugin
115124
implementation("com.facebook.react:react-android")
116-
implementation("com.facebook.react:flipper-integration")
117125

118126
if (hermesEnabled.toBoolean()) {
119127
implementation("com.facebook.react:hermes-android")
120128
} else {
121129
implementation jscFlavor
122130
}
123131
}
124-
125-
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

sample-apps/react-native/dogfood/android/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
android:icon="@mipmap/ic_launcher"
4646
android:label="@string/app_name"
4747
android:roundIcon="@mipmap/ic_launcher_round"
48-
android:theme="@style/AppTheme">
48+
android:theme="@style/AppTheme"
49+
android:supportsRtl="true">
4950
<activity
5051
android:name=".MainActivity"
5152
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"

0 commit comments

Comments
 (0)