Skip to content

Commit 2043097

Browse files
committed
[REF] revert upgrade to 0.72.x changes
1 parent a3d8d3e commit 2043097

File tree

10 files changed

+61
-1989
lines changed

10 files changed

+61
-1989
lines changed

.node-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
18

.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.7.6

android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ android.useAndroidX=true
2525
android.enableJetifier=true
2626

2727
# Version of flipper SDK to use with React Native
28-
FLIPPER_VERSION=0.182.0
28+
FLIPPER_VERSION=0.125.0
2929

3030
# Use this property to specify which architecture you want to build.
3131
# You can also override it from the CLI using

android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ include ':react-native-haptic-feedback'
77
project(':react-native-haptic-feedback').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-haptic-feedback/android')
88
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
99
include ':app'
10-
includeBuild('../node_modules/@react-native/gradle-plugin')
10+
includeBuild('../node_modules/react-native-gradle-plugin')

ios/Podfile

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
require_relative '../node_modules/react-native/scripts/react_native_pods'
22
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
33

4-
# Resolve react_native_pods.rb with node to allow for hoisting
5-
require Pod::Executable.execute_command('node', ['-p',
6-
'require.resolve(
7-
"react-native/scripts/react_native_pods.rb",
8-
{paths: [process.argv[1]]},
9-
)', __dir__]).strip
10-
114
platform :ios, min_ios_version_supported
125
prepare_react_native_project!
136

@@ -61,12 +54,10 @@ target 'BitPayApp' do
6154
end
6255

6356
post_install do |installer|
64-
# https://github.com/facebook/react-native/blob/main/scripts/react_native_pods.rb#L197-L202
6557
react_native_post_install(
6658
installer,
6759
# Set `mac_catalyst_enabled` to `true` in order to apply patches
6860
# necessary for Mac Catalyst builds
69-
config[:reactNativePath],
7061
:mac_catalyst_enabled => false
7162
)
7263
__apply_Xcode_12_5_M1_post_install_workaround(installer)

ios/Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1316,9 +1316,9 @@ EXTERNAL SOURCES:
13161316
SPEC CHECKSUMS:
13171317
Appboy-iOS-SDK: 2fc5b290fe1caa85718b811a19b303d45caea975
13181318
AppsFlyerFramework: 9f304d91cc80b6579b1206a59220383056b58b47
1319-
boost: a7c83b31436843459a1961bfd74b96033dc77234
1319+
boost: 57d2868c099736d80fcd648bf211b4431e51a558
13201320
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
1321-
DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
1321+
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
13221322
FBLazyVector: f637f31eacba90d4fdeff3fa41608b8f361c173b
13231323
FBReactNativeSpec: 7fd4b5d618f41d5a75f79f0a85403d0fab3a3f80
13241324
Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0
@@ -1331,7 +1331,7 @@ SPEC CHECKSUMS:
13311331
Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
13321332
FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
13331333
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
1334-
glog: 85ecdd10ee8d8ec362ef519a6a45ff9aa27b2e85
1334+
glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
13351335
hermes-engine: 47986d26692ae75ee7a17ab049caee8864f855de
13361336
InputMask: 71d291dc54d2deaeac6512afb6ec2304228c0bb7
13371337
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
@@ -1418,6 +1418,6 @@ SPEC CHECKSUMS:
14181418
Yoga: 065f0b74dba4832d6e328238de46eb72c5de9556
14191419
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
14201420

1421-
PODFILE CHECKSUM: 842874ccc550fe50fa7d56aa90032fb43032ac68
1421+
PODFILE CHECKSUM: fe2ed3756c1d0a13e122332e57fd8bb6d6538bab
14221422

14231423
COCOAPODS: 1.12.1

package.json

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@
242242
"crypto": "react-native-crypto",
243243
"http": "@tradle/react-native-http",
244244
"https": "https-browserify",
245+
"os": "react-native-os",
245246
"path": "path-browserify",
246247
"fs": "react-native-level-fs",
247248
"_stream_transform": "readable-stream/transform",
@@ -250,13 +251,13 @@
250251
"_stream_duplex": "readable-stream/duplex",
251252
"_stream_passthrough": "readable-stream/passthrough",
252253
"stream": "stream-browserify",
253-
"vm": "vm-browserify",
254-
"os": "react-native-os"
254+
"vm": "vm-browserify"
255255
},
256256
"browser": {
257257
"crypto": "react-native-crypto",
258258
"http": "@tradle/react-native-http",
259259
"https": "https-browserify",
260+
"os": "react-native-os",
260261
"path": "path-browserify",
261262
"fs": "react-native-level-fs",
262263
"_stream_transform": "readable-stream/transform",
@@ -265,10 +266,6 @@
265266
"_stream_duplex": "readable-stream/duplex",
266267
"_stream_passthrough": "readable-stream/passthrough",
267268
"stream": "stream-browserify",
268-
"vm": "vm-browserify",
269-
"os": "react-native-os"
270-
},
271-
"engines": {
272-
"node": ">=16"
269+
"vm": "vm-browserify"
273270
}
274271
}

patches/react-native+0.71.8.patch

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
diff --git a/node_modules/react-native/index.js b/node_modules/react-native/index.js
2+
index f556fa3..2986043 100644
3+
--- a/node_modules/react-native/index.js
4+
+++ b/node_modules/react-native/index.js
5+
@@ -411,43 +411,15 @@ module.exports = {
6+
},
7+
// Deprecated Prop Types
8+
get ColorPropType(): $FlowFixMe {
9+
- console.error(
10+
- 'ColorPropType will be removed from React Native, along with all ' +
11+
- 'other PropTypes. We recommend that you migrate away from PropTypes ' +
12+
- 'and switch to a type system like TypeScript. If you need to ' +
13+
- 'continue using ColorPropType, migrate to the ' +
14+
- "'deprecated-react-native-prop-types' package.",
15+
- );
16+
return require('deprecated-react-native-prop-types').ColorPropType;
17+
},
18+
get EdgeInsetsPropType(): $FlowFixMe {
19+
- console.error(
20+
- 'EdgeInsetsPropType will be removed from React Native, along with all ' +
21+
- 'other PropTypes. We recommend that you migrate away from PropTypes ' +
22+
- 'and switch to a type system like TypeScript. If you need to ' +
23+
- 'continue using EdgeInsetsPropType, migrate to the ' +
24+
- "'deprecated-react-native-prop-types' package.",
25+
- );
26+
return require('deprecated-react-native-prop-types').EdgeInsetsPropType;
27+
},
28+
get PointPropType(): $FlowFixMe {
29+
- console.error(
30+
- 'PointPropType will be removed from React Native, along with all ' +
31+
- 'other PropTypes. We recommend that you migrate away from PropTypes ' +
32+
- 'and switch to a type system like TypeScript. If you need to ' +
33+
- 'continue using PointPropType, migrate to the ' +
34+
- "'deprecated-react-native-prop-types' package.",
35+
- );
36+
return require('deprecated-react-native-prop-types').PointPropType;
37+
},
38+
get ViewPropTypes(): $FlowFixMe {
39+
- console.error(
40+
- 'ViewPropTypes will be removed from React Native, along with all ' +
41+
- 'other PropTypes. We recommend that you migrate away from PropTypes ' +
42+
- 'and switch to a type system like TypeScript. If you need to ' +
43+
- 'continue using ViewPropTypes, migrate to the ' +
44+
- "'deprecated-react-native-prop-types' package.",
45+
- );
46+
return require('deprecated-react-native-prop-types').ViewPropTypes;
47+
},
48+
};

0 commit comments

Comments
 (0)