Skip to content

Commit 33cc0f3

Browse files
authored
Merge pull request #7106 from StoDevX/drew/react-native-72-4
Upgrade React Native to v72.4
2 parents e70c86e + 774b91c commit 33cc0f3

File tree

45 files changed

+2158
-3250
lines changed

Some content is hidden

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

45 files changed

+2158
-3250
lines changed

.eslintrc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ plugins:
1515
- '@tanstack/eslint-plugin-query'
1616

1717
extends:
18+
- '@react-native'
1819
- 'eslint:recommended'
1920
- 'plugin:react/recommended'
2021
- 'plugin:@typescript-eslint/recommended'

Gemfile

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

3-
gem 'fastlane', '2.214.0'
3+
gem 'fastlane', '2.216.0'
44
gem 'netrc', '0.11.0'
55
gem 'json', '2.6.3'
6-
gem 'xcodeproj', '1.22.0'
7-
gem 'cocoapods', '1.12.1'
6+
gem 'xcodeproj', '1.24.0'
7+
gem 'cocoapods', '1.15.2'
88

99
# fastlane plugins
1010

Gemfile.lock

Lines changed: 77 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,54 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.6)
4+
CFPropertyList (3.0.7)
5+
base64
6+
nkf
57
rexml
6-
activesupport (7.0.7.2)
8+
activesupport (7.1.3.2)
9+
base64
10+
bigdecimal
711
concurrent-ruby (~> 1.0, >= 1.0.2)
12+
connection_pool (>= 2.2.5)
13+
drb
814
i18n (>= 1.6, < 2)
915
minitest (>= 5.1)
16+
mutex_m
1017
tzinfo (~> 2.0)
11-
addressable (2.8.5)
18+
addressable (2.8.6)
1219
public_suffix (>= 2.0.2, < 6.0)
1320
algoliasearch (1.27.5)
1421
httpclient (~> 2.8, >= 2.8.3)
1522
json (>= 1.5.1)
1623
artifactory (3.0.15)
1724
ast (2.4.2)
1825
atomos (0.1.3)
19-
aws-eventstream (1.2.0)
20-
aws-partitions (1.816.0)
21-
aws-sdk-core (3.181.0)
22-
aws-eventstream (~> 1, >= 1.0.2)
26+
aws-eventstream (1.3.0)
27+
aws-partitions (1.895.0)
28+
aws-sdk-core (3.191.3)
29+
aws-eventstream (~> 1, >= 1.3.0)
2330
aws-partitions (~> 1, >= 1.651.0)
24-
aws-sigv4 (~> 1.5)
31+
aws-sigv4 (~> 1.8)
2532
jmespath (~> 1, >= 1.6.1)
26-
aws-sdk-kms (1.71.0)
27-
aws-sdk-core (~> 3, >= 3.177.0)
33+
aws-sdk-kms (1.77.0)
34+
aws-sdk-core (~> 3, >= 3.191.0)
2835
aws-sigv4 (~> 1.1)
29-
aws-sdk-s3 (1.134.0)
30-
aws-sdk-core (~> 3, >= 3.181.0)
36+
aws-sdk-s3 (1.143.0)
37+
aws-sdk-core (~> 3, >= 3.191.0)
3138
aws-sdk-kms (~> 1)
32-
aws-sigv4 (~> 1.6)
33-
aws-sigv4 (1.6.0)
39+
aws-sigv4 (~> 1.8)
40+
aws-sigv4 (1.8.0)
3441
aws-eventstream (~> 1, >= 1.0.2)
3542
babosa (1.0.4)
3643
base64 (0.1.1)
44+
bigdecimal (3.1.6)
3745
claide (1.1.0)
38-
cocoapods (1.12.1)
46+
cocoapods (1.15.2)
3947
addressable (~> 2.8)
4048
claide (>= 1.0.2, < 2.0)
41-
cocoapods-core (= 1.12.1)
49+
cocoapods-core (= 1.15.2)
4250
cocoapods-deintegrate (>= 1.0.3, < 2.0)
43-
cocoapods-downloader (>= 1.6.0, < 2.0)
51+
cocoapods-downloader (>= 2.1, < 3.0)
4452
cocoapods-plugins (>= 1.0.0, < 2.0)
4553
cocoapods-search (>= 1.0.0, < 2.0)
4654
cocoapods-trunk (>= 1.6.0, < 2.0)
@@ -52,8 +60,8 @@ GEM
5260
molinillo (~> 0.8.0)
5361
nap (~> 1.0)
5462
ruby-macho (>= 2.3.0, < 3.0)
55-
xcodeproj (>= 1.21.0, < 2.0)
56-
cocoapods-core (1.12.1)
63+
xcodeproj (>= 1.23.0, < 2.0)
64+
cocoapods-core (1.15.2)
5765
activesupport (>= 5.0, < 8)
5866
addressable (~> 2.8)
5967
algoliasearch (~> 1.0)
@@ -64,7 +72,7 @@ GEM
6472
public_suffix (~> 4.0)
6573
typhoeus (~> 1.0)
6674
cocoapods-deintegrate (1.0.5)
67-
cocoapods-downloader (1.6.3)
75+
cocoapods-downloader (2.1)
6876
cocoapods-plugins (1.0.0)
6977
nap
7078
cocoapods-search (1.0.1)
@@ -76,18 +84,19 @@ GEM
7684
colored2 (3.1.2)
7785
commander (4.6.0)
7886
highline (~> 2.0.0)
79-
concurrent-ruby (1.2.2)
87+
concurrent-ruby (1.2.3)
88+
connection_pool (2.4.1)
8089
declarative (0.0.20)
8190
digest-crc (0.6.5)
8291
rake (>= 12.0.0, < 14.0.0)
83-
domain_name (0.5.20190701)
84-
unf (>= 0.0.5, < 1.0.0)
92+
domain_name (0.6.20240107)
8593
dotenv (2.8.1)
94+
drb (2.2.1)
8695
emoji_regex (3.2.3)
8796
escape (0.0.4)
8897
ethon (0.16.0)
8998
ffi (>= 1.15.0)
90-
excon (0.102.0)
99+
excon (0.109.0)
91100
faraday (1.10.3)
92101
faraday-em_http (~> 1.0)
93102
faraday-em_synchrony (~> 1.0)
@@ -116,8 +125,8 @@ GEM
116125
faraday-retry (1.0.3)
117126
faraday_middleware (1.2.0)
118127
faraday (~> 1.0)
119-
fastimage (2.2.7)
120-
fastlane (2.214.0)
128+
fastimage (2.3.0)
129+
fastlane (2.216.0)
121130
CFPropertyList (>= 2.3, < 4.0.0)
122131
addressable (>= 2.8, < 3.0.0)
123132
artifactory (~> 3.0)
@@ -138,6 +147,7 @@ GEM
138147
google-apis-playcustomapp_v1 (~> 0.1)
139148
google-cloud-storage (~> 1.31)
140149
highline (~> 2.0)
150+
http-cookie (~> 1.0.5)
141151
json (< 3.0.0)
142152
jwt (>= 2.1.0, < 3)
143153
mini_magick (>= 4.9.4, < 5.0.0)
@@ -149,52 +159,52 @@ GEM
149159
security (= 0.1.3)
150160
simctl (~> 1.6.3)
151161
terminal-notifier (>= 2.0.0, < 3.0.0)
152-
terminal-table (>= 1.4.5, < 2.0.0)
162+
terminal-table (~> 3)
153163
tty-screen (>= 0.6.3, < 1.0.0)
154164
tty-spinner (>= 0.8.0, < 1.0.0)
155165
word_wrap (~> 1.0.0)
156166
xcodeproj (>= 1.13.0, < 2.0.0)
157167
xcpretty (~> 0.3.0)
158168
xcpretty-travis-formatter (>= 0.0.3)
159-
ffi (1.15.5)
169+
ffi (1.16.3)
160170
fourflusher (2.3.1)
161171
fuzzy_match (2.0.4)
162172
gh_inspector (1.1.3)
163-
google-apis-androidpublisher_v3 (0.49.0)
164-
google-apis-core (>= 0.11.0, < 2.a)
165-
google-apis-core (0.11.1)
173+
google-apis-androidpublisher_v3 (0.58.0)
174+
google-apis-core (>= 0.14.0, < 2.a)
175+
google-apis-core (0.14.0)
166176
addressable (~> 2.5, >= 2.5.1)
167-
googleauth (>= 0.16.2, < 2.a)
177+
googleauth (~> 1.9)
168178
httpclient (>= 2.8.1, < 3.a)
169179
mini_mime (~> 1.0)
170180
representable (~> 3.0)
171181
retriable (>= 2.0, < 4.a)
172182
rexml
173-
webrick
174-
google-apis-iamcredentials_v1 (0.17.0)
175-
google-apis-core (>= 0.11.0, < 2.a)
176-
google-apis-playcustomapp_v1 (0.13.0)
177-
google-apis-core (>= 0.11.0, < 2.a)
178-
google-apis-storage_v1 (0.19.0)
179-
google-apis-core (>= 0.9.0, < 2.a)
180-
google-cloud-core (1.6.0)
181-
google-cloud-env (~> 1.0)
183+
google-apis-iamcredentials_v1 (0.19.0)
184+
google-apis-core (>= 0.14.0, < 2.a)
185+
google-apis-playcustomapp_v1 (0.15.0)
186+
google-apis-core (>= 0.14.0, < 2.a)
187+
google-apis-storage_v1 (0.34.0)
188+
google-apis-core (>= 0.14.0, < 2.a)
189+
google-cloud-core (1.6.1)
190+
google-cloud-env (>= 1.0, < 3.a)
182191
google-cloud-errors (~> 1.0)
183-
google-cloud-env (1.6.0)
184-
faraday (>= 0.17.3, < 3.0)
192+
google-cloud-env (2.1.1)
193+
faraday (>= 1.0, < 3.a)
185194
google-cloud-errors (1.3.1)
186-
google-cloud-storage (1.44.0)
195+
google-cloud-storage (1.49.0)
187196
addressable (~> 2.8)
188197
digest-crc (~> 0.4)
189-
google-apis-iamcredentials_v1 (~> 0.1)
190-
google-apis-storage_v1 (~> 0.19.0)
198+
google-apis-core (~> 0.13)
199+
google-apis-iamcredentials_v1 (~> 0.18)
200+
google-apis-storage_v1 (~> 0.33)
191201
google-cloud-core (~> 1.6)
192-
googleauth (>= 0.16.2, < 2.a)
202+
googleauth (~> 1.9)
193203
mini_mime (~> 1.0)
194-
googleauth (1.7.0)
195-
faraday (>= 0.17.3, < 3.a)
204+
googleauth (1.11.0)
205+
faraday (>= 1.0, < 3.a)
206+
google-cloud-env (~> 2.1)
196207
jwt (>= 1.4, < 3.0)
197-
memoist (~> 0.16)
198208
multi_json (~> 1.11)
199209
os (>= 0.9, < 2.0)
200210
signet (>= 0.16, < 2.a)
@@ -206,30 +216,32 @@ GEM
206216
concurrent-ruby (~> 1.0)
207217
jmespath (1.6.2)
208218
json (2.6.3)
209-
jwt (2.7.1)
219+
jwt (2.8.1)
220+
base64
210221
language_server-protocol (3.17.0.3)
211-
memoist (0.16.2)
212222
mini_magick (4.12.0)
213223
mini_mime (1.1.5)
214-
minitest (5.19.0)
224+
minitest (5.22.2)
215225
molinillo (0.8.0)
216226
multi_json (1.15.0)
217-
multipart-post (2.3.0)
227+
multipart-post (2.4.0)
228+
mutex_m (0.2.0)
218229
nanaimo (0.3.0)
219230
nap (1.1.0)
220231
naturally (2.2.1)
221232
netrc (0.11.0)
233+
nkf (0.2.0)
222234
optparse (0.1.1)
223235
os (1.1.4)
224236
parallel (1.23.0)
225237
parser (3.2.2.3)
226238
ast (~> 2.4.1)
227239
racc
228-
plist (3.7.0)
240+
plist (3.7.1)
229241
public_suffix (4.0.7)
230242
racc (1.7.1)
231243
rainbow (3.1.1)
232-
rake (13.0.6)
244+
rake (13.1.0)
233245
regexp_parser (2.8.1)
234246
representable (3.2.0)
235247
declarative (< 0.1.0)
@@ -257,7 +269,7 @@ GEM
257269
ruby2_keywords (0.0.5)
258270
rubyzip (2.3.2)
259271
security (0.1.3)
260-
signet (0.17.0)
272+
signet (0.19.0)
261273
addressable (~> 2.8)
262274
faraday (>= 0.17.5, < 3.a)
263275
jwt (>= 1.5, < 3.0)
@@ -266,24 +278,21 @@ GEM
266278
CFPropertyList
267279
naturally
268280
terminal-notifier (2.0.0)
269-
terminal-table (1.6.0)
281+
terminal-table (3.0.2)
282+
unicode-display_width (>= 1.1.1, < 3)
270283
trailblazer-option (0.1.2)
271284
tty-cursor (0.7.1)
272-
tty-screen (0.8.1)
285+
tty-screen (0.8.2)
273286
tty-spinner (0.9.3)
274287
tty-cursor (~> 0.7)
275-
typhoeus (1.4.0)
288+
typhoeus (1.4.1)
276289
ethon (>= 0.9.0)
277290
tzinfo (2.0.6)
278291
concurrent-ruby (~> 1.0)
279292
uber (0.1.0)
280-
unf (0.1.4)
281-
unf_ext
282-
unf_ext (0.0.8.2)
283293
unicode-display_width (2.4.2)
284-
webrick (1.8.1)
285294
word_wrap (1.0.0)
286-
xcodeproj (1.22.0)
295+
xcodeproj (1.24.0)
287296
CFPropertyList (>= 2.3.3, < 4.0)
288297
atomos (~> 0.1.3)
289298
claide (>= 1.0.2, < 2.0)
@@ -300,12 +309,12 @@ PLATFORMS
300309
universal-darwin-20
301310

302311
DEPENDENCIES
303-
cocoapods (= 1.12.1)
304-
fastlane (= 2.214.0)
312+
cocoapods (= 1.15.2)
313+
fastlane (= 2.216.0)
305314
json (= 2.6.3)
306315
netrc (= 0.11.0)
307316
rubocop (= 1.56.2)
308-
xcodeproj (= 1.22.0)
317+
xcodeproj (= 1.24.0)
309318

310319
BUNDLED WITH
311320
2.2.30

android/app/build.gradle

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ react {
1515
// root = file("../")
1616
// The folder where the react-native NPM package is. Default is ../node_modules/react-native
1717
// 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")
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")
2020
// The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
2121
// cliFile = file("../node_modules/react-native/cli.js")
2222

@@ -60,29 +60,11 @@ project.react = [
6060
bundleInRelease: !skipBundling,
6161
]
6262

63-
/**
64-
* Set this to true to create four separate APKs instead of one,
65-
* one for each native architecture. This is useful if you don't
66-
* use App Bundles (https://developer.android.com/guide/app-bundle/)
67-
* and want to have separate APKs to upload to the Play Store.
68-
*/
69-
def enableSeparateBuildPerCPUArchitecture = false
70-
7163
/**
7264
* Set this to true to Run Proguard on Release builds to minify the Java bytecode.
7365
*/
7466
def enableProguardInReleaseBuilds = false
7567

76-
/**
77-
* Private function to get the list of Native Architectures you want to build.
78-
* This reads the value from reactNativeArchitectures in your gradle.properties
79-
* file and works together with the --active-arch-only flag of react-native run-android.
80-
*/
81-
def reactNativeArchitectures() {
82-
def value = project.getProperties().get("reactNativeArchitectures")
83-
return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
84-
}
85-
8668
/**
8769
* Fetch the keystore file's path from the environment
8870
*/
@@ -147,15 +129,6 @@ android {
147129
}
148130
}
149131

150-
splits {
151-
abi {
152-
reset()
153-
enable enableSeparateBuildPerCPUArchitecture
154-
universalApk false // If true, also generate a universal APK
155-
include (*reactNativeArchitectures())
156-
}
157-
}
158-
159132
buildTypes {
160133
debug {
161134
manifestPlaceholders = [isDebug: true]
@@ -198,7 +171,6 @@ dependencies {
198171

199172
// The version of react-native is set by the React Native Gradle Plugin
200173
implementation("com.facebook.react:react-android")
201-
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
202174

203175
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
204176
debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")

0 commit comments

Comments
 (0)