Skip to content

Commit 75cb072

Browse files
committed
Build thru deps, datetimepicker, gzip, resolved
1 parent 717d1d5 commit 75cb072

6 files changed

+24
-76
lines changed

ios/Podfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ def common_target_logic
6262
:hermes_enabled => false,
6363
# An absolute path to your application root.
6464
:app_path => "#{Pod::Config.instance.installation_root}/..",
65+
:fabric_enabled => false,
6566
)
6667

6768
# Pods for MetaMask

ios/Podfile.lock

Lines changed: 7 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1819,7 +1819,7 @@ PODS:
18191819
- React-Core
18201820
- react-native-render-html (6.3.4):
18211821
- React-Core
1822-
- react-native-safe-area-context (4.8.2):
1822+
- react-native-safe-area-context (5.1.0):
18231823
- DoubleConversion
18241824
- glog
18251825
- RCT-Folly (= 2024.01.01.00)
@@ -1832,8 +1832,8 @@ PODS:
18321832
- React-graphics
18331833
- React-ImageManager
18341834
- React-jsi
1835-
- react-native-safe-area-context/common (= 4.8.2)
1836-
- react-native-safe-area-context/fabric (= 4.8.2)
1835+
- react-native-safe-area-context/common (= 5.1.0)
1836+
- react-native-safe-area-context/fabric (= 5.1.0)
18371837
- React-NativeModulesApple
18381838
- React-RCTFabric
18391839
- React-rendererdebug
@@ -1842,7 +1842,7 @@ PODS:
18421842
- ReactCommon/turbomodule/bridging
18431843
- ReactCommon/turbomodule/core
18441844
- Yoga
1845-
- react-native-safe-area-context/common (4.8.2):
1845+
- react-native-safe-area-context/common (5.1.0):
18461846
- DoubleConversion
18471847
- glog
18481848
- RCT-Folly (= 2024.01.01.00)
@@ -1863,7 +1863,7 @@ PODS:
18631863
- ReactCommon/turbomodule/bridging
18641864
- ReactCommon/turbomodule/core
18651865
- Yoga
1866-
- react-native-safe-area-context/fabric (4.8.2):
1866+
- react-native-safe-area-context/fabric (5.1.0):
18671867
- DoubleConversion
18681868
- glog
18691869
- RCT-Folly (= 2024.01.01.00)
@@ -2249,27 +2249,6 @@ PODS:
22492249
- ReactCommon/turbomodule/bridging
22502250
- ReactCommon/turbomodule/core
22512251
- Yoga
2252-
- RNDateTimePicker (8.2.0):
2253-
- DoubleConversion
2254-
- glog
2255-
- RCT-Folly (= 2024.01.01.00)
2256-
- RCTRequired
2257-
- RCTTypeSafety
2258-
- React-Core
2259-
- React-debug
2260-
- React-Fabric
2261-
- React-featureflags
2262-
- React-graphics
2263-
- React-ImageManager
2264-
- React-jsi
2265-
- React-NativeModulesApple
2266-
- React-RCTFabric
2267-
- React-rendererdebug
2268-
- React-utils
2269-
- ReactCodegen
2270-
- ReactCommon/turbomodule/bridging
2271-
- ReactCommon/turbomodule/core
2272-
- Yoga
22732252
- RNDefaultPreference (1.4.3):
22742253
- React
22752254
- RNDeviceInfo (9.0.2):
@@ -2676,7 +2655,6 @@ DEPENDENCIES:
26762655
- "RNCCheckbox (from `../node_modules/@react-native-community/checkbox`)"
26772656
- "RNCClipboard (from `../node_modules/@react-native-clipboard/clipboard`)"
26782657
- "RNCMaskedView (from `../node_modules/@react-native-masked-view/masked-view`)"
2679-
- "RNDateTimePicker (from `../node_modules/@react-native-community/datetimepicker`)"
26802658
- RNDefaultPreference (from `../node_modules/react-native-default-preference`)
26812659
- RNDeviceInfo (from `../node_modules/react-native-device-info`)
26822660
- "RNFBApp (from `../node_modules/@react-native-firebase/app`)"
@@ -2954,8 +2932,6 @@ EXTERNAL SOURCES:
29542932
:path: "../node_modules/@react-native-clipboard/clipboard"
29552933
RNCMaskedView:
29562934
:path: "../node_modules/@react-native-masked-view/masked-view"
2957-
RNDateTimePicker:
2958-
:path: "../node_modules/@react-native-community/datetimepicker"
29592935
RNDefaultPreference:
29602936
:path: "../node_modules/react-native-default-preference"
29612937
RNDeviceInfo:
@@ -3102,7 +3078,7 @@ SPEC CHECKSUMS:
31023078
react-native-quick-crypto: 7041f19bef8430c60127df7b703e709f6d24213f
31033079
react-native-randombytes: 3c8f3e89d12487fd03a2f966c288d495415fc116
31043080
react-native-render-html: 5afc4751f1a98621b3009432ef84c47019dcb2bd
3105-
react-native-safe-area-context: 123c21a9348fd4f83fe664a63d9ffc6fecf080a2
3081+
react-native-safe-area-context: b05e627d1ab80b9c22ab628ce6b9986ab9e90947
31063082
react-native-slider: b133c0ca0414af140b57359eac0fcf7473678162
31073083
react-native-video: 2aad0d963bf3952bd9ebb2f53fab799338e8e202
31083084
react-native-view-shot: d1a701eb0719c6dccbd20b4bb43b1069f304cb70
@@ -3139,7 +3115,6 @@ SPEC CHECKSUMS:
31393115
RNCCheckbox: 450ce156f3e29e25efa0315c96cfbabe5a39ded1
31403116
RNCClipboard: ba13782f62310ffd4377332497241a1051f6870b
31413117
RNCMaskedView: 3ba1daa87b4eabf96e84dfc15c0c76a3b27e6b27
3142-
RNDateTimePicker: 32b56bd881bf89fefd075363f15453d2c2e7ba42
31433118
RNDefaultPreference: 36fe31684af1f2d14e0664aa9a816d0ec6149cc1
31443119
RNDeviceInfo: e5219d380b51ddb7f97e650ab99a518476b90203
31453120
RNFBApp: 0e66b9f844efdf2ac3fa2b30e64c9db41a263b3d
@@ -3166,6 +3141,6 @@ SPEC CHECKSUMS:
31663141
TcpSockets: 48866ffcb39d7114741919d21069fc90189e474a
31673142
Yoga: be6f55a028e86c83ae066f018e9b5d24ffc45436
31683143

3169-
PODFILE CHECKSUM: 033808919dd752c40fc3611590e62c09313aebef
3144+
PODFILE CHECKSUM: 20632d9b56e8d8b1ec7a6bf641f3f258589efc31
31703145

31713146
COCOAPODS: 1.16.2

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@
215215
"@react-native-clipboard/clipboard": "1.8.4",
216216
"@react-native-community/blur": "^4.4.0",
217217
"@react-native-community/checkbox": "^0.5.17",
218-
"@react-native-community/datetimepicker": "^8.0.0",
219218
"@react-native-community/netinfo": "11.1.0",
220219
"@react-native-community/slider": "^4.4.3",
221220
"@react-native-cookies/cookies": "^6.2.1",
@@ -335,7 +334,7 @@
335334
"react-native-randombytes": "^3.5.3",
336335
"react-native-reanimated": "^3.16.7",
337336
"react-native-render-html": "^6.3.4",
338-
"react-native-safe-area-context": "4.8.2",
337+
"react-native-safe-area-context": "^5.1.0",
339338
"react-native-screens": "^4.5.0",
340339
"react-native-scrollable-tab-view": "^1.0.0",
341340
"react-native-sensors": "5.3.0",
@@ -603,7 +602,8 @@
603602
"@react-native-firebase/app>firebase>@firebase/firestore>@grpc/proto-loader>protobufjs": false,
604603
"appium": false,
605604
"appium>@appium/support>sharp": false,
606-
"@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service>eip55>keccak": false
605+
"@metamask/eth-ledger-bridge-keyring>@ledgerhq/hw-app-eth>@ledgerhq/domain-service>eip55>keccak": false,
606+
"$root$": false
607607
}
608608
},
609609
"packageManager": "[email protected]"

patches/@react-native-community+datetimepicker+7.7.0.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

patches/react-native-gzip+1.1.0.patch

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
diff --git a/node_modules/react-native-gzip/ios/Gzip.h b/node_modules/react-native-gzip/ios/Gzip.h
2-
index 45b39a3..1eddbaa 100644
2+
index 45b39a3..1220ec5 100644
33
--- a/node_modules/react-native-gzip/ios/Gzip.h
44
+++ b/node_modules/react-native-gzip/ios/Gzip.h
5-
@@ -1,12 +1,6 @@
6-
5+
@@ -1,12 +1,4 @@
6+
-
77
-#ifdef RCT_NEW_ARCH_ENABLED
88
-#import "RNGzipSpec.h"
99
-
@@ -13,31 +13,23 @@ index 45b39a3..1eddbaa 100644
1313

1414
@interface Gzip : NSObject <RCTBridgeModule>
1515
-#endif
16-
16+
-
1717
@end
1818
diff --git a/node_modules/react-native-gzip/ios/Gzip.mm b/node_modules/react-native-gzip/ios/Gzip.mm
19-
index b79ded4..74fbba8 100644
19+
index b79ded4..24ae6e2 100644
2020
--- a/node_modules/react-native-gzip/ios/Gzip.mm
2121
+++ b/node_modules/react-native-gzip/ios/Gzip.mm
22-
@@ -25,12 +25,14 @@ @implementation Gzip
22+
@@ -24,13 +24,4 @@ @implementation Gzip
23+
resolve([[_data gzippedData] base64String]);
2324
}
2425

25-
// Don't compile this code when we build for the old architecture.
26+
-// Don't compile this code when we build for the old architecture.
2627
-#ifdef RCT_NEW_ARCH_ENABLED
2728
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
2829
- (const facebook::react::ObjCTurboModule::InitParams &)params
2930
-{
3031
- return std::make_shared<facebook::react::NativeGzipSpecJSI>(params);
3132
-}
3233
-#endif
33-
+// Commented out to upgrade to RN 0.76.0
34-
+// TODO: put back with the new architecture
35-
+// #ifdef RCT_NEW_ARCH_ENABLED
36-
+// - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
37-
+// (const facebook::react::ObjCTurboModule::InitParams &)params
38-
+// {
39-
+// return std::make_shared<facebook::react::NativeGzipSpecJSI>(params);
40-
+// }
41-
+// #endif
42-
34+
-
4335
@end

yarn.lock

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6709,13 +6709,6 @@
67096709
prompts "^2.4.2"
67106710
semver "^7.5.2"
67116711

6712-
"@react-native-community/datetimepicker@^8.0.0":
6713-
version "8.2.0"
6714-
resolved "https://registry.yarnpkg.com/@react-native-community/datetimepicker/-/datetimepicker-8.2.0.tgz#f62ac4fc12bd527fbbe93934e6c1cfbb7ba570f3"
6715-
integrity sha512-qrUPhiBvKGuG9Y+vOqsc56RPFcHa1SU2qbAMT0hfGkoFIj3FodE0VuPVrEa8fgy7kcD5NQmkZIKgHOBLV0+hWg==
6716-
dependencies:
6717-
invariant "^2.2.4"
6718-
67196712
"@react-native-community/[email protected]":
67206713
version "11.1.0"
67216714
resolved "https://registry.yarnpkg.com/@react-native-community/netinfo/-/netinfo-11.1.0.tgz#b3b2ab741a5d935e445685ade8a53d48775e082b"
@@ -25498,10 +25491,10 @@ react-native-render-html@^6.3.4:
2549825491
stringify-entities "^3.1.0"
2549925492
urijs "^1.19.6"
2550025493

25501-
react-native-safe-area-context@4.8.2:
25502-
version "4.8.2"
25503-
resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-4.8.2.tgz#e6b3d8acf3c6afcb4b5db03a97f9c37df7668f65"
25504-
integrity sha512-ffUOv8BJQ6RqO3nLml5gxJ6ab3EestPiyWekxdzO/1MQ7NF8fW1Mzh1C5QE9yq573Xefnc7FuzGXjtesZGv7cQ==
25494+
react-native-safe-area-context@^5.1.0:
25495+
version "5.1.0"
25496+
resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-5.1.0.tgz#0125f0c7762a2c189a3d067623ab8fbcdcb79cb8"
25497+
integrity sha512-Y4vyJX+0HPJUQNVeIJTj2/UOjbSJcB09OEwirAWDrOZ67Lz5p43AmjxSy8nnZft1rMzoh3rcPuonB6jJyHTfCw==
2550525498

2550625499
react-native-screens@^4.5.0:
2550725500
version "4.5.0"

0 commit comments

Comments
 (0)