From 0d199d7e8efb1c2e8f6988fe9092c8a5fae795bf Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Mon, 4 Sep 2023 10:32:46 +0100 Subject: [PATCH 01/53] Bump Branch IPHONEOS_DEPLOYMENT_TARGETs from 8 to 12 Fix iOS build (clang) error: https://github.com/CocoaPods/CocoaPods/issues/12033 --- ios/branch-ios-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/branch-ios-sdk b/ios/branch-ios-sdk index b9f6a988be0..5c45e34ab3b 160000 --- a/ios/branch-ios-sdk +++ b/ios/branch-ios-sdk @@ -1 +1 @@ -Subproject commit b9f6a988be0a4088bfc9ba08096fab7326008373 +Subproject commit 5c45e34ab3b25be9cbe68acc9b47fd35a60bf55d From acb6d40c94db4e3fe5d56f0ee8747f842bed8f9f Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Mon, 4 Sep 2023 10:33:01 +0100 Subject: [PATCH 02/53] Bump MixPanel IPHONEOS_DEPLOYMENT_TARGETs from 8 to 12 Fix iOS build (clang) error: https://github.com/CocoaPods/CocoaPods/issues/12033 --- ios/mixpanel-iphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/mixpanel-iphone b/ios/mixpanel-iphone index 07546ff0c97..109a7e2cd5a 160000 --- a/ios/mixpanel-iphone +++ b/ios/mixpanel-iphone @@ -1 +1 @@ -Subproject commit 07546ff0c970aa360040ad667979cec5b9ca56b9 +Subproject commit 109a7e2cd5aa2636b992ba6983b153b19b423688 From 07ed7d4a566cff483fa4e7c5ed306841eec1a1e1 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Mon, 4 Sep 2023 10:35:01 +0100 Subject: [PATCH 03/53] Upgrade RN from 0.71.6 to 0.71.13 (npm) --- package.json | 4 +- yarn.lock | 153 ++++++++------------------------------------------- 2 files changed, 26 insertions(+), 131 deletions(-) diff --git a/package.json b/package.json index 8fcad156d4b..cc0e2ac8485 100644 --- a/package.json +++ b/package.json @@ -252,7 +252,7 @@ "query-string": "^6.12.1", "randomfill": "^1.0.4", "react": "18.2.0", - "react-native": "0.71.6", + "react-native": "0.71.13", "react-native-actionsheet": "beefe/react-native-actionsheet#107/head", "react-native-aes-crypto": "1.3.9", "react-native-aes-crypto-forked": "git+https://github.com/MetaMask/react-native-aes-crypto-forked.git#397d5db5250e8e7408294807965b5b9fd4ca6a25", @@ -425,7 +425,7 @@ "koa": "^2.14.2", "lint-staged": "10.5.4", "metro": "0.72.3", - "metro-react-native-babel-preset": "0.73.9", + "metro-react-native-babel-preset": "0.73.10", "multiple-cucumber-html-reporter": "^3.0.1", "nock": "^13.3.1", "octonode": "0.10.2", diff --git a/yarn.lock b/yarn.lock index 9bebe23e4fd..aa6bbe74dda 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5803,7 +5803,7 @@ dependencies: serve-static "^1.13.1" -"@react-native-community/cli-doctor@^10.2.2": +"@react-native-community/cli-doctor@^10.2.4": version "10.2.5" resolved "https://registry.yarnpkg.com/@react-native-community/cli-doctor/-/cli-doctor-10.2.5.tgz#e5e28c66c2373f05a94b296a8ec637f8df736707" integrity sha512-1YbzXvsldBmSw1MmBsXB74bKiHXKNCjlb2ByLgkfTiarpSvETYam3g5vex0N+qc0Cdkzkq+8NznE744LFhnUpw== @@ -5847,10 +5847,10 @@ glob "^7.1.3" logkitty "^0.7.1" -"@react-native-community/cli-platform-ios@10.2.1": - version "10.2.1" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-10.2.1.tgz#2e6bd2cb6d48cbb8720d7b7265bb1bab80745f72" - integrity sha512-hz4zu4Y6eyj7D0lnZx8Mf2c2si8y+zh/zUTgCTaPPLzQD8jSZNNBtUUiA1cARm2razpe8marCZ1QbTMAGbf3mg== +"@react-native-community/cli-platform-ios@10.2.4": + version "10.2.4" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-10.2.4.tgz#6af05cd4258438422a3a50d1c0cc757acd6be375" + integrity sha512-/6K+jeRhcGojFIJMWMXV2eY5n/In+YUzBr/DKWQOeHBOHkESRNheG310xSAIjgB46YniSSUKhSyeuhalTbm9OQ== dependencies: "@react-native-community/cli-tools" "^10.1.1" chalk "^4.1.2" @@ -5871,7 +5871,7 @@ glob "^7.1.3" ora "^5.4.1" -"@react-native-community/cli-plugin-metro@^10.2.2": +"@react-native-community/cli-plugin-metro@^10.2.3": version "10.2.3" resolved "https://registry.yarnpkg.com/@react-native-community/cli-plugin-metro/-/cli-plugin-metro-10.2.3.tgz#419e0155a50951c3329818fba51cb5021a7294f1" integrity sha512-jHi2oDuTePmW4NEyVT8JEGNlIYcnFXCSV2ZMp4rnDrUk4TzzyvS3IMvDlESEmG8Kry8rvP0KSUx/hTpy37Sbkw== @@ -5925,17 +5925,17 @@ dependencies: joi "^17.2.1" -"@react-native-community/cli@10.2.2": - version "10.2.2" - resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-10.2.2.tgz#3fa438ba7f19f83e07bc337765fc1cabdcf2cac2" - integrity sha512-aZVcVIqj+OG6CrliR/Yn8wHxrvyzbFBY9cj7n0MvRw/P54QUru2nNqUTSSbqv0Qaa297yHJbe6kFDojDMSTM8Q== +"@react-native-community/cli@10.2.4": + version "10.2.4" + resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-10.2.4.tgz#c6afe723055d430061a32bd31644fc56eb9ba330" + integrity sha512-E9BUDHfLEsnjkjeJqECuCjl4E/1Ox9Nl6hkQBhEqjZm4AaQxgU7M6AyFfOgaXn5v3am16/R4ZOUTrJnGJWS3GA== dependencies: "@react-native-community/cli-clean" "^10.1.1" "@react-native-community/cli-config" "^10.1.1" "@react-native-community/cli-debugger-ui" "^10.0.0" - "@react-native-community/cli-doctor" "^10.2.2" + "@react-native-community/cli-doctor" "^10.2.4" "@react-native-community/cli-hermes" "^10.2.0" - "@react-native-community/cli-plugin-metro" "^10.2.2" + "@react-native-community/cli-plugin-metro" "^10.2.3" "@react-native-community/cli-server-api" "^10.1.1" "@react-native-community/cli-tools" "^10.1.1" "@react-native-community/cli-types" "^10.0.0" @@ -19281,16 +19281,6 @@ metro-babel-transformer@0.73.10: metro-source-map "0.73.10" nullthrows "^1.1.1" -metro-babel-transformer@0.73.9: - version "0.73.9" - resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.73.9.tgz#bec8aaaf1bbdc2e469fde586fde455f8b2a83073" - integrity sha512-DlYwg9wwYIZTHtic7dyD4BP0SDftoltZ3clma76nHu43blMWsCnrImHeHsAVne3XsQ+RJaSRxhN5nkG2VyVHwA== - dependencies: - "@babel/core" "^7.20.0" - hermes-parser "0.8.0" - metro-source-map "0.73.9" - nullthrows "^1.1.1" - metro-cache-key@0.71.1: version "0.71.1" resolved "https://registry.yarnpkg.com/metro-cache-key/-/metro-cache-key-0.71.1.tgz#932ccdbcda2f785d8b814be3eaaa3d4cd8f84bd9" @@ -19656,50 +19646,6 @@ metro-react-native-babel-preset@0.73.10: "@babel/template" "^7.0.0" react-refresh "^0.4.0" -metro-react-native-babel-preset@0.73.9: - version "0.73.9" - resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.73.9.tgz#ef54637dd20f025197beb49e71309a9c539e73e2" - integrity sha512-AoD7v132iYDV4K78yN2OLgTPwtAKn0XlD2pOhzyBxiI8PeXzozhbKyPV7zUOJUPETj+pcEVfuYj5ZN/8+bhbCw== - dependencies: - "@babel/core" "^7.20.0" - "@babel/plugin-proposal-async-generator-functions" "^7.0.0" - "@babel/plugin-proposal-class-properties" "^7.0.0" - "@babel/plugin-proposal-export-default-from" "^7.0.0" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.0.0" - "@babel/plugin-proposal-object-rest-spread" "^7.0.0" - "@babel/plugin-proposal-optional-catch-binding" "^7.0.0" - "@babel/plugin-proposal-optional-chaining" "^7.0.0" - "@babel/plugin-syntax-dynamic-import" "^7.0.0" - "@babel/plugin-syntax-export-default-from" "^7.0.0" - "@babel/plugin-syntax-flow" "^7.18.0" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.0.0" - "@babel/plugin-syntax-optional-chaining" "^7.0.0" - "@babel/plugin-transform-arrow-functions" "^7.0.0" - "@babel/plugin-transform-async-to-generator" "^7.0.0" - "@babel/plugin-transform-block-scoping" "^7.0.0" - "@babel/plugin-transform-classes" "^7.0.0" - "@babel/plugin-transform-computed-properties" "^7.0.0" - "@babel/plugin-transform-destructuring" "^7.0.0" - "@babel/plugin-transform-flow-strip-types" "^7.0.0" - "@babel/plugin-transform-function-name" "^7.0.0" - "@babel/plugin-transform-literals" "^7.0.0" - "@babel/plugin-transform-modules-commonjs" "^7.0.0" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.0.0" - "@babel/plugin-transform-parameters" "^7.0.0" - "@babel/plugin-transform-react-display-name" "^7.0.0" - "@babel/plugin-transform-react-jsx" "^7.0.0" - "@babel/plugin-transform-react-jsx-self" "^7.0.0" - "@babel/plugin-transform-react-jsx-source" "^7.0.0" - "@babel/plugin-transform-runtime" "^7.0.0" - "@babel/plugin-transform-shorthand-properties" "^7.0.0" - "@babel/plugin-transform-spread" "^7.0.0" - "@babel/plugin-transform-sticky-regex" "^7.0.0" - "@babel/plugin-transform-template-literals" "^7.0.0" - "@babel/plugin-transform-typescript" "^7.5.0" - "@babel/plugin-transform-unicode-regex" "^7.0.0" - "@babel/template" "^7.0.0" - react-refresh "^0.4.0" - metro-react-native-babel-transformer@0.73.10: version "0.73.10" resolved "https://registry.yarnpkg.com/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.73.10.tgz#4e20a9ce131b873cda0b5a44d3eb4002134a64b8" @@ -19713,19 +19659,6 @@ metro-react-native-babel-transformer@0.73.10: metro-source-map "0.73.10" nullthrows "^1.1.1" -metro-react-native-babel-transformer@0.73.9: - version "0.73.9" - resolved "https://registry.yarnpkg.com/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.73.9.tgz#4f4f0cfa5119bab8b53e722fabaf90687d0cbff0" - integrity sha512-DSdrEHuQ22ixY7DyipyKkIcqhOJrt5s6h6X7BYJCP9AMUfXOwLe2biY3BcgJz5GOXv8/Akry4vTCvQscVS1otQ== - dependencies: - "@babel/core" "^7.20.0" - babel-preset-fbjs "^3.4.0" - hermes-parser "0.8.0" - metro-babel-transformer "0.73.9" - metro-react-native-babel-preset "0.73.9" - metro-source-map "0.73.9" - nullthrows "^1.1.1" - metro-resolver@0.71.1: version "0.71.1" resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.71.1.tgz#50fa4eabf1e2cd51e13967eeff7a3ec15f6bbd94" @@ -19770,14 +19703,6 @@ metro-runtime@0.73.10: "@babel/runtime" "^7.0.0" react-refresh "^0.4.0" -metro-runtime@0.73.9: - version "0.73.9" - resolved "https://registry.yarnpkg.com/metro-runtime/-/metro-runtime-0.73.9.tgz#0b24c0b066b8629ee855a6e5035b65061fef60d5" - integrity sha512-d5Hs83FpKB9r8q8Vb95+fa6ESpwysmPr4lL1I2rM2qXAFiO7OAPT9Bc23WmXgidkBtD0uUFdB2lG+H1ATz8rZg== - dependencies: - "@babel/runtime" "^7.0.0" - react-refresh "^0.4.0" - metro-source-map@0.71.1: version "0.71.1" resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.71.1.tgz#717997b758e1e6de463ca838e19c2f73df1ce7fa" @@ -19820,20 +19745,6 @@ metro-source-map@0.73.10: source-map "^0.5.6" vlq "^1.0.0" -metro-source-map@0.73.9: - version "0.73.9" - resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.73.9.tgz#89ca41f6346aeb12f7f23496fa363e520adafebe" - integrity sha512-l4VZKzdqafipriETYR6lsrwtavCF1+CMhCOY9XbyWeTrpGSNgJQgdeJpttzEZTHQQTLR0csQo0nD1ef3zEP6IQ== - dependencies: - "@babel/traverse" "^7.20.0" - "@babel/types" "^7.20.0" - invariant "^2.2.4" - metro-symbolicate "0.73.9" - nullthrows "^1.1.1" - ob1 "0.73.9" - source-map "^0.5.6" - vlq "^1.0.0" - metro-symbolicate@0.71.1: version "0.71.1" resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.71.1.tgz#9252b42ecab81c947a7375ff71a8132ff054e926" @@ -19870,18 +19781,6 @@ metro-symbolicate@0.73.10: through2 "^2.0.1" vlq "^1.0.0" -metro-symbolicate@0.73.9: - version "0.73.9" - resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.73.9.tgz#cb452299a36e5b86b2826e7426d51221635c48bf" - integrity sha512-4TUOwxRHHqbEHxRqRJ3wZY5TA8xq7AHMtXrXcjegMH9FscgYztsrIG9aNBUBS+VLB6g1qc6BYbfIgoAnLjCDyw== - dependencies: - invariant "^2.2.4" - metro-source-map "0.73.9" - nullthrows "^1.1.1" - source-map "^0.5.6" - through2 "^2.0.1" - vlq "^1.0.0" - metro-transform-plugins@0.71.1: version "0.71.1" resolved "https://registry.yarnpkg.com/metro-transform-plugins/-/metro-transform-plugins-0.71.1.tgz#6ada0df5600981d6c948ddea16fcbe3fa174770f" @@ -20990,11 +20889,6 @@ ob1@0.73.10: resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.73.10.tgz#bf0a2e8922bb8687ddca82327c5cf209414a1bd4" integrity sha512-aO6EYC+QRRCkZxVJhCWhLKgVjhNuD6Gu1riGjxrIm89CqLsmKgxzYDDEsktmKsoDeRdWGQM5EdMzXDl5xcVfsw== -ob1@0.73.9: - version "0.73.9" - resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.73.9.tgz#d5677a0dd3e2f16ad84231278d79424436c38c59" - integrity sha512-kHOzCOFXmAM26fy7V/YuXNKne2TyRiXbFAvPBIbuedJCZZWQZHLdPzMeXJI4Egt6IcfDttRzN3jQ90wOwq1iNw== - obj-multiplex@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/obj-multiplex/-/obj-multiplex-1.0.0.tgz#2f2ae6bfd4ae11befe742ea9ea5b36636eabffc1" @@ -22846,7 +22740,7 @@ react-native-get-random-values@^1.8.0: dependencies: fast-base64-decode "^1.0.0" -react-native-gradle-plugin@^0.71.17: +react-native-gradle-plugin@^0.71.19: version "0.71.19" resolved "https://registry.yarnpkg.com/react-native-gradle-plugin/-/react-native-gradle-plugin-0.71.19.tgz#3379e28341fcd189bc1f4691cefc84c1a4d7d232" integrity sha512-1dVk9NwhoyKHCSxcrM6vY6cxmojeATsBobDicX0ZKr7DgUF2cBQRTKsimQFvzH8XhOVXyH8p4HyDSZNIFI8OlQ== @@ -23202,20 +23096,21 @@ react-native-webview@11.13.0: escape-string-regexp "2.0.0" invariant "2.2.4" -react-native@0.71.6: - version "0.71.6" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.71.6.tgz#e8f07baf55abd1015eaa7040ceaa4aa632c2c04f" - integrity sha512-gHrDj7qaAaiE41JwaFCh3AtvOqOLuRgZtHKzNiwxakG/wvPAYmG73ECfWHGxjxIx/QT17Hp37Da3ipCei/CayQ== +react-native@0.71.13: + version "0.71.13" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.71.13.tgz#e20007904f5f8a4b8b1faf1e60f0d7eb9f578ed6" + integrity sha512-zEa69YQNLdv8Sf5Pn0CNDB1K9eGuNy1KoMNxXlrZ89JZ8d02b5hihZIoOCCIwhH+iPgslYwr3ZoGd3AY6FMrgw== dependencies: "@jest/create-cache-key-function" "^29.2.1" - "@react-native-community/cli" "10.2.2" + "@react-native-community/cli" "10.2.4" "@react-native-community/cli-platform-android" "10.2.0" - "@react-native-community/cli-platform-ios" "10.2.1" + "@react-native-community/cli-platform-ios" "10.2.4" "@react-native/assets" "1.0.0" "@react-native/normalize-color" "2.1.0" "@react-native/polyfills" "2.0.0" abort-controller "^3.0.0" anser "^1.4.9" + ansi-regex "^5.0.0" base64-js "^1.1.2" deprecated-react-native-prop-types "^3.0.1" event-target-shim "^5.0.1" @@ -23223,16 +23118,16 @@ react-native@0.71.6: jest-environment-node "^29.2.1" jsc-android "^250231.0.0" memoize-one "^5.0.0" - metro-react-native-babel-transformer "0.73.9" - metro-runtime "0.73.9" - metro-source-map "0.73.9" + metro-react-native-babel-transformer "0.73.10" + metro-runtime "0.73.10" + metro-source-map "0.73.10" mkdirp "^0.5.1" nullthrows "^1.1.1" pretty-format "^26.5.2" promise "^8.3.0" react-devtools-core "^4.26.1" react-native-codegen "^0.71.5" - react-native-gradle-plugin "^0.71.17" + react-native-gradle-plugin "^0.71.19" react-refresh "^0.4.0" react-shallow-renderer "^16.15.0" regenerator-runtime "^0.13.2" From dbd5f040280e9f04c7e1a13d57d1776bc5aa2721 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Mon, 4 Sep 2023 10:35:21 +0100 Subject: [PATCH 04/53] Disable Flipper in Podfile and update lockfile (RN 0.71.13) - use_react_native - post_install --- ios/Podfile | 13 +- ios/Podfile.lock | 583 +++++++++++++++++++---------------------------- 2 files changed, 240 insertions(+), 356 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index 1abfef98521..0d1d5a4f5ac 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -56,7 +56,7 @@ def common_target_logic # Flags change depending on the env values. flags = get_default_flags() - flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled + # flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled use_react_native!( :path => config[:reactNativePath], @@ -74,7 +74,7 @@ def common_target_logic #:flipper_configuration => flipper_config, # An absolute path to your application root. :app_path => "#{Pod::Config.instance.installation_root}/..", - :flipper_configuration => flipper_config, + # :flipper_configuration => flipper_config, ) # Pods for MetaMask @@ -91,8 +91,7 @@ target 'MetaMask-QA' do end post_install do |installer| - flipper_post_install(installer) - react_native_post_install(installer) - __apply_Xcode_12_5_M1_post_install_workaround(installer) - end - + # flipper_post_install(installer) + react_native_post_install(installer) + __apply_Xcode_12_5_M1_post_install_workaround(installer) +end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index f6eb50309a4..12c297a11ee 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -5,84 +5,21 @@ PODS: - React - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - - FBLazyVector (0.71.6) - - FBReactNativeSpec (0.71.6): + - FBLazyVector (0.71.13) + - FBReactNativeSpec (0.71.13): - RCT-Folly (= 2021.07.22.00) - - RCTRequired (= 0.71.6) - - RCTTypeSafety (= 0.71.6) - - React-Core (= 0.71.6) - - React-jsi (= 0.71.6) - - ReactCommon/turbomodule/core (= 0.71.6) - - Flipper (0.125.0): - - Flipper-Folly (~> 2.6) - - Flipper-RSocket (~> 1.4) - - Flipper-Boost-iOSX (1.76.0.1.11) - - Flipper-DoubleConversion (3.2.0.1) - - Flipper-Fmt (7.1.7) - - Flipper-Folly (2.6.10): - - Flipper-Boost-iOSX - - Flipper-DoubleConversion - - Flipper-Fmt (= 7.1.7) - - Flipper-Glog - - libevent (~> 2.1.12) - - OpenSSL-Universal (= 1.1.1100) - - Flipper-Glog (0.5.0.5) - - Flipper-PeerTalk (0.0.4) - - Flipper-RSocket (1.4.3): - - Flipper-Folly (~> 2.6) - - FlipperKit (0.125.0): - - FlipperKit/Core (= 0.125.0) - - FlipperKit/Core (0.125.0): - - Flipper (~> 0.125.0) - - FlipperKit/CppBridge - - FlipperKit/FBCxxFollyDynamicConvert - - FlipperKit/FBDefines - - FlipperKit/FKPortForwarding - - SocketRocket (~> 0.6.0) - - FlipperKit/CppBridge (0.125.0): - - Flipper (~> 0.125.0) - - FlipperKit/FBCxxFollyDynamicConvert (0.125.0): - - Flipper-Folly (~> 2.6) - - FlipperKit/FBDefines (0.125.0) - - FlipperKit/FKPortForwarding (0.125.0): - - CocoaAsyncSocket (~> 7.6) - - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.125.0) - - FlipperKit/FlipperKitLayoutHelpers (0.125.0): - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutTextSearchable - - FlipperKit/FlipperKitLayoutIOSDescriptors (0.125.0): - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutHelpers - - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutPlugin (0.125.0): - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutHelpers - - FlipperKit/FlipperKitLayoutIOSDescriptors - - FlipperKit/FlipperKitLayoutTextSearchable - - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.125.0) - - FlipperKit/FlipperKitNetworkPlugin (0.125.0): - - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.125.0): - - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.125.0): - - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.125.0): - - FlipperKit/Core - - FlipperKit/FlipperKitNetworkPlugin + - RCTRequired (= 0.71.13) + - RCTTypeSafety (= 0.71.13) + - React-Core (= 0.71.13) + - React-jsi (= 0.71.13) + - ReactCommon/turbomodule/core (= 0.71.13) - fmt (6.2.1) - glog (0.3.5) - JitsiWebRTC (106.0.0) - - libevent (2.1.12) - lottie-ios (3.4.1) - lottie-react-native (5.1.5): - lottie-ios (~> 3.4.0) - React-Core - - OpenSSL-Universal (1.1.1100) - RCT-Folly (2021.07.22.00): - boost - DoubleConversion @@ -94,29 +31,29 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - RCTRequired (0.71.6) + - RCTRequired (0.71.13) - RCTSearchApi (1.0.1): - React - React-RCTImage - - RCTTypeSafety (0.71.6): - - FBLazyVector (= 0.71.6) - - RCTRequired (= 0.71.6) - - React-Core (= 0.71.6) - - React (0.71.6): - - React-Core (= 0.71.6) - - React-Core/DevSupport (= 0.71.6) - - React-Core/RCTWebSocket (= 0.71.6) - - React-RCTActionSheet (= 0.71.6) - - React-RCTAnimation (= 0.71.6) - - React-RCTBlob (= 0.71.6) - - React-RCTImage (= 0.71.6) - - React-RCTLinking (= 0.71.6) - - React-RCTNetwork (= 0.71.6) - - React-RCTSettings (= 0.71.6) - - React-RCTText (= 0.71.6) - - React-RCTVibration (= 0.71.6) - - React-callinvoker (0.71.6) - - React-Codegen (0.71.6): + - RCTTypeSafety (0.71.13): + - FBLazyVector (= 0.71.13) + - RCTRequired (= 0.71.13) + - React-Core (= 0.71.13) + - React (0.71.13): + - React-Core (= 0.71.13) + - React-Core/DevSupport (= 0.71.13) + - React-Core/RCTWebSocket (= 0.71.13) + - React-RCTActionSheet (= 0.71.13) + - React-RCTAnimation (= 0.71.13) + - React-RCTBlob (= 0.71.13) + - React-RCTImage (= 0.71.13) + - React-RCTLinking (= 0.71.13) + - React-RCTNetwork (= 0.71.13) + - React-RCTSettings (= 0.71.13) + - React-RCTText (= 0.71.13) + - React-RCTVibration (= 0.71.13) + - React-callinvoker (0.71.13) + - React-Codegen (0.71.13): - FBReactNativeSpec - RCT-Folly - RCTRequired @@ -127,196 +64,196 @@ PODS: - React-jsiexecutor - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - - React-Core (0.71.6): + - React-Core (0.71.13): - glog - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.71.6) - - React-cxxreact (= 0.71.6) + - React-Core/Default (= 0.71.13) + - React-cxxreact (= 0.71.13) - React-jsc - - React-jsi (= 0.71.6) - - React-jsiexecutor (= 0.71.6) - - React-perflogger (= 0.71.6) + - React-jsi (= 0.71.13) + - React-jsiexecutor (= 0.71.13) + - React-perflogger (= 0.71.13) - Yoga - - React-Core/CoreModulesHeaders (0.71.6): + - React-Core/CoreModulesHeaders (0.71.13): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.6) + - React-cxxreact (= 0.71.13) - React-jsc - - React-jsi (= 0.71.6) - - React-jsiexecutor (= 0.71.6) - - React-perflogger (= 0.71.6) + - React-jsi (= 0.71.13) + - React-jsiexecutor (= 0.71.13) + - React-perflogger (= 0.71.13) - Yoga - - React-Core/Default (0.71.6): + - React-Core/Default (0.71.13): - glog - RCT-Folly (= 2021.07.22.00) - - React-cxxreact (= 0.71.6) + - React-cxxreact (= 0.71.13) - React-jsc - - React-jsi (= 0.71.6) - - React-jsiexecutor (= 0.71.6) - - React-perflogger (= 0.71.6) + - React-jsi (= 0.71.13) + - React-jsiexecutor (= 0.71.13) + - React-perflogger (= 0.71.13) - Yoga - - React-Core/DevSupport (0.71.6): + - React-Core/DevSupport (0.71.13): - glog - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.71.6) - - React-Core/RCTWebSocket (= 0.71.6) - - React-cxxreact (= 0.71.6) + - React-Core/Default (= 0.71.13) + - React-Core/RCTWebSocket (= 0.71.13) + - React-cxxreact (= 0.71.13) - React-jsc - - React-jsi (= 0.71.6) - - React-jsiexecutor (= 0.71.6) - - React-jsinspector (= 0.71.6) - - React-perflogger (= 0.71.6) + - React-jsi (= 0.71.13) + - React-jsiexecutor (= 0.71.13) + - React-jsinspector (= 0.71.13) + - React-perflogger (= 0.71.13) - Yoga - - React-Core/RCTActionSheetHeaders (0.71.6): + - React-Core/RCTActionSheetHeaders (0.71.13): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.6) + - React-cxxreact (= 0.71.13) - React-jsc - - React-jsi (= 0.71.6) - - React-jsiexecutor (= 0.71.6) - - React-perflogger (= 0.71.6) + - React-jsi (= 0.71.13) + - React-jsiexecutor (= 0.71.13) + - React-perflogger (= 0.71.13) - Yoga - - React-Core/RCTAnimationHeaders (0.71.6): + - React-Core/RCTAnimationHeaders (0.71.13): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.6) + - React-cxxreact (= 0.71.13) - React-jsc - - React-jsi (= 0.71.6) - - React-jsiexecutor (= 0.71.6) - - React-perflogger (= 0.71.6) + - React-jsi (= 0.71.13) + - React-jsiexecutor (= 0.71.13) + - React-perflogger (= 0.71.13) - Yoga - - React-Core/RCTBlobHeaders (0.71.6): + - React-Core/RCTBlobHeaders (0.71.13): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.6) + - React-cxxreact (= 0.71.13) - React-jsc - - React-jsi (= 0.71.6) - - React-jsiexecutor (= 0.71.6) - - React-perflogger (= 0.71.6) + - React-jsi (= 0.71.13) + - React-jsiexecutor (= 0.71.13) + - React-perflogger (= 0.71.13) - Yoga - - React-Core/RCTImageHeaders (0.71.6): + - React-Core/RCTImageHeaders (0.71.13): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.6) + - React-cxxreact (= 0.71.13) - React-jsc - - React-jsi (= 0.71.6) - - React-jsiexecutor (= 0.71.6) - - React-perflogger (= 0.71.6) + - React-jsi (= 0.71.13) + - React-jsiexecutor (= 0.71.13) + - React-perflogger (= 0.71.13) - Yoga - - React-Core/RCTLinkingHeaders (0.71.6): + - React-Core/RCTLinkingHeaders (0.71.13): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.6) + - React-cxxreact (= 0.71.13) - React-jsc - - React-jsi (= 0.71.6) - - React-jsiexecutor (= 0.71.6) - - React-perflogger (= 0.71.6) + - React-jsi (= 0.71.13) + - React-jsiexecutor (= 0.71.13) + - React-perflogger (= 0.71.13) - Yoga - - React-Core/RCTNetworkHeaders (0.71.6): + - React-Core/RCTNetworkHeaders (0.71.13): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.6) + - React-cxxreact (= 0.71.13) - React-jsc - - React-jsi (= 0.71.6) - - React-jsiexecutor (= 0.71.6) - - React-perflogger (= 0.71.6) + - React-jsi (= 0.71.13) + - React-jsiexecutor (= 0.71.13) + - React-perflogger (= 0.71.13) - Yoga - - React-Core/RCTPushNotificationHeaders (0.71.6): + - React-Core/RCTPushNotificationHeaders (0.71.13): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.6) + - React-cxxreact (= 0.71.13) - React-jsc - - React-jsi (= 0.71.6) - - React-jsiexecutor (= 0.71.6) - - React-perflogger (= 0.71.6) + - React-jsi (= 0.71.13) + - React-jsiexecutor (= 0.71.13) + - React-perflogger (= 0.71.13) - Yoga - - React-Core/RCTSettingsHeaders (0.71.6): + - React-Core/RCTSettingsHeaders (0.71.13): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.6) + - React-cxxreact (= 0.71.13) - React-jsc - - React-jsi (= 0.71.6) - - React-jsiexecutor (= 0.71.6) - - React-perflogger (= 0.71.6) + - React-jsi (= 0.71.13) + - React-jsiexecutor (= 0.71.13) + - React-perflogger (= 0.71.13) - Yoga - - React-Core/RCTTextHeaders (0.71.6): + - React-Core/RCTTextHeaders (0.71.13): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.6) + - React-cxxreact (= 0.71.13) - React-jsc - - React-jsi (= 0.71.6) - - React-jsiexecutor (= 0.71.6) - - React-perflogger (= 0.71.6) + - React-jsi (= 0.71.13) + - React-jsiexecutor (= 0.71.13) + - React-perflogger (= 0.71.13) - Yoga - - React-Core/RCTVibrationHeaders (0.71.6): + - React-Core/RCTVibrationHeaders (0.71.13): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.6) + - React-cxxreact (= 0.71.13) - React-jsc - - React-jsi (= 0.71.6) - - React-jsiexecutor (= 0.71.6) - - React-perflogger (= 0.71.6) + - React-jsi (= 0.71.13) + - React-jsiexecutor (= 0.71.13) + - React-perflogger (= 0.71.13) - Yoga - - React-Core/RCTWebSocket (0.71.6): + - React-Core/RCTWebSocket (0.71.13): - glog - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.71.6) - - React-cxxreact (= 0.71.6) + - React-Core/Default (= 0.71.13) + - React-cxxreact (= 0.71.13) - React-jsc - - React-jsi (= 0.71.6) - - React-jsiexecutor (= 0.71.6) - - React-perflogger (= 0.71.6) + - React-jsi (= 0.71.13) + - React-jsiexecutor (= 0.71.13) + - React-perflogger (= 0.71.13) - Yoga - - React-CoreModules (0.71.6): + - React-CoreModules (0.71.13): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.71.6) - - React-Codegen (= 0.71.6) - - React-Core/CoreModulesHeaders (= 0.71.6) - - React-jsi (= 0.71.6) + - RCTTypeSafety (= 0.71.13) + - React-Codegen (= 0.71.13) + - React-Core/CoreModulesHeaders (= 0.71.13) + - React-jsi (= 0.71.13) - React-RCTBlob - - React-RCTImage (= 0.71.6) - - ReactCommon/turbomodule/core (= 0.71.6) - - React-cxxreact (0.71.6): + - React-RCTImage (= 0.71.13) + - ReactCommon/turbomodule/core (= 0.71.13) + - React-cxxreact (0.71.13): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-callinvoker (= 0.71.6) - - React-jsi (= 0.71.6) - - React-jsinspector (= 0.71.6) - - React-logger (= 0.71.6) - - React-perflogger (= 0.71.6) - - React-runtimeexecutor (= 0.71.6) - - React-jsc (0.71.6): - - React-jsc/Fabric (= 0.71.6) - - React-jsi (= 0.71.6) - - React-jsc/Fabric (0.71.6): - - React-jsi (= 0.71.6) - - React-jsi (0.71.6): + - React-callinvoker (= 0.71.13) + - React-jsi (= 0.71.13) + - React-jsinspector (= 0.71.13) + - React-logger (= 0.71.13) + - React-perflogger (= 0.71.13) + - React-runtimeexecutor (= 0.71.13) + - React-jsc (0.71.13): + - React-jsc/Fabric (= 0.71.13) + - React-jsi (= 0.71.13) + - React-jsc/Fabric (0.71.13): + - React-jsi (= 0.71.13) + - React-jsi (0.71.13): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-jsiexecutor (0.71.6): + - React-jsiexecutor (0.71.13): - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-cxxreact (= 0.71.6) - - React-jsi (= 0.71.6) - - React-perflogger (= 0.71.6) - - React-jsinspector (0.71.6) - - React-logger (0.71.6): + - React-cxxreact (= 0.71.13) + - React-jsi (= 0.71.13) + - React-perflogger (= 0.71.13) + - React-jsinspector (0.71.13) + - React-logger (0.71.13): - glog - react-native-aes (1.3.9): - React @@ -361,93 +298,93 @@ PODS: - React-Core - react-native-webview (11.13.0): - React-Core - - React-perflogger (0.71.6) - - React-RCTActionSheet (0.71.6): - - React-Core/RCTActionSheetHeaders (= 0.71.6) - - React-RCTAnimation (0.71.6): + - React-perflogger (0.71.13) + - React-RCTActionSheet (0.71.13): + - React-Core/RCTActionSheetHeaders (= 0.71.13) + - React-RCTAnimation (0.71.13): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.71.6) - - React-Codegen (= 0.71.6) - - React-Core/RCTAnimationHeaders (= 0.71.6) - - React-jsi (= 0.71.6) - - ReactCommon/turbomodule/core (= 0.71.6) - - React-RCTAppDelegate (0.71.6): + - RCTTypeSafety (= 0.71.13) + - React-Codegen (= 0.71.13) + - React-Core/RCTAnimationHeaders (= 0.71.13) + - React-jsi (= 0.71.13) + - ReactCommon/turbomodule/core (= 0.71.13) + - React-RCTAppDelegate (0.71.13): - RCT-Folly - RCTRequired - RCTTypeSafety - React-Core - ReactCommon/turbomodule/core - - React-RCTBlob (0.71.6): + - React-RCTBlob (0.71.13): - RCT-Folly (= 2021.07.22.00) - - React-Codegen (= 0.71.6) - - React-Core/RCTBlobHeaders (= 0.71.6) - - React-Core/RCTWebSocket (= 0.71.6) - - React-jsi (= 0.71.6) - - React-RCTNetwork (= 0.71.6) - - ReactCommon/turbomodule/core (= 0.71.6) - - React-RCTImage (0.71.6): + - React-Codegen (= 0.71.13) + - React-Core/RCTBlobHeaders (= 0.71.13) + - React-Core/RCTWebSocket (= 0.71.13) + - React-jsi (= 0.71.13) + - React-RCTNetwork (= 0.71.13) + - ReactCommon/turbomodule/core (= 0.71.13) + - React-RCTImage (0.71.13): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.71.6) - - React-Codegen (= 0.71.6) - - React-Core/RCTImageHeaders (= 0.71.6) - - React-jsi (= 0.71.6) - - React-RCTNetwork (= 0.71.6) - - ReactCommon/turbomodule/core (= 0.71.6) - - React-RCTLinking (0.71.6): - - React-Codegen (= 0.71.6) - - React-Core/RCTLinkingHeaders (= 0.71.6) - - React-jsi (= 0.71.6) - - ReactCommon/turbomodule/core (= 0.71.6) - - React-RCTNetwork (0.71.6): + - RCTTypeSafety (= 0.71.13) + - React-Codegen (= 0.71.13) + - React-Core/RCTImageHeaders (= 0.71.13) + - React-jsi (= 0.71.13) + - React-RCTNetwork (= 0.71.13) + - ReactCommon/turbomodule/core (= 0.71.13) + - React-RCTLinking (0.71.13): + - React-Codegen (= 0.71.13) + - React-Core/RCTLinkingHeaders (= 0.71.13) + - React-jsi (= 0.71.13) + - ReactCommon/turbomodule/core (= 0.71.13) + - React-RCTNetwork (0.71.13): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.71.6) - - React-Codegen (= 0.71.6) - - React-Core/RCTNetworkHeaders (= 0.71.6) - - React-jsi (= 0.71.6) - - ReactCommon/turbomodule/core (= 0.71.6) - - React-RCTPushNotification (0.71.6): - - RCTTypeSafety (= 0.71.6) - - React-Codegen (= 0.71.6) - - React-Core/RCTPushNotificationHeaders (= 0.71.6) - - React-jsi (= 0.71.6) - - ReactCommon/turbomodule/core (= 0.71.6) - - React-RCTSettings (0.71.6): + - RCTTypeSafety (= 0.71.13) + - React-Codegen (= 0.71.13) + - React-Core/RCTNetworkHeaders (= 0.71.13) + - React-jsi (= 0.71.13) + - ReactCommon/turbomodule/core (= 0.71.13) + - React-RCTPushNotification (0.71.13): + - RCTTypeSafety (= 0.71.13) + - React-Codegen (= 0.71.13) + - React-Core/RCTPushNotificationHeaders (= 0.71.13) + - React-jsi (= 0.71.13) + - ReactCommon/turbomodule/core (= 0.71.13) + - React-RCTSettings (0.71.13): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.71.6) - - React-Codegen (= 0.71.6) - - React-Core/RCTSettingsHeaders (= 0.71.6) - - React-jsi (= 0.71.6) - - ReactCommon/turbomodule/core (= 0.71.6) - - React-RCTText (0.71.6): - - React-Core/RCTTextHeaders (= 0.71.6) - - React-RCTVibration (0.71.6): + - RCTTypeSafety (= 0.71.13) + - React-Codegen (= 0.71.13) + - React-Core/RCTSettingsHeaders (= 0.71.13) + - React-jsi (= 0.71.13) + - ReactCommon/turbomodule/core (= 0.71.13) + - React-RCTText (0.71.13): + - React-Core/RCTTextHeaders (= 0.71.13) + - React-RCTVibration (0.71.13): - RCT-Folly (= 2021.07.22.00) - - React-Codegen (= 0.71.6) - - React-Core/RCTVibrationHeaders (= 0.71.6) - - React-jsi (= 0.71.6) - - ReactCommon/turbomodule/core (= 0.71.6) - - React-runtimeexecutor (0.71.6): - - React-jsi (= 0.71.6) - - ReactCommon/turbomodule/bridging (0.71.6): + - React-Codegen (= 0.71.13) + - React-Core/RCTVibrationHeaders (= 0.71.13) + - React-jsi (= 0.71.13) + - ReactCommon/turbomodule/core (= 0.71.13) + - React-runtimeexecutor (0.71.13): + - React-jsi (= 0.71.13) + - ReactCommon/turbomodule/bridging (0.71.13): - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-callinvoker (= 0.71.6) - - React-Core (= 0.71.6) - - React-cxxreact (= 0.71.6) - - React-jsi (= 0.71.6) - - React-logger (= 0.71.6) - - React-perflogger (= 0.71.6) - - ReactCommon/turbomodule/core (0.71.6): + - React-callinvoker (= 0.71.13) + - React-Core (= 0.71.13) + - React-cxxreact (= 0.71.13) + - React-jsi (= 0.71.13) + - React-logger (= 0.71.13) + - React-perflogger (= 0.71.13) + - ReactCommon/turbomodule/core (0.71.13): - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-callinvoker (= 0.71.6) - - React-Core (= 0.71.6) - - React-cxxreact (= 0.71.6) - - React-jsi (= 0.71.6) - - React-logger (= 0.71.6) - - React-perflogger (= 0.71.6) + - React-callinvoker (= 0.71.13) + - React-Core (= 0.71.13) + - React-cxxreact (= 0.71.13) + - React-jsi (= 0.71.13) + - React-logger (= 0.71.13) + - React-perflogger (= 0.71.13) - ReactNativePayments (1.5.0): - React - rn-fetch-blob (0.12.0): @@ -525,15 +462,12 @@ PODS: - Sentry/HybridSDK (8.3.0): - SentryPrivate (= 8.3.0) - SentryPrivate (8.3.0) - - SocketRocket (0.6.0) - sovran-react-native (0.4.5): - React-Core - TcpSockets (4.0.0): - CocoaAsyncSocket - React - Yoga (1.14.0) - - YogaKit (1.18.1): - - Yoga (~> 1.14) DEPENDENCIES: - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`) @@ -541,31 +475,9 @@ DEPENDENCIES: - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`) - - Flipper (= 0.125.0) - - Flipper-Boost-iOSX (= 1.76.0.1.11) - - Flipper-DoubleConversion (= 3.2.0.1) - - Flipper-Fmt (= 7.1.7) - - Flipper-Folly (= 2.6.10) - - Flipper-Glog (= 0.5.0.5) - - Flipper-PeerTalk (= 0.0.4) - - Flipper-RSocket (= 1.4.3) - - FlipperKit (= 0.125.0) - - FlipperKit/Core (= 0.125.0) - - FlipperKit/CppBridge (= 0.125.0) - - FlipperKit/FBCxxFollyDynamicConvert (= 0.125.0) - - FlipperKit/FBDefines (= 0.125.0) - - FlipperKit/FKPortForwarding (= 0.125.0) - - FlipperKit/FlipperKitHighlightOverlay (= 0.125.0) - - FlipperKit/FlipperKitLayoutPlugin (= 0.125.0) - - FlipperKit/FlipperKitLayoutTextSearchable (= 0.125.0) - - FlipperKit/FlipperKitNetworkPlugin (= 0.125.0) - - FlipperKit/FlipperKitReactPlugin (= 0.125.0) - - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0) - - FlipperKit/SKIOSNetworkPlugin (= 0.125.0) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - lottie-ios (from `../node_modules/lottie-ios`) - lottie-react-native (from `../node_modules/lottie-react-native`) - - OpenSSL-Universal (= 1.1.1100) - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) - RCTSearchApi (from `../node_modules/react-native-search-api`) @@ -574,7 +486,6 @@ DEPENDENCIES: - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`) - React-Codegen (from `build/generated/ios`) - React-Core (from `../node_modules/react-native/`) - - React-Core/DevSupport (from `../node_modules/react-native/`) - React-Core/RCTWebSocket (from `../node_modules/react-native/`) - React-CoreModules (from `../node_modules/react-native/React/CoreModules`) - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`) @@ -644,23 +555,10 @@ SPEC REPOS: trunk: - Branch - CocoaAsyncSocket - - Flipper - - Flipper-Boost-iOSX - - Flipper-DoubleConversion - - Flipper-Fmt - - Flipper-Folly - - Flipper-Glog - - Flipper-PeerTalk - - Flipper-RSocket - - FlipperKit - fmt - JitsiWebRTC - - libevent - - OpenSSL-Universal - Sentry - SentryPrivate - - SocketRocket - - YogaKit EXTERNAL SOURCES: boost: @@ -828,39 +726,28 @@ SPEC CHECKSUMS: BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 - FBLazyVector: a83ceaa8a8581003a623facdb3c44f6d4f342ac5 - FBReactNativeSpec: 85eee79837cb797ab6176f0243a2b40511c09158 - Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 - Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c - Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 - Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b - Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3 - Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446 - Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 - Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 - FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86 + FBLazyVector: 24e08bf294faea0abc0278abb2fcad7f3e446f6f + FBReactNativeSpec: c949e4b726d8cf9e19b73be60ecfa26355deceb3 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b JitsiWebRTC: f441eb0e2d67f0588bf24e21c5162e97342714fb - libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 lottie-ios: 016449b5d8be0c3dcbcfa0a9988469999cd04c5d lottie-react-native: 3e722c63015fdb9c27638b0a77969fc412067c18 - OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 - RCTRequired: 5c6fd63b03abb06947d348dadac51c93e3485bd8 + RCTRequired: c20235648eeb64a874f55459ceae6b081956318d RCTSearchApi: d2d38a5a7bffbfb144e2c770fbb30f51b1053067 - RCTTypeSafety: 1c66daedd66f674e39ce9f40782f0d490c78b175 - React: e11ca7cdc7aa4ddd7e6a59278b808cfe17ebbd9f - React-callinvoker: 77a82869505c96945c074b80bbdc8df919646d51 - React-Codegen: c82a2e6d2ad883f00a89d4a80781090a8b1cc3ac - React-Core: 9896746d1a42a10183cec8003867ae391d28a920 - React-CoreModules: 83d989defdfc82be1f7386f84a56b6509f54ac74 - React-cxxreact: 46e201a9824518a9e49bfb79729402b067a008ce - React-jsc: f5f7312e31b875ddec3597c298ac013e5a644604 - React-jsi: 89bed41dd010026a1873450b9e79b2b5c804a468 - React-jsiexecutor: fbbbda979d16e09825cced680f799108bec2ab58 - React-jsinspector: d5ce2ef3eb8fd30c28389d0bc577918c70821bd6 - React-logger: 9332c3e7b4ef007a0211c0a9868253aac3e1da82 + RCTTypeSafety: ca004f1fe0b76f7936f7fe7dfd761a4386cf72f5 + React: b27df2b1da30335cf1bf1909056c4e1c3a3603ae + React-callinvoker: f2a69510d781d8226d51342a3cbe8a9b13573ea5 + React-Codegen: fc3a9885cb4d341b87dc28627dc55d21abc89788 + React-Core: ba3402af336f345b2178d97be2dd5d8d70f8f068 + React-CoreModules: 0e081b26ab034992d6a60217fc35a83e8ad9b8ed + React-cxxreact: 65b6f835fb2654a8c2011412bad4f8a2f4d1ccca + React-jsc: 61eedc91c322c4d393cf8369a059902de301f2c9 + React-jsi: a05a2aab770ba542966849e45f330bc366ad8905 + React-jsiexecutor: 619be858f64120a6b9c1b36c1e8c538b55872e23 + React-jsinspector: 7e58fe86c7cc442fd11da0c9d8bef12a8d63f771 + React-logger: a3f6ca0d018749852a2a6f07c154bfc6fcd4195a react-native-aes: ff31f0dd4c791eb423a631ee04570fcf3c618924 react-native-background-timer: 1b6e6b4e10f1b74c367a1fdc3c72b67c619b222b react-native-blur: cfdad7b3c01d725ab62a8a729f42ea463998afa2 @@ -877,20 +764,20 @@ SPEC CHECKSUMS: react-native-view-shot: 4475fde003fe8a210053d1f98fb9e06c1d834e1c react-native-webrtc: f73459325441d15812f86071bdbd0bf3376235d1 react-native-webview: 133a6a5149f963259646e710b4545c67ef35d7c9 - React-perflogger: 43392072a5b867a504e2b4857606f8fc5a403d7f - React-RCTActionSheet: c7b67c125bebeda9fb19fc7b200d85cb9d6899c4 - React-RCTAnimation: c2de79906f607986633a7114bee44854e4c7e2f5 - React-RCTAppDelegate: 2660c1bfb98bf39f7954a076439430502ae220e2 - React-RCTBlob: f8ab8edbb0e4006d260fdda8963ec937192a7f48 - React-RCTImage: c6093f1bf3d67c0428d779b00390617d5bd90699 - React-RCTLinking: 5de47e37937889d22599af4b99d0552bad1b1c3c - React-RCTNetwork: e7d7077e073b08e5dd486fba3fe87ccad90a9bc4 - React-RCTPushNotification: f9a4477d551bc8ca620b7c1e984d1525a0712077 - React-RCTSettings: 72a04921b2e8fb832da7201a60ffffff2a7c62f7 - React-RCTText: 7123c70fef5367e2121fea37e65b9ad6d3747e54 - React-RCTVibration: 73d201599a64ea14b4e0b8f91b64970979fd92e6 - React-runtimeexecutor: 8692ac548bec648fa121980ccb4304afd136d584 - ReactCommon: e1067159764444e5db7c14e294d5cd79fb159c59 + React-perflogger: 431a655960a02f01257d631b2a9bfbb02fd21064 + React-RCTActionSheet: 38c8d496d0faa63013d16f709e10a3acf6b5f100 + React-RCTAnimation: 6da4d599f3262ed8021433ddd96de45ac9e731b1 + React-RCTAppDelegate: 3053338f2a9ebbaccb3828b3d471250a7e7b878c + React-RCTBlob: 54afdbd19710a6d0be0c28b64a4a0db625bc2a30 + React-RCTImage: 4e31e6ebf2b9705831d1855425a043b40eec1f61 + React-RCTLinking: 22ac16d44e2df03e9ca9125273fc58a7c507f529 + React-RCTNetwork: 4bacd206834633c23475485dbc21c18563627af4 + React-RCTPushNotification: e096d355dd364600c9f3760a71d8240d44bb7c29 + React-RCTSettings: 4e4ace986ae92a7e1696fdac11615576b698f337 + React-RCTText: 37a1341bdf1f80e9909f6b69a7a9ee747cb682d3 + React-RCTVibration: 2271362cdf9ff2dae6a2156f5101e5c30b02694d + React-runtimeexecutor: 35cec6420c9d4144b0d06f9fdb093cf8f02bd52c + ReactCommon: 56296d2632e8eb53e94a2b7c0d05db694e164ca7 ReactNativePayments: a4e3ac915256a4e759c8a04338b558494a63a0f5 rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba RNCAsyncStorage: 0c357f3156fcb16c8589ede67cc036330b6698ca @@ -916,12 +803,10 @@ SPEC CHECKSUMS: segment-analytics-react-native: bd1f13ea95bad2313a9c7130da032af0e9a6da60 Sentry: 757565eb01e2a6ef6b26e897e4e47e8213e12f06 SentryPrivate: 668d6ce46835769b32e61dc8b5c78ef0b6cdcef8 - SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 sovran-react-native: fd3dc8f1a4b14acdc4ad25fc6b4ac4f52a2a2a15 TcpSockets: a8eb6b5867fe643e6cfed5db2e4de62f4d1e8fd0 - Yoga: ba09b6b11e6139e3df8229238aa794205ca6a02a - YogaKit: f782866e155069a2cca2517aafea43200b01fd5a + Yoga: 135109c9b8c5d1a8af3a58d21cd4c7aa7f3bf555 -PODFILE CHECKSUM: 8d3adf4eeb9c38c94e164bf39d459809e3147413 +PODFILE CHECKSUM: 559a01793f9ae806653374ed293dcefb80cdd05a COCOAPODS: 1.12.1 From 1e432e05dc3ba74e9cd9d548686a39ad38b269ad Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Mon, 4 Sep 2023 10:35:27 +0100 Subject: [PATCH 05/53] Add NO_FLIPPER=1 to pod:install script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cc0e2ac8485..b321a8f797c 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "watch": "./scripts/build.sh watcher watch", "watch:clean": "./scripts/build.sh watcher clean", "clean:ios": "rm -rf ios/build", - "pod:install": "command -v pod && (cd ios/ && pod install && cd ..) || echo \"Skipping pod install\"", + "pod:install": "command -v pod && (cd ios/ && NO_FLIPPER=1 pod install && cd ..) || echo \"Skipping pod install\"", "clean:android": "rm -rf android/app/build", "clean:node": "rm -rf node_modules && yarn --frozen-lockfile", "clean": "yarn clean:ios && yarn clean:android && yarn clean:node", From 14d18a641ef2a4328c5e6fec20cffe5c8cafa161 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Mon, 4 Sep 2023 10:35:36 +0100 Subject: [PATCH 06/53] Account for NO_FLIPPER (react-native-flipper) in react-native.config.js --- react-native.config.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/react-native.config.js b/react-native.config.js index 7d920995b95..3c2930025b1 100644 --- a/react-native.config.js +++ b/react-native.config.js @@ -2,6 +2,9 @@ // eslint-disable-next-line import/no-commonjs module.exports = { dependencies: { + ...(process.env.NO_FLIPPER + ? { 'react-native-flipper': { platforms: { ios: null } } } + : {}), 'react-native-aes-crypto-forked': { platforms: { ios: null, // disable Android platform, other platforms will still autolink if provided From a7ec533c98c03bff3b7f700b19bf646d671e5178 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Mon, 4 Sep 2023 10:37:58 +0100 Subject: [PATCH 07/53] Update Sentry (npm) - update deps - remove old resolutions No changes to Pod lockfile, so iOS build error (SentryPrivate) sadly persists --- package.json | 6 +- yarn.lock | 215 ++++++++++++++++++++++++++------------------------- 2 files changed, 112 insertions(+), 109 deletions(-) diff --git a/package.json b/package.json index b321a8f797c..05f3c8a1e51 100644 --- a/package.json +++ b/package.json @@ -94,8 +94,6 @@ "minimatch": "5.1.0", "**/nanoid": "^3.1.31", "**/json-schema": "^0.4.0", - "@sentry/react-native/**/xmldom": "^0.6.0", - "@sentry/**/simple-plist": "^1.3.1", "@sideway/formula": "3.0.1", "react-native/**/simple-plist": "^1.3.1", "react-native-svg/**/nth-check": "^2.0.1", @@ -189,8 +187,8 @@ "@rnhooks/keyboard": "^0.0.3", "@segment/analytics-react-native": "2.13.0", "@segment/sovran-react-native": "0.4.5", - "@sentry/integrations": "6.3.1", - "@sentry/react-native": "5.1.1", + "@sentry/integrations": "6.19.7", + "@sentry/react-native": "5.9.1", "@tradle/react-native-http": "2.0.1", "@types/lodash": "^4.14.184", "@walletconnect/client": "^1.7.1", diff --git a/yarn.lock b/yarn.lock index aa6bbe74dda..7332b603acd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6184,21 +6184,32 @@ deepmerge "^4.2.2" shell-quote "1.7.3" -"@sentry/browser@7.40.0": - version "7.40.0" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.40.0.tgz#e088154b4d104dfb33f7ca19bfd1276c60010b2d" - integrity sha512-07rZ+cTcpmYB1r84/oZtmSPJJvLCxW8yIh/5s4MdKRyZpqIDKhOz6cCS/4j+l1V+MeLcNLZBjFtNdKA2eocTpg== - dependencies: - "@sentry/core" "7.40.0" - "@sentry/replay" "7.40.0" - "@sentry/types" "7.40.0" - "@sentry/utils" "7.40.0" - tslib "^1.9.3" - -"@sentry/cli@2.14.4": - version "2.14.4" - resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.14.4.tgz#7301af5172b41f25d758ae069b297635433fac7b" - integrity sha512-PPtb5qA2sKnYvj2QBBGOrla4kyG6AqOTVaELoc80mZgZ+yDjuaPH/Xmbg/K+rzZyypVlv4XleTtju44830Q/SA== +"@sentry-internal/tracing@7.63.0": + version "7.63.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.63.0.tgz#58903b2205456034611cc5bc1b5b2479275f89c7" + integrity sha512-Fxpc53p6NGvLSURg3iRvZA0k10K9yfeVhtczvJnpX30POBuV41wxpkLHkb68fjksirjEma1K3Ut1iLOEEDpPQg== + dependencies: + "@sentry/core" "7.63.0" + "@sentry/types" "7.63.0" + "@sentry/utils" "7.63.0" + tslib "^2.4.1 || ^1.9.3" + +"@sentry/browser@7.63.0": + version "7.63.0" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.63.0.tgz#d7eee4be7bfff015f050bca83cafb111dc13d40d" + integrity sha512-P1Iw/2281C/7CUCRsN4jgXvjMNKnrwKqxRg7JqN8eVeCDPMpOeEPHNJ6YatEXdVLTKVn0JB7L63Q1prhFr8+SQ== + dependencies: + "@sentry-internal/tracing" "7.63.0" + "@sentry/core" "7.63.0" + "@sentry/replay" "7.63.0" + "@sentry/types" "7.63.0" + "@sentry/utils" "7.63.0" + tslib "^2.4.1 || ^1.9.3" + +"@sentry/cli@2.20.5": + version "2.20.5" + resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.20.5.tgz#255a5388ca24c211a0eae01dcc4ad813a7ff335a" + integrity sha512-ZvWb86eF0QXH9C5Mbi87aUmr8SH848yEpXJmlM2AoBowpE9kKDnewCAKvyXUihojUFwCSEEjoJhrRMMgmCZqXA== dependencies: https-proxy-agent "^5.0.0" node-fetch "^2.6.7" @@ -6206,115 +6217,104 @@ proxy-from-env "^1.1.0" which "^2.0.2" -"@sentry/core@7.40.0": - version "7.40.0" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.40.0.tgz#1013ddf576ed3a4be9abf2b8e8b0c95ab7e3d7bb" - integrity sha512-OPAobQG0GTY++r5LWUcOA1lS+2TY2Lmw/i5s4kL9WbY+f08dbLNEGNBObY7/V98OL4f7OG+nWaPFybgM7kqUTQ== +"@sentry/core@7.63.0": + version "7.63.0" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.63.0.tgz#8c38da6ef3a1de6e364463a09bc703b196ecbba4" + integrity sha512-13Ljiq8hv6ieCkO+Am99/PljYJO5ynKT/hRQrWgGy9IIEgUr8sV3fW+1W6K4/3MCeOJou0HsiGBjOD1mASItVg== dependencies: - "@sentry/types" "7.40.0" - "@sentry/utils" "7.40.0" - tslib "^1.9.3" + "@sentry/types" "7.63.0" + "@sentry/utils" "7.63.0" + tslib "^2.4.1 || ^1.9.3" -"@sentry/hub@7.40.0": - version "7.40.0" - resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-7.40.0.tgz#afed24056d97d5be4f8b400394f27065a448fe28" - integrity sha512-68GG6wV76qEUyL0tIKB0N+tF7vNyBjHHwHmHk8PElAAkJyIewCXdGuhjpoDshDe7aQ3iLOg1u68rMDN0d3z29w== +"@sentry/hub@7.63.0": + version "7.63.0" + resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-7.63.0.tgz#7bf9bbb5930c96d6c91f002029b4b64e66fcd42a" + integrity sha512-IDgNcoa+YiBbPrDwrZuzSP+vN9wvlQjLEL3OVn0OFaA6Q3X/Zs40JjRz4bTdKb9SjXbyeJ2boFr+4EFvGQoJ1Q== dependencies: - "@sentry/core" "7.40.0" - "@sentry/types" "7.40.0" - "@sentry/utils" "7.40.0" - tslib "^1.9.3" + "@sentry/core" "7.63.0" + "@sentry/types" "7.63.0" + "@sentry/utils" "7.63.0" + tslib "^2.4.1 || ^1.9.3" -"@sentry/integrations@6.3.1": - version "6.3.1" - resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-6.3.1.tgz#8bd4c05a83c5fe8ece6cb59a6e31e1e632a14af8" - integrity sha512-fB0+CmU2L2VJ8WyI33t060lxpBNAoh092jzMGEnnfPKTVMxnscjFrISzrWXQZs/OoR6q8Yo/+pZAT5gWA0dDOQ== +"@sentry/integrations@6.19.7": + version "6.19.7" + resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-6.19.7.tgz#e6e126b692077c8731644224c754012bed65b425" + integrity sha512-yNeeFyuygJaV7Mdc5qWuDa13xVj5mVdECaaw2Xs4pfeHaXmRfRzZY17N8ypWFegKWxKBHynyQRMD10W5pBwJvA== dependencies: - "@sentry/types" "6.3.1" - "@sentry/utils" "6.3.1" + "@sentry/types" "6.19.7" + "@sentry/utils" "6.19.7" localforage "^1.8.1" tslib "^1.9.3" -"@sentry/integrations@7.40.0": - version "7.40.0" - resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-7.40.0.tgz#953aa7144ea2c7bfec36284c9a4ed06d6d134dea" - integrity sha512-8TLo7RKKpTXRDdeeBFNaA3YA4NG5hbAkl2o9wDHJW5NJouyr7IK6ia6qd2v94RXJAVB7nnjtQUdnkXGR59E4RA== +"@sentry/integrations@7.63.0": + version "7.63.0" + resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-7.63.0.tgz#bf4268b524670fdbc290dc489de0069143b499c6" + integrity sha512-+P8GNqFZNH/yS/KPbvUfUDERneoRNUrqp9ayvvp8aq4cTtrBdM72CYgI21oG6cti42SSM1VDLYZomTV3ElPzSg== dependencies: - "@sentry/types" "7.40.0" - "@sentry/utils" "7.40.0" + "@sentry/types" "7.63.0" + "@sentry/utils" "7.63.0" localforage "^1.8.1" - tslib "^1.9.3" - -"@sentry/react-native@5.1.1": - version "5.1.1" - resolved "https://registry.yarnpkg.com/@sentry/react-native/-/react-native-5.1.1.tgz#bdc19baa22e6239bb4e2bd7379df8f13993985d2" - integrity sha512-umQAq2HEnYU8mhl1aLQY+YSd4vd56SIyiXn4yFSwwVuzOaPfxG3oGEVAFb6ulI3iOO/7ZeGrsc0SbrxMnBx4HA== - dependencies: - "@sentry/browser" "7.40.0" - "@sentry/cli" "2.14.4" - "@sentry/core" "7.40.0" - "@sentry/hub" "7.40.0" - "@sentry/integrations" "7.40.0" - "@sentry/react" "7.40.0" - "@sentry/tracing" "7.40.0" - "@sentry/types" "7.40.0" - "@sentry/utils" "7.40.0" - -"@sentry/react@7.40.0": - version "7.40.0" - resolved "https://registry.yarnpkg.com/@sentry/react/-/react-7.40.0.tgz#2c904270110b11cf1b588eb75f71aed9fe570828" - integrity sha512-7yYagpOCdsXnVTtLL8Y7wAf2xXgsk2ncuju3O/G4kEckkLewZWmQeoknOSGFlAgVdGNhTaXc2WGzgOiBMOkhug== - dependencies: - "@sentry/browser" "7.40.0" - "@sentry/types" "7.40.0" - "@sentry/utils" "7.40.0" + tslib "^2.4.1 || ^1.9.3" + +"@sentry/react-native@5.9.1": + version "5.9.1" + resolved "https://registry.yarnpkg.com/@sentry/react-native/-/react-native-5.9.1.tgz#8fd87795225f2e62f95007a0d009f83121566c66" + integrity sha512-L5Ah5cZ39b6iNlsHXHj7vxiTePGTxs+JWJPCyGYnmeleh0IQaDedDJJgYwB78D8mGuq4JnTOY5B9BrFKBtLLlg== + dependencies: + "@sentry/browser" "7.63.0" + "@sentry/cli" "2.20.5" + "@sentry/core" "7.63.0" + "@sentry/hub" "7.63.0" + "@sentry/integrations" "7.63.0" + "@sentry/react" "7.63.0" + "@sentry/types" "7.63.0" + "@sentry/utils" "7.63.0" + +"@sentry/react@7.63.0": + version "7.63.0" + resolved "https://registry.yarnpkg.com/@sentry/react/-/react-7.63.0.tgz#6d318191e13ccf7ebba4897d7258b4ea3bcf6c51" + integrity sha512-KFRjgADVE4aMI7gJmGnoSz65ZErQlz9xRB3vETWSyNOLprWXuQLPPtcDEn39BROtsDG4pLyYFaSDiD7o0+DyjQ== + dependencies: + "@sentry/browser" "7.63.0" + "@sentry/types" "7.63.0" + "@sentry/utils" "7.63.0" hoist-non-react-statics "^3.3.2" - tslib "^1.9.3" + tslib "^2.4.1 || ^1.9.3" -"@sentry/replay@7.40.0": - version "7.40.0" - resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.40.0.tgz#cf78b5bf92b9a3c045022e7cc4fede7ef4ffe874" - integrity sha512-Y9Kvo9jKouUdrHQhHVv5SmWZClF5o7BFI6oVpLlv4zXORPQlyoZONM/9sxiMvvH73alDSpxzCoxyhlypAOH4ww== +"@sentry/replay@7.63.0": + version "7.63.0" + resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.63.0.tgz#989ae32ea028a5eca323786cc07294fedb1f0d45" + integrity sha512-ikeFVojuP9oDF103blZcj0Vvb4S50dV54BESMrMW2lYBoMMjvOd7AdL+iDHjn1OL05/mv1C6Oc8MovmvdjILVA== dependencies: - "@sentry/core" "7.40.0" - "@sentry/types" "7.40.0" - "@sentry/utils" "7.40.0" + "@sentry/core" "7.63.0" + "@sentry/types" "7.63.0" + "@sentry/utils" "7.63.0" -"@sentry/tracing@7.40.0": - version "7.40.0" - resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-7.40.0.tgz#4a6bb37febe4d65901be227bed7a0b8743d59c31" - integrity sha512-y1SNwlFEC7a2ThtWbT/KbnAVecAWyIeKiO/IRgyZSdcj1z4CliADKNQmkUhnDlLy8jV1ARGuZ1DvsuPNlWyDfw== - dependencies: - "@sentry/core" "7.40.0" - "@sentry/types" "7.40.0" - "@sentry/utils" "7.40.0" - tslib "^1.9.3" - -"@sentry/types@6.3.1": - version "6.3.1" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.3.1.tgz#af3b54728b29f633f38fbe51b8c10e3834fbc158" - integrity sha512-BEBn8JX1yaooCAuonbaMci9z0RjwwMbQ3Eny/eyDdd+rjXprZCZaStZnCvSThbNBqAJ8YaUqY2YBMnEwJxarAw== +"@sentry/types@6.19.7": + version "6.19.7" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.19.7.tgz#c6b337912e588083fc2896eb012526cf7cfec7c7" + integrity sha512-jH84pDYE+hHIbVnab3Hr+ZXr1v8QABfhx39KknxqKWr2l0oEItzepV0URvbEhB446lk/S/59230dlUUIBGsXbg== -"@sentry/types@7.40.0": - version "7.40.0" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.40.0.tgz#27b012b59d593132e413018773f0a045d68075d7" - integrity sha512-dIbqBenbmDx1F8pvfC11C88J83ecwumUhV+YOIxcmVd1fmlPF2hXWZ01+NTkTDkCu341sJx4wPQogByFy8FwGA== +"@sentry/types@7.63.0": + version "7.63.0" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.63.0.tgz#8032029fee6f70e04b667646626a674b03e2f79b" + integrity sha512-pZNwJVW7RqNLGuTUAhoygt0c9zmc0js10eANAz0MstygJRhQI1tqPDuiELVdujPrbeL+IFKF+7NvRDAydR2Niw== -"@sentry/utils@6.3.1": - version "6.3.1" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.3.1.tgz#6d8e691139b5b49d8c655ad1dcaf2cb3ff0d0b03" - integrity sha512-cdtl/QWC9FtinAuW3w8QfvSfh/Q9ui5vwvjzVHiS1ga/U38edi2XX+cttY39ZYwz0SQG99cE10GOIhd1p7/mAA== +"@sentry/utils@6.19.7": + version "6.19.7" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.19.7.tgz#6edd739f8185fd71afe49cbe351c1bbf5e7b7c79" + integrity sha512-z95ECmE3i9pbWoXQrD/7PgkBAzJYR+iXtPuTkpBjDKs86O3mT+PXOT3BAn79w2wkn7/i3vOGD2xVr1uiMl26dA== dependencies: - "@sentry/types" "6.3.1" + "@sentry/types" "6.19.7" tslib "^1.9.3" -"@sentry/utils@7.40.0": - version "7.40.0" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.40.0.tgz#0986f2e93b1d42b1e1aeb077941226e3d76419c4" - integrity sha512-ZdCbTpAXPiVVfvNJVftnDhsctOui71MDUhVIdLkgg4Cuic+WHGPRmmZ+H6uZdp7vRaeB+Uvnn5+t2iSAVo/mAA== +"@sentry/utils@7.63.0": + version "7.63.0" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.63.0.tgz#7c598553b4dbb6e3740dc96bc7f112ec32edbe69" + integrity sha512-7FQv1RYAwnuTuarruP+1+Jd6YQuN7i/Y7KltwPMVEwU7j5mzYQaexLr/Jz1XIdR2KYVdkbXQyP8jj8BmA6u9Jw== dependencies: - "@sentry/types" "7.40.0" - tslib "^1.9.3" + "@sentry/types" "7.63.0" + tslib "^2.4.1 || ^1.9.3" "@sideway/address@^4.1.0": version "4.1.2" @@ -25877,6 +25877,11 @@ tslib@^2.4.0, tslib@^2.5.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== +"tslib@^2.4.1 || ^1.9.3": + version "2.6.2" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" + integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== + tslib@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" @@ -27130,7 +27135,7 @@ xmlbuilder@~11.0.0: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== -xmldom@^0.6.0, xmldom@^0.x: +xmldom@^0.x: version "0.6.0" resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.6.0.tgz#43a96ecb8beece991cef382c08397d82d4d0c46f" integrity sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg== From 0cbd66fabf72be7cece2abf9522cc4500c4bcf08 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Fri, 29 Sep 2023 13:35:52 +0100 Subject: [PATCH 08/53] Revert "Update Sentry (npm)" This reverts commit a7ec533c98c03bff3b7f700b19bf646d671e5178. --- package.json | 6 +- yarn.lock | 215 +++++++++++++++++++++++++-------------------------- 2 files changed, 109 insertions(+), 112 deletions(-) diff --git a/package.json b/package.json index 05f3c8a1e51..b321a8f797c 100644 --- a/package.json +++ b/package.json @@ -94,6 +94,8 @@ "minimatch": "5.1.0", "**/nanoid": "^3.1.31", "**/json-schema": "^0.4.0", + "@sentry/react-native/**/xmldom": "^0.6.0", + "@sentry/**/simple-plist": "^1.3.1", "@sideway/formula": "3.0.1", "react-native/**/simple-plist": "^1.3.1", "react-native-svg/**/nth-check": "^2.0.1", @@ -187,8 +189,8 @@ "@rnhooks/keyboard": "^0.0.3", "@segment/analytics-react-native": "2.13.0", "@segment/sovran-react-native": "0.4.5", - "@sentry/integrations": "6.19.7", - "@sentry/react-native": "5.9.1", + "@sentry/integrations": "6.3.1", + "@sentry/react-native": "5.1.1", "@tradle/react-native-http": "2.0.1", "@types/lodash": "^4.14.184", "@walletconnect/client": "^1.7.1", diff --git a/yarn.lock b/yarn.lock index 7332b603acd..aa6bbe74dda 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6184,32 +6184,21 @@ deepmerge "^4.2.2" shell-quote "1.7.3" -"@sentry-internal/tracing@7.63.0": - version "7.63.0" - resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.63.0.tgz#58903b2205456034611cc5bc1b5b2479275f89c7" - integrity sha512-Fxpc53p6NGvLSURg3iRvZA0k10K9yfeVhtczvJnpX30POBuV41wxpkLHkb68fjksirjEma1K3Ut1iLOEEDpPQg== - dependencies: - "@sentry/core" "7.63.0" - "@sentry/types" "7.63.0" - "@sentry/utils" "7.63.0" - tslib "^2.4.1 || ^1.9.3" - -"@sentry/browser@7.63.0": - version "7.63.0" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.63.0.tgz#d7eee4be7bfff015f050bca83cafb111dc13d40d" - integrity sha512-P1Iw/2281C/7CUCRsN4jgXvjMNKnrwKqxRg7JqN8eVeCDPMpOeEPHNJ6YatEXdVLTKVn0JB7L63Q1prhFr8+SQ== - dependencies: - "@sentry-internal/tracing" "7.63.0" - "@sentry/core" "7.63.0" - "@sentry/replay" "7.63.0" - "@sentry/types" "7.63.0" - "@sentry/utils" "7.63.0" - tslib "^2.4.1 || ^1.9.3" - -"@sentry/cli@2.20.5": - version "2.20.5" - resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.20.5.tgz#255a5388ca24c211a0eae01dcc4ad813a7ff335a" - integrity sha512-ZvWb86eF0QXH9C5Mbi87aUmr8SH848yEpXJmlM2AoBowpE9kKDnewCAKvyXUihojUFwCSEEjoJhrRMMgmCZqXA== +"@sentry/browser@7.40.0": + version "7.40.0" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.40.0.tgz#e088154b4d104dfb33f7ca19bfd1276c60010b2d" + integrity sha512-07rZ+cTcpmYB1r84/oZtmSPJJvLCxW8yIh/5s4MdKRyZpqIDKhOz6cCS/4j+l1V+MeLcNLZBjFtNdKA2eocTpg== + dependencies: + "@sentry/core" "7.40.0" + "@sentry/replay" "7.40.0" + "@sentry/types" "7.40.0" + "@sentry/utils" "7.40.0" + tslib "^1.9.3" + +"@sentry/cli@2.14.4": + version "2.14.4" + resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.14.4.tgz#7301af5172b41f25d758ae069b297635433fac7b" + integrity sha512-PPtb5qA2sKnYvj2QBBGOrla4kyG6AqOTVaELoc80mZgZ+yDjuaPH/Xmbg/K+rzZyypVlv4XleTtju44830Q/SA== dependencies: https-proxy-agent "^5.0.0" node-fetch "^2.6.7" @@ -6217,104 +6206,115 @@ proxy-from-env "^1.1.0" which "^2.0.2" -"@sentry/core@7.63.0": - version "7.63.0" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.63.0.tgz#8c38da6ef3a1de6e364463a09bc703b196ecbba4" - integrity sha512-13Ljiq8hv6ieCkO+Am99/PljYJO5ynKT/hRQrWgGy9IIEgUr8sV3fW+1W6K4/3MCeOJou0HsiGBjOD1mASItVg== +"@sentry/core@7.40.0": + version "7.40.0" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.40.0.tgz#1013ddf576ed3a4be9abf2b8e8b0c95ab7e3d7bb" + integrity sha512-OPAobQG0GTY++r5LWUcOA1lS+2TY2Lmw/i5s4kL9WbY+f08dbLNEGNBObY7/V98OL4f7OG+nWaPFybgM7kqUTQ== dependencies: - "@sentry/types" "7.63.0" - "@sentry/utils" "7.63.0" - tslib "^2.4.1 || ^1.9.3" + "@sentry/types" "7.40.0" + "@sentry/utils" "7.40.0" + tslib "^1.9.3" -"@sentry/hub@7.63.0": - version "7.63.0" - resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-7.63.0.tgz#7bf9bbb5930c96d6c91f002029b4b64e66fcd42a" - integrity sha512-IDgNcoa+YiBbPrDwrZuzSP+vN9wvlQjLEL3OVn0OFaA6Q3X/Zs40JjRz4bTdKb9SjXbyeJ2boFr+4EFvGQoJ1Q== +"@sentry/hub@7.40.0": + version "7.40.0" + resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-7.40.0.tgz#afed24056d97d5be4f8b400394f27065a448fe28" + integrity sha512-68GG6wV76qEUyL0tIKB0N+tF7vNyBjHHwHmHk8PElAAkJyIewCXdGuhjpoDshDe7aQ3iLOg1u68rMDN0d3z29w== dependencies: - "@sentry/core" "7.63.0" - "@sentry/types" "7.63.0" - "@sentry/utils" "7.63.0" - tslib "^2.4.1 || ^1.9.3" + "@sentry/core" "7.40.0" + "@sentry/types" "7.40.0" + "@sentry/utils" "7.40.0" + tslib "^1.9.3" -"@sentry/integrations@6.19.7": - version "6.19.7" - resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-6.19.7.tgz#e6e126b692077c8731644224c754012bed65b425" - integrity sha512-yNeeFyuygJaV7Mdc5qWuDa13xVj5mVdECaaw2Xs4pfeHaXmRfRzZY17N8ypWFegKWxKBHynyQRMD10W5pBwJvA== +"@sentry/integrations@6.3.1": + version "6.3.1" + resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-6.3.1.tgz#8bd4c05a83c5fe8ece6cb59a6e31e1e632a14af8" + integrity sha512-fB0+CmU2L2VJ8WyI33t060lxpBNAoh092jzMGEnnfPKTVMxnscjFrISzrWXQZs/OoR6q8Yo/+pZAT5gWA0dDOQ== dependencies: - "@sentry/types" "6.19.7" - "@sentry/utils" "6.19.7" + "@sentry/types" "6.3.1" + "@sentry/utils" "6.3.1" localforage "^1.8.1" tslib "^1.9.3" -"@sentry/integrations@7.63.0": - version "7.63.0" - resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-7.63.0.tgz#bf4268b524670fdbc290dc489de0069143b499c6" - integrity sha512-+P8GNqFZNH/yS/KPbvUfUDERneoRNUrqp9ayvvp8aq4cTtrBdM72CYgI21oG6cti42SSM1VDLYZomTV3ElPzSg== +"@sentry/integrations@7.40.0": + version "7.40.0" + resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-7.40.0.tgz#953aa7144ea2c7bfec36284c9a4ed06d6d134dea" + integrity sha512-8TLo7RKKpTXRDdeeBFNaA3YA4NG5hbAkl2o9wDHJW5NJouyr7IK6ia6qd2v94RXJAVB7nnjtQUdnkXGR59E4RA== dependencies: - "@sentry/types" "7.63.0" - "@sentry/utils" "7.63.0" + "@sentry/types" "7.40.0" + "@sentry/utils" "7.40.0" localforage "^1.8.1" - tslib "^2.4.1 || ^1.9.3" - -"@sentry/react-native@5.9.1": - version "5.9.1" - resolved "https://registry.yarnpkg.com/@sentry/react-native/-/react-native-5.9.1.tgz#8fd87795225f2e62f95007a0d009f83121566c66" - integrity sha512-L5Ah5cZ39b6iNlsHXHj7vxiTePGTxs+JWJPCyGYnmeleh0IQaDedDJJgYwB78D8mGuq4JnTOY5B9BrFKBtLLlg== - dependencies: - "@sentry/browser" "7.63.0" - "@sentry/cli" "2.20.5" - "@sentry/core" "7.63.0" - "@sentry/hub" "7.63.0" - "@sentry/integrations" "7.63.0" - "@sentry/react" "7.63.0" - "@sentry/types" "7.63.0" - "@sentry/utils" "7.63.0" - -"@sentry/react@7.63.0": - version "7.63.0" - resolved "https://registry.yarnpkg.com/@sentry/react/-/react-7.63.0.tgz#6d318191e13ccf7ebba4897d7258b4ea3bcf6c51" - integrity sha512-KFRjgADVE4aMI7gJmGnoSz65ZErQlz9xRB3vETWSyNOLprWXuQLPPtcDEn39BROtsDG4pLyYFaSDiD7o0+DyjQ== - dependencies: - "@sentry/browser" "7.63.0" - "@sentry/types" "7.63.0" - "@sentry/utils" "7.63.0" + tslib "^1.9.3" + +"@sentry/react-native@5.1.1": + version "5.1.1" + resolved "https://registry.yarnpkg.com/@sentry/react-native/-/react-native-5.1.1.tgz#bdc19baa22e6239bb4e2bd7379df8f13993985d2" + integrity sha512-umQAq2HEnYU8mhl1aLQY+YSd4vd56SIyiXn4yFSwwVuzOaPfxG3oGEVAFb6ulI3iOO/7ZeGrsc0SbrxMnBx4HA== + dependencies: + "@sentry/browser" "7.40.0" + "@sentry/cli" "2.14.4" + "@sentry/core" "7.40.0" + "@sentry/hub" "7.40.0" + "@sentry/integrations" "7.40.0" + "@sentry/react" "7.40.0" + "@sentry/tracing" "7.40.0" + "@sentry/types" "7.40.0" + "@sentry/utils" "7.40.0" + +"@sentry/react@7.40.0": + version "7.40.0" + resolved "https://registry.yarnpkg.com/@sentry/react/-/react-7.40.0.tgz#2c904270110b11cf1b588eb75f71aed9fe570828" + integrity sha512-7yYagpOCdsXnVTtLL8Y7wAf2xXgsk2ncuju3O/G4kEckkLewZWmQeoknOSGFlAgVdGNhTaXc2WGzgOiBMOkhug== + dependencies: + "@sentry/browser" "7.40.0" + "@sentry/types" "7.40.0" + "@sentry/utils" "7.40.0" hoist-non-react-statics "^3.3.2" - tslib "^2.4.1 || ^1.9.3" + tslib "^1.9.3" -"@sentry/replay@7.63.0": - version "7.63.0" - resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.63.0.tgz#989ae32ea028a5eca323786cc07294fedb1f0d45" - integrity sha512-ikeFVojuP9oDF103blZcj0Vvb4S50dV54BESMrMW2lYBoMMjvOd7AdL+iDHjn1OL05/mv1C6Oc8MovmvdjILVA== +"@sentry/replay@7.40.0": + version "7.40.0" + resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.40.0.tgz#cf78b5bf92b9a3c045022e7cc4fede7ef4ffe874" + integrity sha512-Y9Kvo9jKouUdrHQhHVv5SmWZClF5o7BFI6oVpLlv4zXORPQlyoZONM/9sxiMvvH73alDSpxzCoxyhlypAOH4ww== dependencies: - "@sentry/core" "7.63.0" - "@sentry/types" "7.63.0" - "@sentry/utils" "7.63.0" + "@sentry/core" "7.40.0" + "@sentry/types" "7.40.0" + "@sentry/utils" "7.40.0" -"@sentry/types@6.19.7": - version "6.19.7" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.19.7.tgz#c6b337912e588083fc2896eb012526cf7cfec7c7" - integrity sha512-jH84pDYE+hHIbVnab3Hr+ZXr1v8QABfhx39KknxqKWr2l0oEItzepV0URvbEhB446lk/S/59230dlUUIBGsXbg== +"@sentry/tracing@7.40.0": + version "7.40.0" + resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-7.40.0.tgz#4a6bb37febe4d65901be227bed7a0b8743d59c31" + integrity sha512-y1SNwlFEC7a2ThtWbT/KbnAVecAWyIeKiO/IRgyZSdcj1z4CliADKNQmkUhnDlLy8jV1ARGuZ1DvsuPNlWyDfw== + dependencies: + "@sentry/core" "7.40.0" + "@sentry/types" "7.40.0" + "@sentry/utils" "7.40.0" + tslib "^1.9.3" + +"@sentry/types@6.3.1": + version "6.3.1" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.3.1.tgz#af3b54728b29f633f38fbe51b8c10e3834fbc158" + integrity sha512-BEBn8JX1yaooCAuonbaMci9z0RjwwMbQ3Eny/eyDdd+rjXprZCZaStZnCvSThbNBqAJ8YaUqY2YBMnEwJxarAw== -"@sentry/types@7.63.0": - version "7.63.0" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.63.0.tgz#8032029fee6f70e04b667646626a674b03e2f79b" - integrity sha512-pZNwJVW7RqNLGuTUAhoygt0c9zmc0js10eANAz0MstygJRhQI1tqPDuiELVdujPrbeL+IFKF+7NvRDAydR2Niw== +"@sentry/types@7.40.0": + version "7.40.0" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.40.0.tgz#27b012b59d593132e413018773f0a045d68075d7" + integrity sha512-dIbqBenbmDx1F8pvfC11C88J83ecwumUhV+YOIxcmVd1fmlPF2hXWZ01+NTkTDkCu341sJx4wPQogByFy8FwGA== -"@sentry/utils@6.19.7": - version "6.19.7" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.19.7.tgz#6edd739f8185fd71afe49cbe351c1bbf5e7b7c79" - integrity sha512-z95ECmE3i9pbWoXQrD/7PgkBAzJYR+iXtPuTkpBjDKs86O3mT+PXOT3BAn79w2wkn7/i3vOGD2xVr1uiMl26dA== +"@sentry/utils@6.3.1": + version "6.3.1" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.3.1.tgz#6d8e691139b5b49d8c655ad1dcaf2cb3ff0d0b03" + integrity sha512-cdtl/QWC9FtinAuW3w8QfvSfh/Q9ui5vwvjzVHiS1ga/U38edi2XX+cttY39ZYwz0SQG99cE10GOIhd1p7/mAA== dependencies: - "@sentry/types" "6.19.7" + "@sentry/types" "6.3.1" tslib "^1.9.3" -"@sentry/utils@7.63.0": - version "7.63.0" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.63.0.tgz#7c598553b4dbb6e3740dc96bc7f112ec32edbe69" - integrity sha512-7FQv1RYAwnuTuarruP+1+Jd6YQuN7i/Y7KltwPMVEwU7j5mzYQaexLr/Jz1XIdR2KYVdkbXQyP8jj8BmA6u9Jw== +"@sentry/utils@7.40.0": + version "7.40.0" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.40.0.tgz#0986f2e93b1d42b1e1aeb077941226e3d76419c4" + integrity sha512-ZdCbTpAXPiVVfvNJVftnDhsctOui71MDUhVIdLkgg4Cuic+WHGPRmmZ+H6uZdp7vRaeB+Uvnn5+t2iSAVo/mAA== dependencies: - "@sentry/types" "7.63.0" - tslib "^2.4.1 || ^1.9.3" + "@sentry/types" "7.40.0" + tslib "^1.9.3" "@sideway/address@^4.1.0": version "4.1.2" @@ -25877,11 +25877,6 @@ tslib@^2.4.0, tslib@^2.5.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== -"tslib@^2.4.1 || ^1.9.3": - version "2.6.2" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" - integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== - tslib@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" @@ -27135,7 +27130,7 @@ xmlbuilder@~11.0.0: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== -xmldom@^0.x: +xmldom@^0.6.0, xmldom@^0.x: version "0.6.0" resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.6.0.tgz#43a96ecb8beece991cef382c08397d82d4d0c46f" integrity sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg== From 6e0da258efb51f67c000299fd76c13b9489fa4a2 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Fri, 29 Sep 2023 16:48:19 +0100 Subject: [PATCH 09/53] Bump RN patch from 0.71.6 to 0.71.13 --- ...act-native+0.71.6.patch => react-native+0.71.13.patch} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename patches/{react-native+0.71.6.patch => react-native+0.71.13.patch} (96%) diff --git a/patches/react-native+0.71.6.patch b/patches/react-native+0.71.13.patch similarity index 96% rename from patches/react-native+0.71.6.patch rename to patches/react-native+0.71.13.patch index 478a09c8b66..40c761e4b03 100644 --- a/patches/react-native+0.71.6.patch +++ b/patches/react-native+0.71.13.patch @@ -65,10 +65,10 @@ index c714f87..dca2750 100644 defaultConfig { minSdkVersion 21 diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java -index c150abc..a446111 100644 +index 290bd23..20d85e0 100644 --- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java +++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java -@@ -31,6 +31,7 @@ import android.view.KeyEvent; +@@ -33,6 +33,7 @@ import android.view.KeyEvent; import android.view.MotionEvent; import android.view.View; import android.view.accessibility.AccessibilityNodeInfo; @@ -76,7 +76,7 @@ index c150abc..a446111 100644 import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputConnection; import android.view.inputmethod.InputMethodManager; -@@ -89,6 +90,16 @@ public class ReactEditText extends AppCompatEditText +@@ -94,6 +95,16 @@ public class ReactEditText extends AppCompatEditText /** A count of events sent to JS or C++. */ protected int mNativeEventCount; @@ -93,7 +93,7 @@ index c150abc..a446111 100644 private static final int UNSET = -1; private @Nullable ArrayList mListeners; -@@ -248,16 +259,24 @@ public class ReactEditText extends AppCompatEditText +@@ -253,16 +264,24 @@ public class ReactEditText extends AppCompatEditText @Override public InputConnection onCreateInputConnection(EditorInfo outAttrs) { ReactContext reactContext = getReactContext(this); From 120eae929e5ef795b6a9b22dd22a1041e363df25 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Mon, 2 Oct 2023 13:18:28 +0100 Subject: [PATCH 10/53] Revert "Bump MixPanel IPHONEOS_DEPLOYMENT_TARGETs from 8 to 12" This reverts commit acb6d40c94db4e3fe5d56f0ee8747f842bed8f9f. --- ios/mixpanel-iphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/mixpanel-iphone b/ios/mixpanel-iphone index 109a7e2cd5a..07546ff0c97 160000 --- a/ios/mixpanel-iphone +++ b/ios/mixpanel-iphone @@ -1 +1 @@ -Subproject commit 109a7e2cd5aa2636b992ba6983b153b19b423688 +Subproject commit 07546ff0c970aa360040ad667979cec5b9ca56b9 From 7acab3162269aa0b2f081d50116d119ee3e14593 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Mon, 2 Oct 2023 13:18:31 +0100 Subject: [PATCH 11/53] Revert "Bump Branch IPHONEOS_DEPLOYMENT_TARGETs from 8 to 12" This reverts commit 0d199d7e8efb1c2e8f6988fe9092c8a5fae795bf. --- ios/branch-ios-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/branch-ios-sdk b/ios/branch-ios-sdk index 5c45e34ab3b..b9f6a988be0 160000 --- a/ios/branch-ios-sdk +++ b/ios/branch-ios-sdk @@ -1 +1 @@ -Subproject commit 5c45e34ab3b25be9cbe68acc9b47fd35a60bf55d +Subproject commit b9f6a988be0a4088bfc9ba08096fab7326008373 From b054c2cc23b0962b18a9952aac9d45484de9256a Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Mon, 2 Oct 2023 13:27:23 +0100 Subject: [PATCH 12/53] pod repo update && pod install --- ios/MetaMask.xcodeproj/project.pbxproj | 36 -------------------------- ios/Podfile.lock | 8 +----- 2 files changed, 1 insertion(+), 43 deletions(-) diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj index 6c1a59eff3f..25df69ed004 100644 --- a/ios/MetaMask.xcodeproj/project.pbxproj +++ b/ios/MetaMask.xcodeproj/project.pbxproj @@ -557,7 +557,6 @@ 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, 15ACCA0022655C3A0063978B /* Embed Frameworks */, - 3263892F1BBB809723CB4024 /* [CP] Embed Pods Frameworks */, 802588CED3FC487A5D5263F0 /* [CP] Copy Pods Resources */, ); buildRules = ( @@ -582,7 +581,6 @@ B339FF0F289ABD70001B89FB /* Resources */, B339FF2F289ABD70001B89FB /* Bundle React Native code and images */, B339FF30289ABD70001B89FB /* Embed Frameworks */, - C9BADD20B98A4D13195A3200 /* [CP] Embed Pods Frameworks */, 8EF10BB14629809332947E5D /* [CP] Copy Pods Resources */, ); buildRules = ( @@ -815,23 +813,6 @@ shellPath = /bin/sh; shellScript = "if [ -e ../.ios.env ]\nthen\n cp -rf ../.ios.env debug.xcconfig\n cp -rf ../.ios.env release.xcconfig\nelse\n cp -rf ../.ios.env.example debug.xcconfig\n cp -rf ../.ios.env.example release.xcconfig\nfi\n\n"; }; - 3263892F1BBB809723CB4024 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-MetaMask/Pods-MetaMask-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-MetaMask/Pods-MetaMask-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MetaMask/Pods-MetaMask-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 54113A1E76112B187F92C803 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -945,23 +926,6 @@ shellPath = /bin/sh; shellScript = "if [[ -s \"$HOME/.nvm/nvm.sh\" ]]; then\n. \"$HOME/.nvm/nvm.sh\"\nelif [[ -x \"$(command -v brew)\" && -s \"$(brew --prefix nvm)/nvm.sh\" ]]; then\n. \"$(brew --prefix nvm)/nvm.sh\"\nfi\n\nexport NODE_BINARY=$(which node)\n\nif [[ -s \"$HOME/.nvm/nvm.sh\" ]]; then\n. \"$HOME/.nvm/nvm.sh\"\nelif [[ -x \"$(command -v brew)\" && -s \"$(brew --prefix nvm)/nvm.sh\" ]]; then\n. \"$(brew --prefix nvm)/nvm.sh\"\nfi\n\nif [ ! -e \"${SENTRY_PROPERTIES}\" ]; then\n export SENTRY_PROPERTIES=../sentry.properties\nfi\n\n\nif [ \"$PLATFORM_NAME\" == \"iphonesimulator\" ] && [ \"$CONFIGURATION\" == \"Release\" ]; then\n ../node_modules/react-native/scripts/react-native-xcode.sh\nelse\n ../node_modules/@sentry/cli/bin/sentry-cli react-native xcode \\\n ../node_modules/react-native/scripts/react-native-xcode.sh\nfi\n"; }; - C9BADD20B98A4D13195A3200 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-MetaMask-QA/Pods-MetaMask-QA-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-MetaMask-QA/Pods-MetaMask-QA-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MetaMask-QA/Pods-MetaMask-QA-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 46dabbfa02d..30dd31d359f 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -15,7 +15,6 @@ PODS: - ReactCommon/turbomodule/core (= 0.71.13) - fmt (6.2.1) - glog (0.3.5) - - libevent (2.1.12) - lottie-ios (3.4.1) - lottie-react-native (5.1.5): - lottie-ios (~> 3.4.0) @@ -463,7 +462,6 @@ PODS: - Sentry/HybridSDK (8.9.3): - SentryPrivate (= 8.9.3) - SentryPrivate (8.9.3) - - SocketRocket (0.6.1) - sovran-react-native (0.4.5): - React-Core - TcpSockets (4.0.0): @@ -559,8 +557,6 @@ SPEC REPOS: - Branch - CocoaAsyncSocket - fmt - - libevent - - OpenSSL-Universal - Sentry - SentryPrivate @@ -736,7 +732,6 @@ SPEC CHECKSUMS: FBReactNativeSpec: c949e4b726d8cf9e19b73be60ecfa26355deceb3 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b - libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 lottie-ios: 016449b5d8be0c3dcbcfa0a9988469999cd04c5d lottie-react-native: 3e722c63015fdb9c27638b0a77969fc412067c18 RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 @@ -810,11 +805,10 @@ SPEC CHECKSUMS: segment-analytics-react-native: bd1f13ea95bad2313a9c7130da032af0e9a6da60 Sentry: 97161cac725da1ecbe77d1445bf8a61c1e5667f1 SentryPrivate: 9a76def09fb08f9501997b8df946e8097947b94f - SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 sovran-react-native: fd3dc8f1a4b14acdc4ad25fc6b4ac4f52a2a2a15 TcpSockets: a8eb6b5867fe643e6cfed5db2e4de62f4d1e8fd0 Yoga: 135109c9b8c5d1a8af3a58d21cd4c7aa7f3bf555 -PODFILE CHECKSUM: 559a01793f9ae806653374ed293dcefb80cdd05a +PODFILE CHECKSUM: e900e3841155e821fe7b8ead0fb4304927b9aa5c COCOAPODS: 1.12.1 From a09d517135af02474bbef3e461a7e50d32f99830 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Mon, 2 Oct 2023 15:40:48 +0100 Subject: [PATCH 13/53] Fix Xcode 15 error: Unable to load ...frameworks-Debug-input-files.xcfilelist error: Unable to load contents of file list: '.../ios/Pods/Target Support Files/Pods-MetaMask/Pods-MetaMask-frameworks-Debug-input-files.xcfilelist' (in target 'MetaMask' from project 'MetaMask') --- ios/MetaMask.xcodeproj/project.pbxproj | 1 - 1 file changed, 1 deletion(-) diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj index 25df69ed004..a9af45b8632 100644 --- a/ios/MetaMask.xcodeproj/project.pbxproj +++ b/ios/MetaMask.xcodeproj/project.pbxproj @@ -784,7 +784,6 @@ files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-MetaMask/Pods-MetaMask-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); inputPaths = ( ); From 1c9fc2b6dbfc918fad71a04252280bcda0137d7d Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Mon, 2 Oct 2023 17:12:50 +0100 Subject: [PATCH 14/53] Bump Branch IPHONEOS_DEPLOYMENT_TARGETs from 8 to 12 --- ios/branch-ios-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/branch-ios-sdk b/ios/branch-ios-sdk index b9f6a988be0..d7733482e8d 160000 --- a/ios/branch-ios-sdk +++ b/ios/branch-ios-sdk @@ -1 +1 @@ -Subproject commit b9f6a988be0a4088bfc9ba08096fab7326008373 +Subproject commit d7733482e8da4a88ea625d9dd776f8a4de92b32c From 71a8b0e74a6c54f62383ab8eaf1dbf43e67fd743 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Mon, 2 Oct 2023 17:13:03 +0100 Subject: [PATCH 15/53] Bump MixPanel IPHONEOS_DEPLOYMENT_TARGETs from 8 to 12 --- ios/mixpanel-iphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/mixpanel-iphone b/ios/mixpanel-iphone index 07546ff0c97..1e699290ef9 160000 --- a/ios/mixpanel-iphone +++ b/ios/mixpanel-iphone @@ -1 +1 @@ -Subproject commit 07546ff0c970aa360040ad667979cec5b9ca56b9 +Subproject commit 1e699290ef9e5935be94d4f0010c50f4c336029a From 8daa624dd3c6a719f801d92b81407c316f372ebf Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Mon, 2 Oct 2023 18:05:02 +0100 Subject: [PATCH 16/53] Bump BitRise stack from osx-xcode-14.2.x-ventura to osx-xcode-15.0.x --- bitrise.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitrise.yml b/bitrise.yml index 9349412dccc..5d1fb02d0b6 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -815,7 +815,7 @@ app: IOS_APP_LINK: '' meta: bitrise.io: - stack: osx-xcode-14.2.x-ventura + stack: osx-xcode-15.0.x machine_type_id: g2-m1-max.5core trigger_map: - push_branch: release/* From 66d3ce6c1e557ede05d6dbdb586f969094813bc6 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Fri, 6 Oct 2023 13:40:20 +0100 Subject: [PATCH 17/53] Revert "Bump MixPanel IPHONEOS_DEPLOYMENT_TARGETs from 8 to 12" This reverts commit 71a8b0e74a6c54f62383ab8eaf1dbf43e67fd743. --- ios/mixpanel-iphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/mixpanel-iphone b/ios/mixpanel-iphone index 1e699290ef9..07546ff0c97 160000 --- a/ios/mixpanel-iphone +++ b/ios/mixpanel-iphone @@ -1 +1 @@ -Subproject commit 1e699290ef9e5935be94d4f0010c50f4c336029a +Subproject commit 07546ff0c970aa360040ad667979cec5b9ca56b9 From de90dbd2b5404d238c1c6660570e091faa982294 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Fri, 6 Oct 2023 13:40:23 +0100 Subject: [PATCH 18/53] Revert "Bump Branch IPHONEOS_DEPLOYMENT_TARGETs from 8 to 12" This reverts commit 1c9fc2b6dbfc918fad71a04252280bcda0137d7d. --- ios/branch-ios-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/branch-ios-sdk b/ios/branch-ios-sdk index d7733482e8d..b9f6a988be0 160000 --- a/ios/branch-ios-sdk +++ b/ios/branch-ios-sdk @@ -1 +1 @@ -Subproject commit d7733482e8da4a88ea625d9dd776f8a4de92b32c +Subproject commit b9f6a988be0a4088bfc9ba08096fab7326008373 From ffaa984c29c2c71c8a7d25f3358280c128bdeec7 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Fri, 6 Oct 2023 15:02:13 +0100 Subject: [PATCH 19/53] Fix Podfile react_native_post_install whitespace indentation --- ios/Podfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index 0d1d5a4f5ac..d2ff8ce7cae 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -39,16 +39,16 @@ def react_native_post_install(installer) projects.each do |project| project.build_configurations.each do |config| - if arm_value == 1 then - config.build_settings.delete("EXCLUDED_ARCHS[sdk=iphonesimulator*]") - else - config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64" - end + if arm_value == 1 then + config.build_settings.delete("EXCLUDED_ARCHS[sdk=iphonesimulator*]") + else + config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64" + end end project.save() end - end +end def common_target_logic config = use_native_modules! From 2ca8f1df59f92c067809523fb1eeb69fcc36e47c Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Fri, 6 Oct 2023 15:04:23 +0100 Subject: [PATCH 20/53] Disable Podfile custom react_native_post_install Use default RN react_native_post_install --- ios/MetaMask.xcodeproj/project.pbxproj | 14 +++++-- ios/Podfile | 58 +++++++++++++------------- ios/Podfile.lock | 2 +- 3 files changed, 40 insertions(+), 34 deletions(-) diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj index a9af45b8632..028e7b2042b 100644 --- a/ios/MetaMask.xcodeproj/project.pbxproj +++ b/ios/MetaMask.xcodeproj/project.pbxproj @@ -1034,7 +1034,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - LIBRARY_SEARCH_PATHS = "$(inherited)"; + LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)"; LLVM_LTO = YES; MARKETING_VERSION = 7.8.0; ONLY_ACTIVE_ARCH = YES; @@ -1100,7 +1100,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - LIBRARY_SEARCH_PATHS = "$(inherited)"; + LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)"; LLVM_LTO = YES; MARKETING_VERSION = 7.8.0; ONLY_ACTIVE_ARCH = NO; @@ -1128,7 +1128,7 @@ baseConfigurationReference = 15FDD82721B7642B006B7C35 /* debug.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LANGUAGE_STANDARD = "c++17"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; @@ -1146,6 +1146,7 @@ ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -1163,6 +1164,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; + REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; }; name = Debug; @@ -1171,7 +1173,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LANGUAGE_STANDARD = "c++17"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; @@ -1189,6 +1191,7 @@ ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; @@ -1198,6 +1201,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; + REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; }; @@ -1247,6 +1251,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = ( + "$(SDKROOT)/usr/lib/swift", "$(inherited)", "\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"", ); @@ -1316,6 +1321,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = ( + "$(SDKROOT)/usr/lib/swift", "$(inherited)", "\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"", ); diff --git a/ios/Podfile b/ios/Podfile index d2ff8ce7cae..dcb8fd8f0d5 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -20,35 +20,35 @@ if linkage != nil use_frameworks! :linkage => linkage.to_sym end -def react_native_post_install(installer) - installer.pods_project.targets.each do |target| - target.build_configurations.each do |config| - if Gem::Version.new('9.0') > Gem::Version.new(config.build_settings['IPHONEOS_DEPLOYMENT_TARGET']) - config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = "12.0" - end - config.build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = 'YES' - end - end - - projects = installer.aggregate_targets - .map{ |t| t.user_project } - .uniq{ |p| p.path } - .push(installer.pods_project) - - arm_value = `/usr/sbin/sysctl -n hw.optional.arm64 2>&1`.to_i - - projects.each do |project| - project.build_configurations.each do |config| - if arm_value == 1 then - config.build_settings.delete("EXCLUDED_ARCHS[sdk=iphonesimulator*]") - else - config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64" - end - end - - project.save() - end -end +# def react_native_post_install(installer) +# installer.pods_project.targets.each do |target| +# target.build_configurations.each do |config| +# if Gem::Version.new('9.0') > Gem::Version.new(config.build_settings['IPHONEOS_DEPLOYMENT_TARGET']) +# config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = "12.0" +# end +# config.build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = 'YES' +# end +# end + +# projects = installer.aggregate_targets +# .map{ |t| t.user_project } +# .uniq{ |p| p.path } +# .push(installer.pods_project) + +# arm_value = `/usr/sbin/sysctl -n hw.optional.arm64 2>&1`.to_i + +# projects.each do |project| +# project.build_configurations.each do |config| +# if arm_value == 1 then +# config.build_settings.delete("EXCLUDED_ARCHS[sdk=iphonesimulator*]") +# else +# config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64" +# end +# end + +# project.save() +# end +# end def common_target_logic config = use_native_modules! diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 30dd31d359f..932afcfce34 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -809,6 +809,6 @@ SPEC CHECKSUMS: TcpSockets: a8eb6b5867fe643e6cfed5db2e4de62f4d1e8fd0 Yoga: 135109c9b8c5d1a8af3a58d21cd4c7aa7f3bf555 -PODFILE CHECKSUM: e900e3841155e821fe7b8ead0fb4304927b9aa5c +PODFILE CHECKSUM: a9ef42e35218e4cb579d97166c1b2cd87ef13f83 COCOAPODS: 1.12.1 From cf1c1e37d86e8175881ac84aef6335bca88368c1 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Fri, 6 Oct 2023 15:58:27 +0100 Subject: [PATCH 21/53] Fix FlipperKit files not found TODO: Revert this and figure why FB_SONARKIT_ENABLED isn't disabled via - https://github.com/MetaMask/metamask-mobile/commit/1e432e05dc3ba74e9cd9d548686a39ad38b269ad - https://github.com/MetaMask/metamask-mobile/commit/1e432e05dc3ba74e9cd9d548686a39ad38b269ad --- ios/MetaMask/AppDelegate.m | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ios/MetaMask/AppDelegate.m b/ios/MetaMask/AppDelegate.m index 55b596de08c..de7e18cbcb2 100644 --- a/ios/MetaMask/AppDelegate.m +++ b/ios/MetaMask/AppDelegate.m @@ -7,13 +7,13 @@ #import #if DEBUG #ifdef FB_SONARKIT_ENABLED -#import -#import -#import -#import -#import -#import -#import +//#import +//#import +//#import +//#import +//#import +//#import +//#import #endif #endif From d0235cd5cfa8f7702f8ab7d47c34d4577aeedb1a Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Fri, 6 Oct 2023 15:59:03 +0100 Subject: [PATCH 22/53] Fix FlipperKit use of undeclared identifiers TODO: Revert this and figure why FB_SONARKIT_ENABLED isn't disabled via - https://github.com/MetaMask/metamask-mobile/commit/1e432e05dc3ba74e9cd9d548686a39ad38b269ad - https://github.com/MetaMask/metamask-mobile/commit/1e432e05dc3ba74e9cd9d548686a39ad38b269ad --- ios/MetaMask/AppDelegate.m | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ios/MetaMask/AppDelegate.m b/ios/MetaMask/AppDelegate.m index de7e18cbcb2..deb9ba4126f 100644 --- a/ios/MetaMask/AppDelegate.m +++ b/ios/MetaMask/AppDelegate.m @@ -69,15 +69,15 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( - (void) initializeFlipper:(UIApplication *)application { #if DEBUG - #ifdef FB_SONARKIT_ENABLED - FlipperClient *client = [FlipperClient sharedClient]; - SKDescriptorMapper *layoutDescriptorMapper = [[SKDescriptorMapper alloc] initWithDefaults]; - [client addPlugin: [[FlipperKitLayoutPlugin alloc] initWithRootNode: application withDescriptorMapper: layoutDescriptorMapper]]; - [client addPlugin: [[FKUserDefaultsPlugin alloc] initWithSuiteName:nil]]; - [client addPlugin: [FlipperKitReactPlugin new]]; - [client addPlugin: [[FlipperKitNetworkPlugin alloc] initWithNetworkAdapter:[SKIOSNetworkAdapter new]]]; - [client start]; - #endif + #ifdef FB_SONARKIT_ENABLED +// FlipperClient *client = [FlipperClient sharedClient]; +// SKDescriptorMapper *layoutDescriptorMapper = [[SKDescriptorMapper alloc] initWithDefaults]; +// [client addPlugin: [[FlipperKitLayoutPlugin alloc] initWithRootNode: application withDescriptorMapper: layoutDescriptorMapper]]; +// [client addPlugin: [[FKUserDefaultsPlugin alloc] initWithSuiteName:nil]]; +// [client addPlugin: [FlipperKitReactPlugin new]]; +// [client addPlugin: [[FlipperKitNetworkPlugin alloc] initWithNetworkAdapter:[SKIOSNetworkAdapter new]]]; +// [client start]; + #endif #endif } From a2c80a3eb4525e2a7bbbfbf6d8976eeedeb9a10c Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Wed, 11 Oct 2023 15:48:27 +0100 Subject: [PATCH 23/53] Update mixpanel-iphone git submodule commit hash - Bump MixPanel IPHONEOS_DEPLOYMENT_TARGETs from 8 to 12 - On branch bump-iphoneios-deployment-targets-from-8-to-12 --- ios/mixpanel-iphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/mixpanel-iphone b/ios/mixpanel-iphone index 07546ff0c97..7485f53e642 160000 --- a/ios/mixpanel-iphone +++ b/ios/mixpanel-iphone @@ -1 +1 @@ -Subproject commit 07546ff0c970aa360040ad667979cec5b9ca56b9 +Subproject commit 7485f53e642ebf85256e3db709e46b7cce5e9582 From 26a6c526f4f1d4aa3f40e82f745053ced81727e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Loureiro?= <1649425+jpcloureiro@users.noreply.github.com> Date: Wed, 11 Oct 2023 16:11:09 +0100 Subject: [PATCH 24/53] update .gitmodule file with mixpanel-iphone fork. remove duplicate submodule --- .gitmodules | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 948e9066068..66487c4ed0d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,10 +1,7 @@ [submodule "ios/mixpanel-iphone"] path = ios/mixpanel-iphone - url = https://github.com/mixpanel/mixpanel-iphone + url = https://github.com/metamask/mixpanel-iphone [submodule "ios/branch-ios-sdk"] path = ios/branch-ios-sdk url = https://github.com/BranchMetrics/ios-branch-deep-linking-attribution -[submodule "ios/mixpanel-iphone"] - path = ios/mixpanel-iphone - url = https://github.com/mixpanel/mixpanel-iphone From 527dfd1777868b6c05b897c3a6013e412acc396d Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Wed, 11 Oct 2023 16:43:24 +0100 Subject: [PATCH 25/53] Update mixpanel-iphone git submodule commit hash - Bump MixPanel IPHONEOS_DEPLOYMENT_TARGETs from 8 to 12 - On branch: bump-branch-ios-sdk-deployment-targets-from-8-to-12 --- ios/branch-ios-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/branch-ios-sdk b/ios/branch-ios-sdk index b9f6a988be0..615267ea0b4 160000 --- a/ios/branch-ios-sdk +++ b/ios/branch-ios-sdk @@ -1 +1 @@ -Subproject commit b9f6a988be0a4088bfc9ba08096fab7326008373 +Subproject commit 615267ea0b44bc3be657b84fbc9ff7c86688fa58 From b4b9908fd83c11ff761dbbcf2f4058aa80a523a8 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Wed, 11 Oct 2023 16:45:14 +0100 Subject: [PATCH 26/53] update .gitmodule file with branch-ios-sdk fork. remove duplicate submodule --- .gitmodules | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 66487c4ed0d..2be95567512 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,5 +3,4 @@ url = https://github.com/metamask/mixpanel-iphone [submodule "ios/branch-ios-sdk"] path = ios/branch-ios-sdk - url = https://github.com/BranchMetrics/ios-branch-deep-linking-attribution - + url = https://github.com/metamask/ios-branch-deep-linking-attribution From 5b399e8258f1b3cece81d285a6b956e70ab848ef Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Fri, 13 Oct 2023 13:58:03 +0100 Subject: [PATCH 27/53] Update podfile.lock --- ios/Podfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 932afcfce34..ed3a898d350 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -809,6 +809,6 @@ SPEC CHECKSUMS: TcpSockets: a8eb6b5867fe643e6cfed5db2e4de62f4d1e8fd0 Yoga: 135109c9b8c5d1a8af3a58d21cd4c7aa7f3bf555 -PODFILE CHECKSUM: a9ef42e35218e4cb579d97166c1b2cd87ef13f83 +PODFILE CHECKSUM: b5dfd49460dbbc2097bb2926050c46d03af04962 COCOAPODS: 1.12.1 From f91973b248f1aebd5d06b6f1885024803370f9d4 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Fri, 13 Oct 2023 14:24:57 +0100 Subject: [PATCH 28/53] Remove duplicate Podfile flipper_config comment --- ios/Podfile | 1 - 1 file changed, 1 deletion(-) diff --git a/ios/Podfile b/ios/Podfile index dcb8fd8f0d5..2c12a71cb88 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -74,7 +74,6 @@ def common_target_logic #:flipper_configuration => flipper_config, # An absolute path to your application root. :app_path => "#{Pod::Config.instance.installation_root}/..", - # :flipper_configuration => flipper_config, ) # Pods for MetaMask From f773d2399e972522f5be8c6ef299a899273a750a Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Fri, 13 Oct 2023 17:09:19 +0100 Subject: [PATCH 29/53] Remove stale Podfile flipper_post_install comment - Last used: https://github.com/facebook/react-native/blame/v0.63.5/template/ios/Podfile#L21-L23 - Removed: https://github.com/facebook/react-native/blob/v0.64.0/template/ios/Podfile - Moved from Podfile to scripts/react_native_pods.rb: https://github.com/facebook/react-native/commit/574447ae3d6bf15f29a8c4a64b2355373f2bb1bc --- ios/Podfile | 1 - 1 file changed, 1 deletion(-) diff --git a/ios/Podfile b/ios/Podfile index 2c12a71cb88..65aa60fe9db 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -90,7 +90,6 @@ target 'MetaMask-QA' do end post_install do |installer| - # flipper_post_install(installer) react_native_post_install(installer) __apply_Xcode_12_5_M1_post_install_workaround(installer) end From d1213f1c2f563e88c03e1257ddf319de41ce24d5 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Fri, 13 Oct 2023 17:16:14 +0100 Subject: [PATCH 30/53] Refactor Podfile react_native_post_install --- ios/Podfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ios/Podfile b/ios/Podfile index 65aa60fe9db..82352827bb8 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -90,6 +90,11 @@ target 'MetaMask-QA' do end post_install do |installer| - react_native_post_install(installer) + react_native_post_install( + installer, + # Set `mac_catalyst_enabled` to `true` in order to apply patches + # necessary for Mac Catalyst builds + :mac_catalyst_enabled => false + ) __apply_Xcode_12_5_M1_post_install_workaround(installer) end From 823c2628213f982958adccfc5ca9b590ee0135de Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Sat, 14 Oct 2023 15:30:51 +0100 Subject: [PATCH 31/53] Reenable Podfile flipper_config --- ios/Podfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index 82352827bb8..474d2bcab1c 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -56,7 +56,7 @@ def common_target_logic # Flags change depending on the env values. flags = get_default_flags() - # flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled + flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled use_react_native!( :path => config[:reactNativePath], @@ -71,7 +71,7 @@ def common_target_logic # # Note that if you have use_frameworks! enabled, Flipper will not work and # you should disable the next line. - #:flipper_configuration => flipper_config, + :flipper_configuration => flipper_config, # An absolute path to your application root. :app_path => "#{Pod::Config.instance.installation_root}/..", ) From 77f5f9b96148b5897a436a2a557d7fe74b042b4d Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Sat, 14 Oct 2023 16:16:07 +0100 Subject: [PATCH 32/53] Move Podfile flipper_config comment to correct location Since it was originally in global scope --- ios/Podfile | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index 474d2bcab1c..f2688c3c63d 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -4,16 +4,6 @@ require_relative '../node_modules/@react-native-community/cli-platform-ios/nativ platform :ios, '12.4' #min_ios_version_supported prepare_react_native_project! -# If you are using a `react-native-flipper` your iOS build will fail when `NO_FLIPPER=1` is set. -# because `react-native-flipper` depends on (FlipperKit,...) that will be excluded -# -# To fix this you can also exclude `react-native-flipper` using a `react-native.config.js` -# ```js -# module.exports = { -# dependencies: { -# ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}), -# ``` - linkage = ENV['USE_FRAMEWORKS'] if linkage != nil Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green @@ -56,6 +46,15 @@ def common_target_logic # Flags change depending on the env values. flags = get_default_flags() + # If you are using a `react-native-flipper` your iOS build will fail when `NO_FLIPPER=1` is set. + # because `react-native-flipper` depends on (FlipperKit,...) that will be excluded + # + # To fix this you can also exclude `react-native-flipper` using a `react-native.config.js` + # ```js + # module.exports = { + # dependencies: { + # ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}), + # ``` flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled use_react_native!( From aaba386b5cba0aa2ff6621910f311838bb32d917 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Sat, 14 Oct 2023 16:17:13 +0100 Subject: [PATCH 33/53] Remove FB_SONARKIT_ENABLED flag from xcodeproj release build settings Should have been added only as debug (not release) config in our RN 0.62.2 upg: https://github.com/MetaMask/metamask-mobile/pull/1586 Ref: https://github.com/facebook/react-native/blob/v0.62.0/template/ios/HelloWorld.xcodeproj/project.pbxproj#L500 --- ios/MetaMask.xcodeproj/project.pbxproj | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj index 028e7b2042b..5388f706234 100644 --- a/ios/MetaMask.xcodeproj/project.pbxproj +++ b/ios/MetaMask.xcodeproj/project.pbxproj @@ -1104,10 +1104,7 @@ LLVM_LTO = YES; MARKETING_VERSION = 7.8.0; ONLY_ACTIVE_ARCH = NO; - OTHER_CFLAGS = ( - "$(inherited)", - "-DFB_SONARKIT_ENABLED=1", - ); + OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", From 83be066351574bf308eb48836fa2950798abfb3e Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Sat, 14 Oct 2023 16:56:33 +0100 Subject: [PATCH 34/53] Refactor xcodeproj FB_SONARKIT_ENABLED flag to macro Should have been added as an Apple Clang preprocessor macro (not compiler flag) in our RN 0.62.2 upg: https://github.com/MetaMask/metamask-mobile/pull/1586 Refactor in xcodeproj target - from: Apple Clang - Custom Compiler Flags > Other C Flags - to: Apple Clang - Preprocessing > Preprocessor Macros Ref: https://github.com/facebook/react-native/blob/v0.62.0/template/ios/HelloWorld.xcodeproj/project.pbxproj#L500 Nb: rn-tester sticking to "-DFB_SONARKIT_ENABLED=1" for OTHER_CFLAGS and OTHER_SWIFT_FLAGS --- ios/MetaMask.xcodeproj/project.pbxproj | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj index 5388f706234..69ed4ff4b24 100644 --- a/ios/MetaMask.xcodeproj/project.pbxproj +++ b/ios/MetaMask.xcodeproj/project.pbxproj @@ -1016,6 +1016,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", + "FB_SONARKIT_ENABLED=1", ); HEADER_SEARCH_PATHS = ( "$(inherited)", @@ -1038,10 +1039,7 @@ LLVM_LTO = YES; MARKETING_VERSION = 7.8.0; ONLY_ACTIVE_ARCH = YES; - OTHER_CFLAGS = ( - "$(inherited)", - "-DFB_SONARKIT_ENABLED=1", - ); + OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", From a2d850f6e9dc29a49672a0eed1c0793f3847e18e Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Sat, 14 Oct 2023 17:02:03 +0100 Subject: [PATCH 35/53] Remove FB_SONARKIT_ENABLED flag from xcodeproj debug build settings Originally added in our RN 0.62.2 upg: https://github.com/MetaMask/metamask-mobile/pull/1586 Should have been removed since RN 0.63.0: https://github.com/facebook/react-native/blob/v0.63.0/template/ios/HelloWorld.xcodeproj/project.pbxproj Ref: https://github.com/facebook/react-native/pull/28796 --- ios/MetaMask.xcodeproj/project.pbxproj | 1 - 1 file changed, 1 deletion(-) diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj index 69ed4ff4b24..7db353b7927 100644 --- a/ios/MetaMask.xcodeproj/project.pbxproj +++ b/ios/MetaMask.xcodeproj/project.pbxproj @@ -1016,7 +1016,6 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", - "FB_SONARKIT_ENABLED=1", ); HEADER_SEARCH_PATHS = ( "$(inherited)", From 8a41868fcfec365c09fcbb81b025a0a9a4dec1b9 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Sat, 14 Oct 2023 18:57:59 +0100 Subject: [PATCH 36/53] Reenable AppDelegate.m Flipper imports - at top of file globally - within initializeFlipper fn --- ios/MetaMask/AppDelegate.m | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ios/MetaMask/AppDelegate.m b/ios/MetaMask/AppDelegate.m index deb9ba4126f..55b596de08c 100644 --- a/ios/MetaMask/AppDelegate.m +++ b/ios/MetaMask/AppDelegate.m @@ -7,13 +7,13 @@ #import #if DEBUG #ifdef FB_SONARKIT_ENABLED -//#import -//#import -//#import -//#import -//#import -//#import -//#import +#import +#import +#import +#import +#import +#import +#import #endif #endif @@ -69,15 +69,15 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( - (void) initializeFlipper:(UIApplication *)application { #if DEBUG - #ifdef FB_SONARKIT_ENABLED -// FlipperClient *client = [FlipperClient sharedClient]; -// SKDescriptorMapper *layoutDescriptorMapper = [[SKDescriptorMapper alloc] initWithDefaults]; -// [client addPlugin: [[FlipperKitLayoutPlugin alloc] initWithRootNode: application withDescriptorMapper: layoutDescriptorMapper]]; -// [client addPlugin: [[FKUserDefaultsPlugin alloc] initWithSuiteName:nil]]; -// [client addPlugin: [FlipperKitReactPlugin new]]; -// [client addPlugin: [[FlipperKitNetworkPlugin alloc] initWithNetworkAdapter:[SKIOSNetworkAdapter new]]]; -// [client start]; - #endif + #ifdef FB_SONARKIT_ENABLED + FlipperClient *client = [FlipperClient sharedClient]; + SKDescriptorMapper *layoutDescriptorMapper = [[SKDescriptorMapper alloc] initWithDefaults]; + [client addPlugin: [[FlipperKitLayoutPlugin alloc] initWithRootNode: application withDescriptorMapper: layoutDescriptorMapper]]; + [client addPlugin: [[FKUserDefaultsPlugin alloc] initWithSuiteName:nil]]; + [client addPlugin: [FlipperKitReactPlugin new]]; + [client addPlugin: [[FlipperKitNetworkPlugin alloc] initWithNetworkAdapter:[SKIOSNetworkAdapter new]]]; + [client start]; + #endif #endif } From f6dec93071e5cc500b9ba04538c890fe3a8e9ffd Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Sat, 14 Oct 2023 18:58:23 +0100 Subject: [PATCH 37/53] Remove NO_FLIPPER=1 from package.json setup script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4582d77258e..e8c7f1a167b 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "watch": "./scripts/build.sh watcher watch", "watch:clean": "./scripts/build.sh watcher clean", "clean:ios": "rm -rf ios/build", - "pod:install": "command -v pod && (cd ios/ && NO_FLIPPER=1 pod install && cd ..) || echo \"Skipping pod install\"", + "pod:install": "command -v pod && (cd ios/ && pod install && cd ..) || echo \"Skipping pod install\"", "clean:android": "rm -rf android/app/build", "clean:node": "rm -rf node_modules && yarn --frozen-lockfile", "clean": "yarn clean:ios && yarn clean:android && yarn clean:node", From 1c24f56834cb4d4023c7ef98b28481a54ef7d8d5 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Sat, 14 Oct 2023 19:00:13 +0100 Subject: [PATCH 38/53] Add back Flipper to Podfile and xcodeproj --- ios/MetaMask.xcodeproj/project.pbxproj | 36 ++++++++ ios/Podfile.lock | 117 ++++++++++++++++++++++++- 2 files changed, 152 insertions(+), 1 deletion(-) diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj index 7db353b7927..d1ffdc5ff63 100644 --- a/ios/MetaMask.xcodeproj/project.pbxproj +++ b/ios/MetaMask.xcodeproj/project.pbxproj @@ -558,6 +558,7 @@ 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, 15ACCA0022655C3A0063978B /* Embed Frameworks */, 802588CED3FC487A5D5263F0 /* [CP] Copy Pods Resources */, + C77EFC60F19570875F8DB3BD /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -582,6 +583,7 @@ B339FF2F289ABD70001B89FB /* Bundle React Native code and images */, B339FF30289ABD70001B89FB /* Embed Frameworks */, 8EF10BB14629809332947E5D /* [CP] Copy Pods Resources */, + EB3465C9579A347237ADD532 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -925,6 +927,40 @@ shellPath = /bin/sh; shellScript = "if [[ -s \"$HOME/.nvm/nvm.sh\" ]]; then\n. \"$HOME/.nvm/nvm.sh\"\nelif [[ -x \"$(command -v brew)\" && -s \"$(brew --prefix nvm)/nvm.sh\" ]]; then\n. \"$(brew --prefix nvm)/nvm.sh\"\nfi\n\nexport NODE_BINARY=$(which node)\n\nif [[ -s \"$HOME/.nvm/nvm.sh\" ]]; then\n. \"$HOME/.nvm/nvm.sh\"\nelif [[ -x \"$(command -v brew)\" && -s \"$(brew --prefix nvm)/nvm.sh\" ]]; then\n. \"$(brew --prefix nvm)/nvm.sh\"\nfi\n\nif [ ! -e \"${SENTRY_PROPERTIES}\" ]; then\n export SENTRY_PROPERTIES=../sentry.properties\nfi\n\n\nif [ \"$PLATFORM_NAME\" == \"iphonesimulator\" ] && [ \"$CONFIGURATION\" == \"Release\" ]; then\n ../node_modules/react-native/scripts/react-native-xcode.sh\nelse\n ../node_modules/@sentry/cli/bin/sentry-cli react-native xcode \\\n ../node_modules/react-native/scripts/react-native-xcode.sh\nfi\n"; }; + C77EFC60F19570875F8DB3BD /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-MetaMask/Pods-MetaMask-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-MetaMask/Pods-MetaMask-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MetaMask/Pods-MetaMask-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + EB3465C9579A347237ADD532 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-MetaMask-QA/Pods-MetaMask-QA-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-MetaMask-QA/Pods-MetaMask-QA-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MetaMask-QA/Pods-MetaMask-QA-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/ios/Podfile.lock b/ios/Podfile.lock index ed3a898d350..7bb87b0a89e 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -13,12 +13,75 @@ PODS: - React-Core (= 0.71.13) - React-jsi (= 0.71.13) - ReactCommon/turbomodule/core (= 0.71.13) + - Flipper (0.125.0): + - Flipper-Folly (~> 2.6) + - Flipper-RSocket (~> 1.4) + - Flipper-Boost-iOSX (1.76.0.1.11) + - Flipper-DoubleConversion (3.2.0.1) + - Flipper-Fmt (7.1.7) + - Flipper-Folly (2.6.10): + - Flipper-Boost-iOSX + - Flipper-DoubleConversion + - Flipper-Fmt (= 7.1.7) + - Flipper-Glog + - libevent (~> 2.1.12) + - OpenSSL-Universal (= 1.1.1100) + - Flipper-Glog (0.5.0.5) + - Flipper-PeerTalk (0.0.4) + - Flipper-RSocket (1.4.3): + - Flipper-Folly (~> 2.6) + - FlipperKit (0.125.0): + - FlipperKit/Core (= 0.125.0) + - FlipperKit/Core (0.125.0): + - Flipper (~> 0.125.0) + - FlipperKit/CppBridge + - FlipperKit/FBCxxFollyDynamicConvert + - FlipperKit/FBDefines + - FlipperKit/FKPortForwarding + - SocketRocket (~> 0.6.0) + - FlipperKit/CppBridge (0.125.0): + - Flipper (~> 0.125.0) + - FlipperKit/FBCxxFollyDynamicConvert (0.125.0): + - Flipper-Folly (~> 2.6) + - FlipperKit/FBDefines (0.125.0) + - FlipperKit/FKPortForwarding (0.125.0): + - CocoaAsyncSocket (~> 7.6) + - Flipper-PeerTalk (~> 0.0.4) + - FlipperKit/FlipperKitHighlightOverlay (0.125.0) + - FlipperKit/FlipperKitLayoutHelpers (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutTextSearchable + - FlipperKit/FlipperKitLayoutIOSDescriptors (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutHelpers + - YogaKit (~> 1.18) + - FlipperKit/FlipperKitLayoutPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutHelpers + - FlipperKit/FlipperKitLayoutIOSDescriptors + - FlipperKit/FlipperKitLayoutTextSearchable + - YogaKit (~> 1.18) + - FlipperKit/FlipperKitLayoutTextSearchable (0.125.0) + - FlipperKit/FlipperKitNetworkPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitReactPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitUserDefaultsPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/SKIOSNetworkPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitNetworkPlugin - fmt (6.2.1) - glog (0.3.5) + - libevent (2.1.12) - lottie-ios (3.4.1) - lottie-react-native (5.1.5): - lottie-ios (~> 3.4.0) - React-Core + - OpenSSL-Universal (1.1.1100) - RCT-Folly (2021.07.22.00): - boost - DoubleConversion @@ -462,12 +525,15 @@ PODS: - Sentry/HybridSDK (8.9.3): - SentryPrivate (= 8.9.3) - SentryPrivate (8.9.3) + - SocketRocket (0.6.1) - sovran-react-native (0.4.5): - React-Core - TcpSockets (4.0.0): - CocoaAsyncSocket - React - Yoga (1.14.0) + - YogaKit (1.18.1): + - Yoga (~> 1.14) DEPENDENCIES: - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`) @@ -475,9 +541,31 @@ DEPENDENCIES: - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`) + - Flipper (= 0.125.0) + - Flipper-Boost-iOSX (= 1.76.0.1.11) + - Flipper-DoubleConversion (= 3.2.0.1) + - Flipper-Fmt (= 7.1.7) + - Flipper-Folly (= 2.6.10) + - Flipper-Glog (= 0.5.0.5) + - Flipper-PeerTalk (= 0.0.4) + - Flipper-RSocket (= 1.4.3) + - FlipperKit (= 0.125.0) + - FlipperKit/Core (= 0.125.0) + - FlipperKit/CppBridge (= 0.125.0) + - FlipperKit/FBCxxFollyDynamicConvert (= 0.125.0) + - FlipperKit/FBDefines (= 0.125.0) + - FlipperKit/FKPortForwarding (= 0.125.0) + - FlipperKit/FlipperKitHighlightOverlay (= 0.125.0) + - FlipperKit/FlipperKitLayoutPlugin (= 0.125.0) + - FlipperKit/FlipperKitLayoutTextSearchable (= 0.125.0) + - FlipperKit/FlipperKitNetworkPlugin (= 0.125.0) + - FlipperKit/FlipperKitReactPlugin (= 0.125.0) + - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0) + - FlipperKit/SKIOSNetworkPlugin (= 0.125.0) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - lottie-ios (from `../node_modules/lottie-ios`) - lottie-react-native (from `../node_modules/lottie-react-native`) + - OpenSSL-Universal (= 1.1.1100) - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) - RCTSearchApi (from `../node_modules/react-native-search-api`) @@ -486,6 +574,7 @@ DEPENDENCIES: - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`) - React-Codegen (from `build/generated/ios`) - React-Core (from `../node_modules/react-native/`) + - React-Core/DevSupport (from `../node_modules/react-native/`) - React-Core/RCTWebSocket (from `../node_modules/react-native/`) - React-CoreModules (from `../node_modules/react-native/React/CoreModules`) - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`) @@ -556,9 +645,22 @@ SPEC REPOS: trunk: - Branch - CocoaAsyncSocket + - Flipper + - Flipper-Boost-iOSX + - Flipper-DoubleConversion + - Flipper-Fmt + - Flipper-Folly + - Flipper-Glog + - Flipper-PeerTalk + - Flipper-RSocket + - FlipperKit - fmt + - libevent + - OpenSSL-Universal - Sentry - SentryPrivate + - SocketRocket + - YogaKit EXTERNAL SOURCES: boost: @@ -730,10 +832,21 @@ SPEC CHECKSUMS: DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 FBLazyVector: 24e08bf294faea0abc0278abb2fcad7f3e446f6f FBReactNativeSpec: c949e4b726d8cf9e19b73be60ecfa26355deceb3 + Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 + Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c + Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 + Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b + Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3 + Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446 + Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 + Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 + FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b + libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 lottie-ios: 016449b5d8be0c3dcbcfa0a9988469999cd04c5d lottie-react-native: 3e722c63015fdb9c27638b0a77969fc412067c18 + OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 RCTRequired: c20235648eeb64a874f55459ceae6b081956318d RCTSearchApi: d2d38a5a7bffbfb144e2c770fbb30f51b1053067 @@ -805,10 +918,12 @@ SPEC CHECKSUMS: segment-analytics-react-native: bd1f13ea95bad2313a9c7130da032af0e9a6da60 Sentry: 97161cac725da1ecbe77d1445bf8a61c1e5667f1 SentryPrivate: 9a76def09fb08f9501997b8df946e8097947b94f + SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 sovran-react-native: fd3dc8f1a4b14acdc4ad25fc6b4ac4f52a2a2a15 TcpSockets: a8eb6b5867fe643e6cfed5db2e4de62f4d1e8fd0 Yoga: 135109c9b8c5d1a8af3a58d21cd4c7aa7f3bf555 + YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: b5dfd49460dbbc2097bb2926050c46d03af04962 +PODFILE CHECKSUM: f768203a1ad0a07bc7fc8673b12a59c9fc2e65ff COCOAPODS: 1.12.1 From 544cd1cf4c542a5335037a9a7f69ce94ca698353 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Sun, 15 Oct 2023 14:19:14 +0100 Subject: [PATCH 39/53] Revert "Fix Xcode 15 error: Unable to load ...frameworks-Debug-input-files.xcfilelist" This reverts commit a09d517135af02474bbef3e461a7e50d32f99830. --- ios/MetaMask.xcodeproj/project.pbxproj | 1 + 1 file changed, 1 insertion(+) diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj index d1ffdc5ff63..f7f87de1d34 100644 --- a/ios/MetaMask.xcodeproj/project.pbxproj +++ b/ios/MetaMask.xcodeproj/project.pbxproj @@ -786,6 +786,7 @@ files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-MetaMask/Pods-MetaMask-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); inputPaths = ( ); From 4bb7c33891c53e53119bc99deee8d3ce9f36f893 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Mon, 16 Oct 2023 11:23:13 +0100 Subject: [PATCH 40/53] Add Podfile react_native_post_install comment --- ios/Podfile | 4 ++++ ios/Podfile.lock | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ios/Podfile b/ios/Podfile index f2688c3c63d..dbed2f6529d 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -10,6 +10,10 @@ if linkage != nil use_frameworks! :linkage => linkage.to_sym end +# react_native_post_install: +# Disabled to fix SentryPrivate Xcode 15 build error +# - https://github.com/getsentry/sentry-react-native/issues/3322 + # def react_native_post_install(installer) # installer.pods_project.targets.each do |target| # target.build_configurations.each do |config| diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 7bb87b0a89e..32e66112b52 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -924,6 +924,6 @@ SPEC CHECKSUMS: Yoga: 135109c9b8c5d1a8af3a58d21cd4c7aa7f3bf555 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: f768203a1ad0a07bc7fc8673b12a59c9fc2e65ff +PODFILE CHECKSUM: 6c9103d9058ffd16683843f0f7d99bfa6f599ee3 COCOAPODS: 1.12.1 From 40934e63502fb716e71d6ce35560b8528c38aec3 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Tue, 17 Oct 2023 18:27:39 +0100 Subject: [PATCH 41/53] Upgrade React Native from 0.71.13 to 0.71.14 https://react-native-community.github.io/upgrade-helper/?from=0.71.13&to=0.71.14 Tested working on both - Xcode 14.2 - Xcode 15 --- Gemfile | 1 + ios/MetaMask.xcodeproj/project.pbxproj | 15 + ios/Podfile.lock | 466 +++++++++--------- package.json | 2 +- ...71.13.patch => react-native+0.71.14.patch} | 0 yarn.lock | 50 +- 6 files changed, 275 insertions(+), 259 deletions(-) rename patches/{react-native+0.71.13.patch => react-native+0.71.14.patch} (100%) diff --git a/Gemfile b/Gemfile index 7e9b9f3fe8b..b84613ed6cb 100644 --- a/Gemfile +++ b/Gemfile @@ -4,3 +4,4 @@ source 'https://rubygems.org' ruby '>= 3.0.0' gem 'cocoapods', '>= 1.11.3' +gem 'activesupport', '>= 6.1.7.3', '< 7.1.0' diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj index f7f87de1d34..2e3ae2b5ebc 100644 --- a/ios/MetaMask.xcodeproj/project.pbxproj +++ b/ios/MetaMask.xcodeproj/project.pbxproj @@ -1184,6 +1184,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", + _LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION, ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -1195,6 +1196,11 @@ IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; + OTHER_LDFLAGS = ( + "$(inherited)", + "-Wl", + "-ld_classic", + ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; }; @@ -1224,6 +1230,10 @@ ENABLE_STRICT_OBJC_MSGSEND = YES; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + _LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION, + ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -1232,6 +1242,11 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; + OTHER_LDFLAGS = ( + "$(inherited)", + "-Wl", + "-ld_classic", + ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 32e66112b52..377d14bf425 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -5,14 +5,14 @@ PODS: - React - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - - FBLazyVector (0.71.13) - - FBReactNativeSpec (0.71.13): + - FBLazyVector (0.71.14) + - FBReactNativeSpec (0.71.14): - RCT-Folly (= 2021.07.22.00) - - RCTRequired (= 0.71.13) - - RCTTypeSafety (= 0.71.13) - - React-Core (= 0.71.13) - - React-jsi (= 0.71.13) - - ReactCommon/turbomodule/core (= 0.71.13) + - RCTRequired (= 0.71.14) + - RCTTypeSafety (= 0.71.14) + - React-Core (= 0.71.14) + - React-jsi (= 0.71.14) + - ReactCommon/turbomodule/core (= 0.71.14) - Flipper (0.125.0): - Flipper-Folly (~> 2.6) - Flipper-RSocket (~> 1.4) @@ -93,29 +93,29 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - RCTRequired (0.71.13) + - RCTRequired (0.71.14) - RCTSearchApi (1.0.1): - React - React-RCTImage - - RCTTypeSafety (0.71.13): - - FBLazyVector (= 0.71.13) - - RCTRequired (= 0.71.13) - - React-Core (= 0.71.13) - - React (0.71.13): - - React-Core (= 0.71.13) - - React-Core/DevSupport (= 0.71.13) - - React-Core/RCTWebSocket (= 0.71.13) - - React-RCTActionSheet (= 0.71.13) - - React-RCTAnimation (= 0.71.13) - - React-RCTBlob (= 0.71.13) - - React-RCTImage (= 0.71.13) - - React-RCTLinking (= 0.71.13) - - React-RCTNetwork (= 0.71.13) - - React-RCTSettings (= 0.71.13) - - React-RCTText (= 0.71.13) - - React-RCTVibration (= 0.71.13) - - React-callinvoker (0.71.13) - - React-Codegen (0.71.13): + - RCTTypeSafety (0.71.14): + - FBLazyVector (= 0.71.14) + - RCTRequired (= 0.71.14) + - React-Core (= 0.71.14) + - React (0.71.14): + - React-Core (= 0.71.14) + - React-Core/DevSupport (= 0.71.14) + - React-Core/RCTWebSocket (= 0.71.14) + - React-RCTActionSheet (= 0.71.14) + - React-RCTAnimation (= 0.71.14) + - React-RCTBlob (= 0.71.14) + - React-RCTImage (= 0.71.14) + - React-RCTLinking (= 0.71.14) + - React-RCTNetwork (= 0.71.14) + - React-RCTSettings (= 0.71.14) + - React-RCTText (= 0.71.14) + - React-RCTVibration (= 0.71.14) + - React-callinvoker (0.71.14) + - React-Codegen (0.71.14): - FBReactNativeSpec - RCT-Folly - RCTRequired @@ -126,196 +126,196 @@ PODS: - React-jsiexecutor - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - - React-Core (0.71.13): + - React-Core (0.71.14): - glog - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.71.13) - - React-cxxreact (= 0.71.13) + - React-Core/Default (= 0.71.14) + - React-cxxreact (= 0.71.14) - React-jsc - - React-jsi (= 0.71.13) - - React-jsiexecutor (= 0.71.13) - - React-perflogger (= 0.71.13) + - React-jsi (= 0.71.14) + - React-jsiexecutor (= 0.71.14) + - React-perflogger (= 0.71.14) - Yoga - - React-Core/CoreModulesHeaders (0.71.13): + - React-Core/CoreModulesHeaders (0.71.14): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.13) + - React-cxxreact (= 0.71.14) - React-jsc - - React-jsi (= 0.71.13) - - React-jsiexecutor (= 0.71.13) - - React-perflogger (= 0.71.13) + - React-jsi (= 0.71.14) + - React-jsiexecutor (= 0.71.14) + - React-perflogger (= 0.71.14) - Yoga - - React-Core/Default (0.71.13): + - React-Core/Default (0.71.14): - glog - RCT-Folly (= 2021.07.22.00) - - React-cxxreact (= 0.71.13) + - React-cxxreact (= 0.71.14) - React-jsc - - React-jsi (= 0.71.13) - - React-jsiexecutor (= 0.71.13) - - React-perflogger (= 0.71.13) + - React-jsi (= 0.71.14) + - React-jsiexecutor (= 0.71.14) + - React-perflogger (= 0.71.14) - Yoga - - React-Core/DevSupport (0.71.13): + - React-Core/DevSupport (0.71.14): - glog - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.71.13) - - React-Core/RCTWebSocket (= 0.71.13) - - React-cxxreact (= 0.71.13) + - React-Core/Default (= 0.71.14) + - React-Core/RCTWebSocket (= 0.71.14) + - React-cxxreact (= 0.71.14) - React-jsc - - React-jsi (= 0.71.13) - - React-jsiexecutor (= 0.71.13) - - React-jsinspector (= 0.71.13) - - React-perflogger (= 0.71.13) + - React-jsi (= 0.71.14) + - React-jsiexecutor (= 0.71.14) + - React-jsinspector (= 0.71.14) + - React-perflogger (= 0.71.14) - Yoga - - React-Core/RCTActionSheetHeaders (0.71.13): + - React-Core/RCTActionSheetHeaders (0.71.14): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.13) + - React-cxxreact (= 0.71.14) - React-jsc - - React-jsi (= 0.71.13) - - React-jsiexecutor (= 0.71.13) - - React-perflogger (= 0.71.13) + - React-jsi (= 0.71.14) + - React-jsiexecutor (= 0.71.14) + - React-perflogger (= 0.71.14) - Yoga - - React-Core/RCTAnimationHeaders (0.71.13): + - React-Core/RCTAnimationHeaders (0.71.14): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.13) + - React-cxxreact (= 0.71.14) - React-jsc - - React-jsi (= 0.71.13) - - React-jsiexecutor (= 0.71.13) - - React-perflogger (= 0.71.13) + - React-jsi (= 0.71.14) + - React-jsiexecutor (= 0.71.14) + - React-perflogger (= 0.71.14) - Yoga - - React-Core/RCTBlobHeaders (0.71.13): + - React-Core/RCTBlobHeaders (0.71.14): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.13) + - React-cxxreact (= 0.71.14) - React-jsc - - React-jsi (= 0.71.13) - - React-jsiexecutor (= 0.71.13) - - React-perflogger (= 0.71.13) + - React-jsi (= 0.71.14) + - React-jsiexecutor (= 0.71.14) + - React-perflogger (= 0.71.14) - Yoga - - React-Core/RCTImageHeaders (0.71.13): + - React-Core/RCTImageHeaders (0.71.14): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.13) + - React-cxxreact (= 0.71.14) - React-jsc - - React-jsi (= 0.71.13) - - React-jsiexecutor (= 0.71.13) - - React-perflogger (= 0.71.13) + - React-jsi (= 0.71.14) + - React-jsiexecutor (= 0.71.14) + - React-perflogger (= 0.71.14) - Yoga - - React-Core/RCTLinkingHeaders (0.71.13): + - React-Core/RCTLinkingHeaders (0.71.14): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.13) + - React-cxxreact (= 0.71.14) - React-jsc - - React-jsi (= 0.71.13) - - React-jsiexecutor (= 0.71.13) - - React-perflogger (= 0.71.13) + - React-jsi (= 0.71.14) + - React-jsiexecutor (= 0.71.14) + - React-perflogger (= 0.71.14) - Yoga - - React-Core/RCTNetworkHeaders (0.71.13): + - React-Core/RCTNetworkHeaders (0.71.14): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.13) + - React-cxxreact (= 0.71.14) - React-jsc - - React-jsi (= 0.71.13) - - React-jsiexecutor (= 0.71.13) - - React-perflogger (= 0.71.13) + - React-jsi (= 0.71.14) + - React-jsiexecutor (= 0.71.14) + - React-perflogger (= 0.71.14) - Yoga - - React-Core/RCTPushNotificationHeaders (0.71.13): + - React-Core/RCTPushNotificationHeaders (0.71.14): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.13) + - React-cxxreact (= 0.71.14) - React-jsc - - React-jsi (= 0.71.13) - - React-jsiexecutor (= 0.71.13) - - React-perflogger (= 0.71.13) + - React-jsi (= 0.71.14) + - React-jsiexecutor (= 0.71.14) + - React-perflogger (= 0.71.14) - Yoga - - React-Core/RCTSettingsHeaders (0.71.13): + - React-Core/RCTSettingsHeaders (0.71.14): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.13) + - React-cxxreact (= 0.71.14) - React-jsc - - React-jsi (= 0.71.13) - - React-jsiexecutor (= 0.71.13) - - React-perflogger (= 0.71.13) + - React-jsi (= 0.71.14) + - React-jsiexecutor (= 0.71.14) + - React-perflogger (= 0.71.14) - Yoga - - React-Core/RCTTextHeaders (0.71.13): + - React-Core/RCTTextHeaders (0.71.14): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.13) + - React-cxxreact (= 0.71.14) - React-jsc - - React-jsi (= 0.71.13) - - React-jsiexecutor (= 0.71.13) - - React-perflogger (= 0.71.13) + - React-jsi (= 0.71.14) + - React-jsiexecutor (= 0.71.14) + - React-perflogger (= 0.71.14) - Yoga - - React-Core/RCTVibrationHeaders (0.71.13): + - React-Core/RCTVibrationHeaders (0.71.14): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.71.13) + - React-cxxreact (= 0.71.14) - React-jsc - - React-jsi (= 0.71.13) - - React-jsiexecutor (= 0.71.13) - - React-perflogger (= 0.71.13) + - React-jsi (= 0.71.14) + - React-jsiexecutor (= 0.71.14) + - React-perflogger (= 0.71.14) - Yoga - - React-Core/RCTWebSocket (0.71.13): + - React-Core/RCTWebSocket (0.71.14): - glog - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.71.13) - - React-cxxreact (= 0.71.13) + - React-Core/Default (= 0.71.14) + - React-cxxreact (= 0.71.14) - React-jsc - - React-jsi (= 0.71.13) - - React-jsiexecutor (= 0.71.13) - - React-perflogger (= 0.71.13) + - React-jsi (= 0.71.14) + - React-jsiexecutor (= 0.71.14) + - React-perflogger (= 0.71.14) - Yoga - - React-CoreModules (0.71.13): + - React-CoreModules (0.71.14): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.71.13) - - React-Codegen (= 0.71.13) - - React-Core/CoreModulesHeaders (= 0.71.13) - - React-jsi (= 0.71.13) + - RCTTypeSafety (= 0.71.14) + - React-Codegen (= 0.71.14) + - React-Core/CoreModulesHeaders (= 0.71.14) + - React-jsi (= 0.71.14) - React-RCTBlob - - React-RCTImage (= 0.71.13) - - ReactCommon/turbomodule/core (= 0.71.13) - - React-cxxreact (0.71.13): + - React-RCTImage (= 0.71.14) + - ReactCommon/turbomodule/core (= 0.71.14) + - React-cxxreact (0.71.14): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-callinvoker (= 0.71.13) - - React-jsi (= 0.71.13) - - React-jsinspector (= 0.71.13) - - React-logger (= 0.71.13) - - React-perflogger (= 0.71.13) - - React-runtimeexecutor (= 0.71.13) - - React-jsc (0.71.13): - - React-jsc/Fabric (= 0.71.13) - - React-jsi (= 0.71.13) - - React-jsc/Fabric (0.71.13): - - React-jsi (= 0.71.13) - - React-jsi (0.71.13): + - React-callinvoker (= 0.71.14) + - React-jsi (= 0.71.14) + - React-jsinspector (= 0.71.14) + - React-logger (= 0.71.14) + - React-perflogger (= 0.71.14) + - React-runtimeexecutor (= 0.71.14) + - React-jsc (0.71.14): + - React-jsc/Fabric (= 0.71.14) + - React-jsi (= 0.71.14) + - React-jsc/Fabric (0.71.14): + - React-jsi (= 0.71.14) + - React-jsi (0.71.14): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-jsiexecutor (0.71.13): + - React-jsiexecutor (0.71.14): - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-cxxreact (= 0.71.13) - - React-jsi (= 0.71.13) - - React-perflogger (= 0.71.13) - - React-jsinspector (0.71.13) - - React-logger (0.71.13): + - React-cxxreact (= 0.71.14) + - React-jsi (= 0.71.14) + - React-perflogger (= 0.71.14) + - React-jsinspector (0.71.14) + - React-logger (0.71.14): - glog - react-native-aes (1.3.9): - React @@ -359,93 +359,93 @@ PODS: - React - react-native-webview (11.13.0): - React-Core - - React-perflogger (0.71.13) - - React-RCTActionSheet (0.71.13): - - React-Core/RCTActionSheetHeaders (= 0.71.13) - - React-RCTAnimation (0.71.13): + - React-perflogger (0.71.14) + - React-RCTActionSheet (0.71.14): + - React-Core/RCTActionSheetHeaders (= 0.71.14) + - React-RCTAnimation (0.71.14): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.71.13) - - React-Codegen (= 0.71.13) - - React-Core/RCTAnimationHeaders (= 0.71.13) - - React-jsi (= 0.71.13) - - ReactCommon/turbomodule/core (= 0.71.13) - - React-RCTAppDelegate (0.71.13): + - RCTTypeSafety (= 0.71.14) + - React-Codegen (= 0.71.14) + - React-Core/RCTAnimationHeaders (= 0.71.14) + - React-jsi (= 0.71.14) + - ReactCommon/turbomodule/core (= 0.71.14) + - React-RCTAppDelegate (0.71.14): - RCT-Folly - RCTRequired - RCTTypeSafety - React-Core - ReactCommon/turbomodule/core - - React-RCTBlob (0.71.13): + - React-RCTBlob (0.71.14): - RCT-Folly (= 2021.07.22.00) - - React-Codegen (= 0.71.13) - - React-Core/RCTBlobHeaders (= 0.71.13) - - React-Core/RCTWebSocket (= 0.71.13) - - React-jsi (= 0.71.13) - - React-RCTNetwork (= 0.71.13) - - ReactCommon/turbomodule/core (= 0.71.13) - - React-RCTImage (0.71.13): + - React-Codegen (= 0.71.14) + - React-Core/RCTBlobHeaders (= 0.71.14) + - React-Core/RCTWebSocket (= 0.71.14) + - React-jsi (= 0.71.14) + - React-RCTNetwork (= 0.71.14) + - ReactCommon/turbomodule/core (= 0.71.14) + - React-RCTImage (0.71.14): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.71.13) - - React-Codegen (= 0.71.13) - - React-Core/RCTImageHeaders (= 0.71.13) - - React-jsi (= 0.71.13) - - React-RCTNetwork (= 0.71.13) - - ReactCommon/turbomodule/core (= 0.71.13) - - React-RCTLinking (0.71.13): - - React-Codegen (= 0.71.13) - - React-Core/RCTLinkingHeaders (= 0.71.13) - - React-jsi (= 0.71.13) - - ReactCommon/turbomodule/core (= 0.71.13) - - React-RCTNetwork (0.71.13): + - RCTTypeSafety (= 0.71.14) + - React-Codegen (= 0.71.14) + - React-Core/RCTImageHeaders (= 0.71.14) + - React-jsi (= 0.71.14) + - React-RCTNetwork (= 0.71.14) + - ReactCommon/turbomodule/core (= 0.71.14) + - React-RCTLinking (0.71.14): + - React-Codegen (= 0.71.14) + - React-Core/RCTLinkingHeaders (= 0.71.14) + - React-jsi (= 0.71.14) + - ReactCommon/turbomodule/core (= 0.71.14) + - React-RCTNetwork (0.71.14): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.71.13) - - React-Codegen (= 0.71.13) - - React-Core/RCTNetworkHeaders (= 0.71.13) - - React-jsi (= 0.71.13) - - ReactCommon/turbomodule/core (= 0.71.13) - - React-RCTPushNotification (0.71.13): - - RCTTypeSafety (= 0.71.13) - - React-Codegen (= 0.71.13) - - React-Core/RCTPushNotificationHeaders (= 0.71.13) - - React-jsi (= 0.71.13) - - ReactCommon/turbomodule/core (= 0.71.13) - - React-RCTSettings (0.71.13): + - RCTTypeSafety (= 0.71.14) + - React-Codegen (= 0.71.14) + - React-Core/RCTNetworkHeaders (= 0.71.14) + - React-jsi (= 0.71.14) + - ReactCommon/turbomodule/core (= 0.71.14) + - React-RCTPushNotification (0.71.14): + - RCTTypeSafety (= 0.71.14) + - React-Codegen (= 0.71.14) + - React-Core/RCTPushNotificationHeaders (= 0.71.14) + - React-jsi (= 0.71.14) + - ReactCommon/turbomodule/core (= 0.71.14) + - React-RCTSettings (0.71.14): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.71.13) - - React-Codegen (= 0.71.13) - - React-Core/RCTSettingsHeaders (= 0.71.13) - - React-jsi (= 0.71.13) - - ReactCommon/turbomodule/core (= 0.71.13) - - React-RCTText (0.71.13): - - React-Core/RCTTextHeaders (= 0.71.13) - - React-RCTVibration (0.71.13): + - RCTTypeSafety (= 0.71.14) + - React-Codegen (= 0.71.14) + - React-Core/RCTSettingsHeaders (= 0.71.14) + - React-jsi (= 0.71.14) + - ReactCommon/turbomodule/core (= 0.71.14) + - React-RCTText (0.71.14): + - React-Core/RCTTextHeaders (= 0.71.14) + - React-RCTVibration (0.71.14): - RCT-Folly (= 2021.07.22.00) - - React-Codegen (= 0.71.13) - - React-Core/RCTVibrationHeaders (= 0.71.13) - - React-jsi (= 0.71.13) - - ReactCommon/turbomodule/core (= 0.71.13) - - React-runtimeexecutor (0.71.13): - - React-jsi (= 0.71.13) - - ReactCommon/turbomodule/bridging (0.71.13): + - React-Codegen (= 0.71.14) + - React-Core/RCTVibrationHeaders (= 0.71.14) + - React-jsi (= 0.71.14) + - ReactCommon/turbomodule/core (= 0.71.14) + - React-runtimeexecutor (0.71.14): + - React-jsi (= 0.71.14) + - ReactCommon/turbomodule/bridging (0.71.14): - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-callinvoker (= 0.71.13) - - React-Core (= 0.71.13) - - React-cxxreact (= 0.71.13) - - React-jsi (= 0.71.13) - - React-logger (= 0.71.13) - - React-perflogger (= 0.71.13) - - ReactCommon/turbomodule/core (0.71.13): + - React-callinvoker (= 0.71.14) + - React-Core (= 0.71.14) + - React-cxxreact (= 0.71.14) + - React-jsi (= 0.71.14) + - React-logger (= 0.71.14) + - React-perflogger (= 0.71.14) + - ReactCommon/turbomodule/core (0.71.14): - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-callinvoker (= 0.71.13) - - React-Core (= 0.71.13) - - React-cxxreact (= 0.71.13) - - React-jsi (= 0.71.13) - - React-logger (= 0.71.13) - - React-perflogger (= 0.71.13) + - React-callinvoker (= 0.71.14) + - React-Core (= 0.71.14) + - React-cxxreact (= 0.71.14) + - React-jsi (= 0.71.14) + - React-logger (= 0.71.14) + - React-perflogger (= 0.71.14) - ReactNativePayments (1.5.0): - React - rn-fetch-blob (0.12.0): @@ -830,8 +830,8 @@ SPEC CHECKSUMS: BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 - FBLazyVector: 24e08bf294faea0abc0278abb2fcad7f3e446f6f - FBReactNativeSpec: c949e4b726d8cf9e19b73be60ecfa26355deceb3 + FBLazyVector: 12ea01e587c9594e7b144e1bfc86ac4d9ac28fde + FBReactNativeSpec: b6ae48e67aaba46442f84d6f9ba598ccfbe2ee66 Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 @@ -848,20 +848,20 @@ SPEC CHECKSUMS: lottie-react-native: 3e722c63015fdb9c27638b0a77969fc412067c18 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 - RCTRequired: c20235648eeb64a874f55459ceae6b081956318d + RCTRequired: e9df143e880d0e879e7a498dc06923d728809c79 RCTSearchApi: d2d38a5a7bffbfb144e2c770fbb30f51b1053067 - RCTTypeSafety: ca004f1fe0b76f7936f7fe7dfd761a4386cf72f5 - React: b27df2b1da30335cf1bf1909056c4e1c3a3603ae - React-callinvoker: f2a69510d781d8226d51342a3cbe8a9b13573ea5 - React-Codegen: fc3a9885cb4d341b87dc28627dc55d21abc89788 - React-Core: ba3402af336f345b2178d97be2dd5d8d70f8f068 - React-CoreModules: 0e081b26ab034992d6a60217fc35a83e8ad9b8ed - React-cxxreact: 65b6f835fb2654a8c2011412bad4f8a2f4d1ccca - React-jsc: 61eedc91c322c4d393cf8369a059902de301f2c9 - React-jsi: a05a2aab770ba542966849e45f330bc366ad8905 - React-jsiexecutor: 619be858f64120a6b9c1b36c1e8c538b55872e23 - React-jsinspector: 7e58fe86c7cc442fd11da0c9d8bef12a8d63f771 - React-logger: a3f6ca0d018749852a2a6f07c154bfc6fcd4195a + RCTTypeSafety: c2d89c8308829c12c038ec1f431191eaa0d8c15c + React: 52b89a818f4b2579c98567f3aa8bde880d9e843b + React-callinvoker: 56e399c88c05e037fe99c31978f30e75fad5c286 + React-Codegen: 3829d8baaafb4df895b7ab4a6abcf10ffeb444fd + React-Core: 419ce3efb3a2591de74bfc09f150f626293d40d6 + React-CoreModules: bd520e5688b5aa4666965a1b3b8e6d4a2e19df20 + React-cxxreact: f5a9baa03f1b6a660648f3b8d09bdc6d87d5ebe8 + React-jsc: 07a7e67aa41b02028fc7bf8aded401f33cf1736f + React-jsi: fe531dec7a6efc3606a56ac85a432d04ff6ee72b + React-jsiexecutor: 73717bd8ba46630d4eeeabd1e2c7b95691618d6f + React-jsinspector: 7bf923954b4e035f494b01ac16633963412660d7 + React-logger: 655ff5db8bd922acfbe76a4983ffab048916343e react-native-aes: ff31f0dd4c791eb423a631ee04570fcf3c618924 react-native-background-timer: 1b6e6b4e10f1b74c367a1fdc3c72b67c619b222b react-native-blur: cfdad7b3c01d725ab62a8a729f42ea463998afa2 @@ -878,20 +878,20 @@ SPEC CHECKSUMS: react-native-video: c26780b224543c62d5e1b2a7244a5cd1b50e8253 react-native-view-shot: 4475fde003fe8a210053d1f98fb9e06c1d834e1c react-native-webview: 133a6a5149f963259646e710b4545c67ef35d7c9 - React-perflogger: 431a655960a02f01257d631b2a9bfbb02fd21064 - React-RCTActionSheet: 38c8d496d0faa63013d16f709e10a3acf6b5f100 - React-RCTAnimation: 6da4d599f3262ed8021433ddd96de45ac9e731b1 - React-RCTAppDelegate: 3053338f2a9ebbaccb3828b3d471250a7e7b878c - React-RCTBlob: 54afdbd19710a6d0be0c28b64a4a0db625bc2a30 - React-RCTImage: 4e31e6ebf2b9705831d1855425a043b40eec1f61 - React-RCTLinking: 22ac16d44e2df03e9ca9125273fc58a7c507f529 - React-RCTNetwork: 4bacd206834633c23475485dbc21c18563627af4 - React-RCTPushNotification: e096d355dd364600c9f3760a71d8240d44bb7c29 - React-RCTSettings: 4e4ace986ae92a7e1696fdac11615576b698f337 - React-RCTText: 37a1341bdf1f80e9909f6b69a7a9ee747cb682d3 - React-RCTVibration: 2271362cdf9ff2dae6a2156f5101e5c30b02694d - React-runtimeexecutor: 35cec6420c9d4144b0d06f9fdb093cf8f02bd52c - ReactCommon: 56296d2632e8eb53e94a2b7c0d05db694e164ca7 + React-perflogger: 4987ad83731c23d11813c84263963b0d3028c966 + React-RCTActionSheet: 5ad952b2a9740d87a5bd77280c4bc23f6f89ea0c + React-RCTAnimation: d2de22af3f536cc80bb5b3918e1a455114d1b985 + React-RCTAppDelegate: 936b5b4ba5c2edb60186efd3bd35402cc9f2a2e6 + React-RCTBlob: e7cc24020cdd4e61b198761fb86f1305f77c90ff + React-RCTImage: a07e8c7d4768f62ebc6277e4680f6b979c619967 + React-RCTLinking: d00ae55db37b2c12ebab91135f06f75391c0708d + React-RCTNetwork: b3a401276e5c08487d8a14fdec1720e78b5888db + React-RCTPushNotification: a9824e8f010d5787ae20a70c8f94c65b87e7e811 + React-RCTSettings: d606cbac31403604c5d5746e6dab53bb332f9301 + React-RCTText: b3bd40bc71bca0c3e2cc5ce2c40870a438f303b1 + React-RCTVibration: 64e412b9ac684c4edc938fa1187135ada9af7faf + React-runtimeexecutor: ffe826b7b1cfbc32a35ed5b64d5886c0ff75f501 + ReactCommon: 7cf566ddbc9344e1f02bae1ecdaf03dbedb7eb17 ReactNativePayments: a4e3ac915256a4e759c8a04338b558494a63a0f5 rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba RNCAsyncStorage: 0c357f3156fcb16c8589ede67cc036330b6698ca @@ -921,7 +921,7 @@ SPEC CHECKSUMS: SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 sovran-react-native: fd3dc8f1a4b14acdc4ad25fc6b4ac4f52a2a2a15 TcpSockets: a8eb6b5867fe643e6cfed5db2e4de62f4d1e8fd0 - Yoga: 135109c9b8c5d1a8af3a58d21cd4c7aa7f3bf555 + Yoga: e71803b4c1fff832ccf9b92541e00f9b873119b9 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: 6c9103d9058ffd16683843f0f7d99bfa6f599ee3 diff --git a/package.json b/package.json index e8c7f1a167b..d5c3ed51582 100644 --- a/package.json +++ b/package.json @@ -263,7 +263,7 @@ "query-string": "^6.12.1", "randomfill": "^1.0.4", "react": "18.2.0", - "react-native": "0.71.13", + "react-native": "0.71.14", "react-native-actionsheet": "beefe/react-native-actionsheet#107/head", "react-native-aes-crypto": "1.3.9", "react-native-aes-crypto-forked": "git+https://github.com/MetaMask/react-native-aes-crypto-forked.git#397d5db5250e8e7408294807965b5b9fd4ca6a25", diff --git a/patches/react-native+0.71.13.patch b/patches/react-native+0.71.14.patch similarity index 100% rename from patches/react-native+0.71.13.patch rename to patches/react-native+0.71.14.patch diff --git a/yarn.lock b/yarn.lock index 73ccda0e428..e74899d43be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11059,10 +11059,10 @@ assign-symbols@^1.0.0: resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= -ast-types@0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.14.2.tgz#600b882df8583e3cd4f2df5fa20fa83759d4bdfd" - integrity sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA== +ast-types@0.15.2: + version "0.15.2" + resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.15.2.tgz#39ae4809393c4b16df751ee563411423e85fb49d" + integrity sha512-c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg== dependencies: tslib "^2.0.1" @@ -19848,10 +19848,10 @@ jsc-safe-url@^0.2.2: resolved "https://registry.yarnpkg.com/jsc-safe-url/-/jsc-safe-url-0.2.4.tgz#141c14fbb43791e88d5dc64e85a374575a83477a" integrity sha512-0wM3YBWtYePOjfyXQH5MWQ8H7sdk5EXSwZvmSLKk2RboVQ2Bu239jycHDz5J/8Blf3K0Qnoy2b6xD+z10MFB+Q== -jscodeshift@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.13.1.tgz#69bfe51e54c831296380585c6d9e733512aecdef" - integrity sha512-lGyiEbGOvmMRKgWk4vf+lUrCWO/8YR8sUR3FKF1Cq5fovjZDlIcw3Hu5ppLHAnEXshVffvaM0eyuY/AbOeYpnQ== +jscodeshift@^0.14.0: + version "0.14.0" + resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.14.0.tgz#7542e6715d6d2e8bde0b4e883f0ccea358b46881" + integrity sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA== dependencies: "@babel/core" "^7.13.16" "@babel/parser" "^7.13.16" @@ -19866,10 +19866,10 @@ jscodeshift@^0.13.1: chalk "^4.1.2" flow-parser "0.*" graceful-fs "^4.2.4" - micromatch "^3.1.10" + micromatch "^4.0.4" neo-async "^2.5.0" node-dir "^0.1.17" - recast "^0.20.4" + recast "^0.21.0" temp "^0.8.4" write-file-atomic "^2.3.0" @@ -25048,14 +25048,14 @@ react-native-cli@2.0.1: prompt "^0.2.14" semver "^5.0.3" -react-native-codegen@^0.71.5: - version "0.71.5" - resolved "https://registry.yarnpkg.com/react-native-codegen/-/react-native-codegen-0.71.5.tgz#454a42a891cd4ca5fc436440d301044dc1349c14" - integrity sha512-rfsuc0zkuUuMjFnrT55I1mDZ+pBRp2zAiRwxck3m6qeGJBGK5OV5JH66eDQ4aa+3m0of316CqrJDRzVlYufzIg== +react-native-codegen@^0.71.6: + version "0.71.6" + resolved "https://registry.yarnpkg.com/react-native-codegen/-/react-native-codegen-0.71.6.tgz#481a610c3af9135b09e1e031da032e7270e0cc1b" + integrity sha512-e5pR4VldIhEaFctfSAEgxbng0uG4gjBQxAHes3EKLdosH/Av90pQfSe9IDVdFIngvNPzt8Y14pNjrtqov/yNIg== dependencies: "@babel/parser" "^7.14.0" flow-parser "^0.185.0" - jscodeshift "^0.13.1" + jscodeshift "^0.14.0" nullthrows "^1.1.1" react-native-confetti-cannon@^1.5.0: @@ -25512,10 +25512,10 @@ react-native-webview@11.13.0: escape-string-regexp "2.0.0" invariant "2.2.4" -react-native@0.71.13: - version "0.71.13" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.71.13.tgz#e20007904f5f8a4b8b1faf1e60f0d7eb9f578ed6" - integrity sha512-zEa69YQNLdv8Sf5Pn0CNDB1K9eGuNy1KoMNxXlrZ89JZ8d02b5hihZIoOCCIwhH+iPgslYwr3ZoGd3AY6FMrgw== +react-native@0.71.14: + version "0.71.14" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.71.14.tgz#df12b405a7913b736de01b0347af14e4be7bf324" + integrity sha512-7uhzas8aKpU2EARhlONt7yiclh+7PXEOJk469ewpQyId8Owq5WNtZvQm/z3k4mHUriMeQ37vgSGkOInSKcCazw== dependencies: "@jest/create-cache-key-function" "^29.2.1" "@react-native-community/cli" "10.2.4" @@ -25542,7 +25542,7 @@ react-native@0.71.13: pretty-format "^26.5.2" promise "^8.3.0" react-devtools-core "^4.26.1" - react-native-codegen "^0.71.5" + react-native-codegen "^0.71.6" react-native-gradle-plugin "^0.71.19" react-refresh "^0.4.0" react-shallow-renderer "^16.15.0" @@ -25924,12 +25924,12 @@ real-require@^0.1.0: resolved "https://registry.yarnpkg.com/real-require/-/real-require-0.1.0.tgz#736ac214caa20632847b7ca8c1056a0767df9381" integrity sha512-r/H9MzAWtrv8aSVjPCMFpDMl5q66GqtmmRkRjpHTsp4zBAa+snZyiQNlMONiUmEJcsnaw0wCauJ2GWODr/aFkg== -recast@^0.20.4: - version "0.20.5" - resolved "https://registry.yarnpkg.com/recast/-/recast-0.20.5.tgz#8e2c6c96827a1b339c634dd232957d230553ceae" - integrity sha512-E5qICoPoNL4yU0H0NoBDntNB0Q5oMSNh9usFctYniLBluTthi3RsQVBXIJNbApOlvSwW/RGxIuokPcAc59J5fQ== +recast@^0.21.0: + version "0.21.5" + resolved "https://registry.yarnpkg.com/recast/-/recast-0.21.5.tgz#e8cd22bb51bcd6130e54f87955d33a2b2e57b495" + integrity sha512-hjMmLaUXAm1hIuTqOdeYObMslq/q+Xff6QE3Y2P+uoHAg2nmVlLBps2hzh1UJDdMtDTMXOFewK6ky51JQIeECg== dependencies: - ast-types "0.14.2" + ast-types "0.15.2" esprima "~4.0.0" source-map "~0.6.1" tslib "^2.0.1" From 67e6be06e3198367f793e66d7ccc8f8ca319fda4 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Tue, 17 Oct 2023 18:35:53 +0100 Subject: [PATCH 42/53] Bump Detox from 20.11.0 to 20.11.4 Includes 20.11.2 Xcode 15 compat --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index d5c3ed51582..f18aaa65754 100644 --- a/package.json +++ b/package.json @@ -420,7 +420,7 @@ "browserstack-local": "^1.5.1", "chromedriver": "^99.0.0", "depcheck": "^1.4.5", - "detox": "^20.11.0", + "detox": "^20.11.4", "dotenv": "^16.0.3", "enzyme": "3.9.0", "enzyme-adapter-react-16": "1.10.0", diff --git a/yarn.lock b/yarn.lock index e74899d43be..bcd0bbb8098 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14178,10 +14178,10 @@ detect-node-es@^1.1.0: resolved "https://registry.yarnpkg.com/detect-node-es/-/detect-node-es-1.1.0.tgz#163acdf643330caa0b4cd7c21e7ee7755d6fa493" integrity sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ== -detox@^20.11.0: - version "20.11.0" - resolved "https://registry.yarnpkg.com/detox/-/detox-20.11.0.tgz#f240e01db12334e0706b7f3477e59b8a5e4358c8" - integrity sha512-01LpETlZwfo2V7Awo+5ccUbee7E1lvH3ldLlmXxsx3mQ0pEA65f9CaO+FWhtUGYh7vQRMOQ9SnzYdej/ydQ7iQ== +detox@^20.11.4: + version "20.13.1" + resolved "https://registry.yarnpkg.com/detox/-/detox-20.13.1.tgz#524fc06a1f1a90e515e1f863f169192303446b04" + integrity sha512-lYevoG98YiSLtEA3YubD+/OyTJUIBkO7vgTbokln5cKlWv2g+MEx9nyl8KVZzs1z0rbzsf4r9vv2zNelHtlqVQ== dependencies: ajv "^8.6.3" bunyan "^1.8.12" From 8055db80d90fc64d734ac4fad2677efd66b85d73 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Wed, 18 Oct 2023 15:58:39 +0100 Subject: [PATCH 43/53] Remove unneeded extra spaces in build scripts --- scripts/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index 819360b2c7a..7bba407191e 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -174,12 +174,12 @@ buildIosSimulatorQA(){ buildIosSimulatorE2E(){ prebuild_ios - cd ios && xcodebuild -workspace MetaMask.xcworkspace -scheme MetaMask -configuration Debug -sdk iphonesimulator -derivedDataPath build + cd ios && xcodebuild -workspace MetaMask.xcworkspace -scheme MetaMask -configuration Debug -sdk iphonesimulator -derivedDataPath build } buildIosQASimulatorE2E(){ prebuild_ios - cd ios && xcodebuild -workspace MetaMask.xcworkspace -scheme MetaMask-QA -configuration Debug -sdk iphonesimulator -derivedDataPath build + cd ios && xcodebuild -workspace MetaMask.xcworkspace -scheme MetaMask-QA -configuration Debug -sdk iphonesimulator -derivedDataPath build } runIosE2E(){ @@ -229,7 +229,7 @@ buildIosRelease(){ if [ ! -f "ios/release.xcconfig" ] ; then echo "$IOS_ENV" | tr "|" "\n" > ios/release.xcconfig fi - ./node_modules/.bin/react-native run-ios --configuration Release --simulator "iPhone 12 Pro" + ./node_modules/.bin/react-native run-ios --configuration Release --simulator "iPhone 12 Pro" fi } @@ -274,7 +274,7 @@ buildIosQA(){ if [ ! -f "ios/release.xcconfig" ] ; then echo "$IOS_ENV" | tr "|" "\n" > ios/release.xcconfig fi - ./node_modules/.bin/react-native run-ios --scheme MetaMask-QA --configuration Release --simulator "iPhone 12 Pro" + ./node_modules/.bin/react-native run-ios --scheme MetaMask-QA--configuration Release --simulator "iPhone 12 Pro" fi } From f07951417e88b70582ce04a4a95ce676690e4d98 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Wed, 18 Oct 2023 15:59:19 +0100 Subject: [PATCH 44/53] Bump Detox iOS sim from iPhone 12 Pro to iPhone 13 Pro for Xcode 15 --- .detoxrc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.detoxrc.js b/.detoxrc.js index 5af03d81384..cd296fe3c23 100644 --- a/.detoxrc.js +++ b/.detoxrc.js @@ -56,7 +56,7 @@ module.exports = { 'ios.simulator': { type: 'ios.simulator', device: { - type: 'iPhone 12 Pro', + type: 'iPhone 13 Pro', }, }, 'android.bitrise.emulator': { From 5006b1ad0411cd4814f503616da676f2c12411f6 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Thu, 19 Oct 2023 13:53:54 +0100 Subject: [PATCH 45/53] Update build scripts from iPhone 12 Pro to iPhone 13 Pro And match current Detox sim passing BitRise smoke tests iPhone 13 Pro comes setup ootb on Xcode 15 iPhone 13 is the default launched by RN --- scripts/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index 7bba407191e..e6f486d13b7 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -162,13 +162,13 @@ buildAndroidRunQA(){ buildIosSimulator(){ prebuild_ios - SIM="${IOS_SIMULATOR:-"iPhone 12 Pro"}" + SIM="${IOS_SIMULATOR:-"iPhone 13 Pro"}" react-native run-ios --simulator "$SIM" } buildIosSimulatorQA(){ prebuild_ios - SIM="${IOS_SIMULATOR:-"iPhone 12 Pro"}" + SIM="${IOS_SIMULATOR:-"iPhone 13 Pro"}" react-native run-ios --simulator "$SIM" --scheme "MetaMask-QA" } From c066fc014d19f93dcac7ad5da5f52523001ed73a Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Thu, 19 Oct 2023 14:25:58 +0100 Subject: [PATCH 46/53] Update release build scripts from iPhone 12 Pro to iPhone 13 Pro Follow-up: https://github.com/MetaMask/metamask-mobile/pull/7114/commits/5006b1ad0411cd4814f503616da676f2c12411f6 Despite us not yet running Detox in release mode due to issues --- scripts/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index e6f486d13b7..b544ddb0eaf 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -229,7 +229,7 @@ buildIosRelease(){ if [ ! -f "ios/release.xcconfig" ] ; then echo "$IOS_ENV" | tr "|" "\n" > ios/release.xcconfig fi - ./node_modules/.bin/react-native run-ios --configuration Release --simulator "iPhone 12 Pro" + ./node_modules/.bin/react-native run-ios --configuration Release --simulator "iPhone 13 Pro" fi } @@ -274,7 +274,7 @@ buildIosQA(){ if [ ! -f "ios/release.xcconfig" ] ; then echo "$IOS_ENV" | tr "|" "\n" > ios/release.xcconfig fi - ./node_modules/.bin/react-native run-ios --scheme MetaMask-QA--configuration Release --simulator "iPhone 12 Pro" + ./node_modules/.bin/react-native run-ios --scheme MetaMask-QA--configuration Release --simulator "iPhone 13 Pro" fi } From b5a3f5412730d3fc433e7e209fcaac8b25007412 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Thu, 19 Oct 2023 16:39:56 +0100 Subject: [PATCH 47/53] Update ReadMe iPhone 12 Pro refs to iPhone 13 Pro --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c4307d5427a..26538e28073 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ The code is built using React-Native and running code locally requires a Mac or - [React Native Getting Started - iOS](https://reactnative.dev/docs/environment-setup#installing-dependencies) _(React Native CLI Quickstart -> [your OS] -> iOS)_ - Install the correct simulator - **iOS OS Version:** Latest, unless told otherwise - - **Device:** iPhone 12 Pro + - **Device:** iPhone 13 Pro @@ -237,7 +237,7 @@ Prerequisites for running tests: - Make sure to install `detox-cli` by referring to the instructions mentioned [here](https://wix.github.io/Detox/docs/introduction/getting-started/#detox-prerequisites). - Additionally, install `applesimutils` by following the guidelines provided [here](https://github.com/wix/AppleSimulatorUtils). - Before running any tests, it's recommended to refer to the `iOS section` above and check the latest simulator device specified under `Install the correct simulator`. -- The default device for iOS is the iPhone 12 Pro and Android the Pixel 5. Ensure you have these set up. +- The default device for iOS is the iPhone 13 Pro and Android the Pixel 5. Ensure you have these set up. - Make sure that Metro is running. Use this command to launch the metro server: ```bash From ed91ac6aac33fda5503723a94f292d338f695aab Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Thu, 19 Oct 2023 16:40:36 +0100 Subject: [PATCH 48/53] Update ReadMe Xcode 14.2 to Xcode 15.0 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 26538e28073..55a8d45977a 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ The code is built using React-Native and running code locally requires a Mac or ``` - Install the shared [React Native dependencies](https://reactnative.dev/docs/environment-setup#installing-dependencies) (`React Native CLI`, _not_ `Expo CLI`) - - XCode version `14.2` or below + - XCode version `15.0` or below - Install [cocoapods](https://guides.cocoapods.org/using/getting-started.html) by running: From fbde1379218986883cbf76c5b86ee27a0e5823d6 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Thu, 19 Oct 2023 16:42:41 +0100 Subject: [PATCH 49/53] Update ReadMe Xcode 15.0 to Xcode 15.0.1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 55a8d45977a..a0fc1f4610a 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ The code is built using React-Native and running code locally requires a Mac or ``` - Install the shared [React Native dependencies](https://reactnative.dev/docs/environment-setup#installing-dependencies) (`React Native CLI`, _not_ `Expo CLI`) - - XCode version `15.0` or below + - XCode version `15.0.1` or below - Install [cocoapods](https://guides.cocoapods.org/using/getting-started.html) by running: From 8fbec65ce8f1cd3eea2cc60398e7e51be00c292a Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Wed, 25 Oct 2023 16:38:03 +0100 Subject: [PATCH 50/53] Bump metro devDep from 0.72.3 to 0.73.10 See: https://github.com/MetaMask/metamask-mobile/pull/7114#pullrequestreview-1696481657 --- package.json | 2 +- yarn.lock | 262 --------------------------------------------------- 2 files changed, 1 insertion(+), 263 deletions(-) diff --git a/package.json b/package.json index 6d5f22b7a88..bb767b5c060 100644 --- a/package.json +++ b/package.json @@ -445,7 +445,7 @@ "jetifier": "2.0.0", "koa": "^2.14.2", "lint-staged": "10.5.4", - "metro": "0.72.3", + "metro": "0.73.10", "metro-react-native-babel-preset": "0.73.10", "multiple-cucumber-html-reporter": "^3.0.1", "nock": "^13.3.1", diff --git a/yarn.lock b/yarn.lock index eabda829406..79e8e490a0c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19782,16 +19782,6 @@ metro-babel-transformer@0.71.1: metro-source-map "0.71.1" nullthrows "^1.1.1" -metro-babel-transformer@0.72.3: - version "0.72.3" - resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.72.3.tgz#2c60493a4eb7a8d20cc059f05e0e505dc1684d01" - integrity sha512-PTOR2zww0vJbWeeM3qN90WKENxCLzv9xrwWaNtwVlhcV8/diNdNe82sE1xIxLFI6OQuAVwNMv1Y7VsO2I7Ejrw== - dependencies: - "@babel/core" "^7.14.0" - hermes-parser "0.8.0" - metro-source-map "0.72.3" - nullthrows "^1.1.1" - metro-babel-transformer@0.73.10: version "0.73.10" resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.73.10.tgz#b27732fa3869f397246ee8ecf03b64622ab738c1" @@ -19807,11 +19797,6 @@ metro-cache-key@0.71.1: resolved "https://registry.yarnpkg.com/metro-cache-key/-/metro-cache-key-0.71.1.tgz#932ccdbcda2f785d8b814be3eaaa3d4cd8f84bd9" integrity sha512-xChksd3ygmwNUtrJZ9k34SzswEQ9dAYZyEcU20Wmv85T7bpWvE68TbT8NC0diMuA3p0WvS4YeZOn5VHLpy/ibQ== -metro-cache-key@0.72.3: - version "0.72.3" - resolved "https://registry.yarnpkg.com/metro-cache-key/-/metro-cache-key-0.72.3.tgz#dcc3055b6cb7e35b84b4fe736a148affb4ecc718" - integrity sha512-kQzmF5s3qMlzqkQcDwDxrOaVxJ2Bh6WRXWdzPnnhsq9LcD3B3cYqQbRBS+3tSuXmathb4gsOdhWslOuIsYS8Rg== - metro-cache-key@0.73.10: version "0.73.10" resolved "https://registry.yarnpkg.com/metro-cache-key/-/metro-cache-key-0.73.10.tgz#8d63591187d295b62a80aed64a87864b1e9d67a2" @@ -19825,14 +19810,6 @@ metro-cache@0.71.1: metro-core "0.71.1" rimraf "^2.5.4" -metro-cache@0.72.3: - version "0.72.3" - resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.72.3.tgz#fd079f90b12a81dd5f1567c607c13b14ae282690" - integrity sha512-++eyZzwkXvijWRV3CkDbueaXXGlVzH9GA52QWqTgAOgSHYp5jWaDwLQ8qpsMkQzpwSyIF4LLK9aI3eA7Xa132A== - dependencies: - metro-core "0.72.3" - rimraf "^2.5.4" - metro-cache@0.73.10: version "0.73.10" resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.73.10.tgz#02e9cb7c1e42aab5268d2ecce35ad8f2c08891de" @@ -19853,18 +19830,6 @@ metro-config@0.71.1, metro-config@^0.71.1: metro-core "0.71.1" metro-runtime "0.71.1" -metro-config@0.72.3: - version "0.72.3" - resolved "https://registry.yarnpkg.com/metro-config/-/metro-config-0.72.3.tgz#c2f1a89537c79cec516b1229aa0550dfa769e2ee" - integrity sha512-VEsAIVDkrIhgCByq8HKTWMBjJG6RlYwWSu1Gnv3PpHa0IyTjKJtB7wC02rbTjSaemcr82scldf2R+h6ygMEvsw== - dependencies: - cosmiconfig "^5.0.5" - jest-validate "^26.5.2" - metro "0.72.3" - metro-cache "0.72.3" - metro-core "0.72.3" - metro-runtime "0.72.3" - metro-config@0.73.10: version "0.73.10" resolved "https://registry.yarnpkg.com/metro-config/-/metro-config-0.73.10.tgz#a9ec3d0a1290369e3f46c467a4c4f6dd43acc223" @@ -19885,14 +19850,6 @@ metro-core@0.71.1: lodash.throttle "^4.1.1" metro-resolver "0.71.1" -metro-core@0.72.3: - version "0.72.3" - resolved "https://registry.yarnpkg.com/metro-core/-/metro-core-0.72.3.tgz#e3a276d54ecc8fe667127347a1bfd3f8c0009ccb" - integrity sha512-KuYWBMmLB4+LxSMcZ1dmWabVExNCjZe3KysgoECAIV+wyIc2r4xANq15GhS94xYvX1+RqZrxU1pa0jQ5OK+/6A== - dependencies: - lodash.throttle "^4.1.1" - metro-resolver "0.72.3" - metro-core@0.73.10: version "0.73.10" resolved "https://registry.yarnpkg.com/metro-core/-/metro-core-0.73.10.tgz#feb3c228aa8c0dde71d8e4cef614cc3a1dc3bbd7" @@ -19919,26 +19876,6 @@ metro-file-map@0.71.1: optionalDependencies: fsevents "^2.1.2" -metro-file-map@0.72.3: - version "0.72.3" - resolved "https://registry.yarnpkg.com/metro-file-map/-/metro-file-map-0.72.3.tgz#94f6d4969480aa7f47cfe2c5f365ad4e85051f12" - integrity sha512-LhuRnuZ2i2uxkpFsz1XCDIQSixxBkBG7oICAFyLyEMDGbcfeY6/NexphfLdJLTghkaoJR5ARFMiIxUg9fIY/pA== - dependencies: - abort-controller "^3.0.0" - anymatch "^3.0.3" - debug "^2.2.0" - fb-watchman "^2.0.0" - graceful-fs "^4.2.4" - invariant "^2.2.4" - jest-regex-util "^27.0.6" - jest-serializer "^27.0.6" - jest-util "^27.2.0" - jest-worker "^27.2.0" - micromatch "^4.0.4" - walker "^1.0.7" - optionalDependencies: - fsevents "^2.1.2" - metro-file-map@0.73.10: version "0.73.10" resolved "https://registry.yarnpkg.com/metro-file-map/-/metro-file-map-0.73.10.tgz#55bd906fb7c1bef8e1a31df4b29a3ef4b49f0b5a" @@ -19965,11 +19902,6 @@ metro-hermes-compiler@0.71.1: resolved "https://registry.yarnpkg.com/metro-hermes-compiler/-/metro-hermes-compiler-0.71.1.tgz#d2f19f468efdedd4ce2f205eb22218a17dd09e8f" integrity sha512-A5eCC9KaPxmCz7VjAqDr8JqrHKBd1ZpwUd0gK5gGAOVayIq2Iz7RDAteGOsGK8vj1gRAnBexDTwvR5LrXsr9BA== -metro-hermes-compiler@0.72.3: - version "0.72.3" - resolved "https://registry.yarnpkg.com/metro-hermes-compiler/-/metro-hermes-compiler-0.72.3.tgz#e9ab4d25419eedcc72c73842c8da681a4a7e691e" - integrity sha512-QWDQASMiXNW3j8uIQbzIzCdGYv5PpAX/ZiF4/lTWqKRWuhlkP4auhVY4eqdAKj5syPx45ggpjkVE0p8hAPDZYg== - metro-hermes-compiler@0.73.10: version "0.73.10" resolved "https://registry.yarnpkg.com/metro-hermes-compiler/-/metro-hermes-compiler-0.73.10.tgz#4525a7835c803a5d0b3b05c6619202e2273d630f" @@ -19985,16 +19917,6 @@ metro-inspector-proxy@0.71.1: ws "^7.5.1" yargs "^15.3.1" -metro-inspector-proxy@0.72.3: - version "0.72.3" - resolved "https://registry.yarnpkg.com/metro-inspector-proxy/-/metro-inspector-proxy-0.72.3.tgz#8d7ff4240fc414af5b72d86dac2485647fc3cf09" - integrity sha512-UPFkaq2k93RaOi+eqqt7UUmqy2ywCkuxJLasQ55+xavTUS+TQSyeTnTczaYn+YKw+izLTLllGcvqnQcZiWYhGw== - dependencies: - connect "^3.6.5" - debug "^2.2.0" - ws "^7.5.1" - yargs "^15.3.1" - metro-inspector-proxy@0.73.10: version "0.73.10" resolved "https://registry.yarnpkg.com/metro-inspector-proxy/-/metro-inspector-proxy-0.73.10.tgz#752fed2ab88199c9dcc3369c3d59da6c5b954a51" @@ -20019,13 +19941,6 @@ metro-minify-uglify@0.71.1: dependencies: uglify-es "^3.1.9" -metro-minify-uglify@0.72.3: - version "0.72.3" - resolved "https://registry.yarnpkg.com/metro-minify-uglify/-/metro-minify-uglify-0.72.3.tgz#a9d4cd27933b29cfe95d8406b40d185567a93d39" - integrity sha512-dPXqtMI8TQcj0g7ZrdhC8X3mx3m3rtjtMuHKGIiEXH9CMBvrET8IwrgujQw2rkPcXiSiX8vFDbGMIlfxefDsKA== - dependencies: - uglify-es "^3.1.9" - metro-minify-uglify@0.73.10: version "0.73.10" resolved "https://registry.yarnpkg.com/metro-minify-uglify/-/metro-minify-uglify-0.73.10.tgz#4de79056d502479733854c90f2075374353ea154" @@ -20078,51 +19993,6 @@ metro-react-native-babel-preset@0.71.1: "@babel/template" "^7.0.0" react-refresh "^0.4.0" -metro-react-native-babel-preset@0.72.3: - version "0.72.3" - resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.72.3.tgz#e549199fa310fef34364fdf19bd210afd0c89432" - integrity sha512-uJx9y/1NIqoYTp6ZW1osJ7U5ZrXGAJbOQ/Qzl05BdGYvN1S7Qmbzid6xOirgK0EIT0pJKEEh1s8qbassYZe4cw== - dependencies: - "@babel/core" "^7.14.0" - "@babel/plugin-proposal-async-generator-functions" "^7.0.0" - "@babel/plugin-proposal-class-properties" "^7.0.0" - "@babel/plugin-proposal-export-default-from" "^7.0.0" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.0.0" - "@babel/plugin-proposal-object-rest-spread" "^7.0.0" - "@babel/plugin-proposal-optional-catch-binding" "^7.0.0" - "@babel/plugin-proposal-optional-chaining" "^7.0.0" - "@babel/plugin-syntax-dynamic-import" "^7.0.0" - "@babel/plugin-syntax-export-default-from" "^7.0.0" - "@babel/plugin-syntax-flow" "^7.2.0" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.0.0" - "@babel/plugin-syntax-optional-chaining" "^7.0.0" - "@babel/plugin-transform-arrow-functions" "^7.0.0" - "@babel/plugin-transform-async-to-generator" "^7.0.0" - "@babel/plugin-transform-block-scoping" "^7.0.0" - "@babel/plugin-transform-classes" "^7.0.0" - "@babel/plugin-transform-computed-properties" "^7.0.0" - "@babel/plugin-transform-destructuring" "^7.0.0" - "@babel/plugin-transform-exponentiation-operator" "^7.0.0" - "@babel/plugin-transform-flow-strip-types" "^7.0.0" - "@babel/plugin-transform-function-name" "^7.0.0" - "@babel/plugin-transform-literals" "^7.0.0" - "@babel/plugin-transform-modules-commonjs" "^7.0.0" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.0.0" - "@babel/plugin-transform-parameters" "^7.0.0" - "@babel/plugin-transform-react-display-name" "^7.0.0" - "@babel/plugin-transform-react-jsx" "^7.0.0" - "@babel/plugin-transform-react-jsx-self" "^7.0.0" - "@babel/plugin-transform-react-jsx-source" "^7.0.0" - "@babel/plugin-transform-runtime" "^7.0.0" - "@babel/plugin-transform-shorthand-properties" "^7.0.0" - "@babel/plugin-transform-spread" "^7.0.0" - "@babel/plugin-transform-sticky-regex" "^7.0.0" - "@babel/plugin-transform-template-literals" "^7.0.0" - "@babel/plugin-transform-typescript" "^7.5.0" - "@babel/plugin-transform-unicode-regex" "^7.0.0" - "@babel/template" "^7.0.0" - react-refresh "^0.4.0" - metro-react-native-babel-preset@0.73.10: version "0.73.10" resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.73.10.tgz#304b24bb391537d2c987732cc0a9774be227d3f6" @@ -20187,13 +20057,6 @@ metro-resolver@0.71.1: dependencies: absolute-path "^0.0.0" -metro-resolver@0.72.3: - version "0.72.3" - resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.72.3.tgz#c64ce160454ac850a15431509f54a587cb006540" - integrity sha512-wu9zSMGdxpKmfECE7FtCdpfC+vrWGTdVr57lDA0piKhZV6VN6acZIvqQ1yZKtS2WfKsngncv5VbB8Y5eHRQP3w== - dependencies: - absolute-path "^0.0.0" - metro-resolver@0.73.10: version "0.73.10" resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.73.10.tgz#c39a3bd8d33e5d78cb256110d29707d8d49ed0be" @@ -20208,14 +20071,6 @@ metro-runtime@0.71.1: dependencies: "@babel/runtime" "^7.0.0" -metro-runtime@0.72.3: - version "0.72.3" - resolved "https://registry.yarnpkg.com/metro-runtime/-/metro-runtime-0.72.3.tgz#1485ed7b5f06d09ebb40c83efcf8accc8d30b8b9" - integrity sha512-3MhvDKfxMg2u7dmTdpFOfdR71NgNNo4tzAyJumDVQKwnHYHN44f2QFZQqpPBEmqhWlojNeOxsqFsjYgeyMx6VA== - dependencies: - "@babel/runtime" "^7.0.0" - react-refresh "^0.4.0" - metro-runtime@0.73.10: version "0.73.10" resolved "https://registry.yarnpkg.com/metro-runtime/-/metro-runtime-0.73.10.tgz#c3de19d17e75ffe1a145778d99422e7ffc208768" @@ -20238,20 +20093,6 @@ metro-source-map@0.71.1: source-map "^0.5.6" vlq "^1.0.0" -metro-source-map@0.72.3: - version "0.72.3" - resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.72.3.tgz#5efcf354413804a62ff97864e797f60ef3cc689e" - integrity sha512-eNtpjbjxSheXu/jYCIDrbNEKzMGOvYW6/ePYpRM7gDdEagUOqKOCsi3St8NJIQJzZCsxD2JZ2pYOiomUSkT1yQ== - dependencies: - "@babel/traverse" "^7.14.0" - "@babel/types" "^7.0.0" - invariant "^2.2.4" - metro-symbolicate "0.72.3" - nullthrows "^1.1.1" - ob1 "0.72.3" - source-map "^0.5.6" - vlq "^1.0.0" - metro-source-map@0.73.10: version "0.73.10" resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.73.10.tgz#28e09a28f1a2f7a4f8d0845b845cbed74e2f48f9" @@ -20278,18 +20119,6 @@ metro-symbolicate@0.71.1: through2 "^2.0.1" vlq "^1.0.0" -metro-symbolicate@0.72.3: - version "0.72.3" - resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.72.3.tgz#093d4f8c7957bcad9ca2ab2047caa90b1ee1b0c1" - integrity sha512-eXG0NX2PJzJ/jTG4q5yyYeN2dr1cUqUaY7worBB0SP5bRWRc3besfb+rXwfh49wTFiL5qR0oOawkU4ZiD4eHXw== - dependencies: - invariant "^2.2.4" - metro-source-map "0.72.3" - nullthrows "^1.1.1" - source-map "^0.5.6" - through2 "^2.0.1" - vlq "^1.0.0" - metro-symbolicate@0.73.10: version "0.73.10" resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.73.10.tgz#7853a9a8fbfd615a5c9db698fffc685441ac880f" @@ -20313,17 +20142,6 @@ metro-transform-plugins@0.71.1: "@babel/traverse" "^7.14.0" nullthrows "^1.1.1" -metro-transform-plugins@0.72.3: - version "0.72.3" - resolved "https://registry.yarnpkg.com/metro-transform-plugins/-/metro-transform-plugins-0.72.3.tgz#b00e5a9f24bff7434ea7a8e9108eebc8386b9ee4" - integrity sha512-D+TcUvCKZbRua1+qujE0wV1onZvslW6cVTs7dLCyC2pv20lNHjFr1GtW01jN2fyKR2PcRyMjDCppFd9VwDKnSg== - dependencies: - "@babel/core" "^7.14.0" - "@babel/generator" "^7.14.0" - "@babel/template" "^7.0.0" - "@babel/traverse" "^7.14.0" - nullthrows "^1.1.1" - metro-transform-plugins@0.73.10: version "0.73.10" resolved "https://registry.yarnpkg.com/metro-transform-plugins/-/metro-transform-plugins-0.73.10.tgz#1b762330cbbedb6c18438edc3d76b063c88882af" @@ -20354,25 +20172,6 @@ metro-transform-worker@0.71.1: metro-transform-plugins "0.71.1" nullthrows "^1.1.1" -metro-transform-worker@0.72.3: - version "0.72.3" - resolved "https://registry.yarnpkg.com/metro-transform-worker/-/metro-transform-worker-0.72.3.tgz#bdc6cc708ea114bc085e11d675b8ff626d7e6db7" - integrity sha512-WsuWj9H7i6cHuJuy+BgbWht9DK5FOgJxHLGAyULD5FJdTG9rSMFaHDO5WfC0OwQU5h4w6cPT40iDuEGksM7+YQ== - dependencies: - "@babel/core" "^7.14.0" - "@babel/generator" "^7.14.0" - "@babel/parser" "^7.14.0" - "@babel/types" "^7.0.0" - babel-preset-fbjs "^3.4.0" - metro "0.72.3" - metro-babel-transformer "0.72.3" - metro-cache "0.72.3" - metro-cache-key "0.72.3" - metro-hermes-compiler "0.72.3" - metro-source-map "0.72.3" - metro-transform-plugins "0.72.3" - nullthrows "^1.1.1" - metro-transform-worker@0.73.10: version "0.73.10" resolved "https://registry.yarnpkg.com/metro-transform-worker/-/metro-transform-worker-0.73.10.tgz#bb401dbd7b10a6fe443a5f7970cba38425efece0" @@ -20448,62 +20247,6 @@ metro@0.71.1: ws "^7.5.1" yargs "^15.3.1" -metro@0.72.3: - version "0.72.3" - resolved "https://registry.yarnpkg.com/metro/-/metro-0.72.3.tgz#eb587037d62f48a0c33c8d88f26666b4083bb61e" - integrity sha512-Hb3xTvPqex8kJ1hutQNZhQadUKUwmns/Du9GikmWKBFrkiG3k3xstGAyO5t5rN9JSUEzQT6y9SWzSSOGogUKIg== - dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/core" "^7.14.0" - "@babel/generator" "^7.14.0" - "@babel/parser" "^7.14.0" - "@babel/template" "^7.0.0" - "@babel/traverse" "^7.14.0" - "@babel/types" "^7.0.0" - absolute-path "^0.0.0" - accepts "^1.3.7" - async "^3.2.2" - chalk "^4.0.0" - ci-info "^2.0.0" - connect "^3.6.5" - debug "^2.2.0" - denodeify "^1.2.1" - error-stack-parser "^2.0.6" - fs-extra "^1.0.0" - graceful-fs "^4.2.4" - hermes-parser "0.8.0" - image-size "^0.6.0" - invariant "^2.2.4" - jest-worker "^27.2.0" - lodash.throttle "^4.1.1" - metro-babel-transformer "0.72.3" - metro-cache "0.72.3" - metro-cache-key "0.72.3" - metro-config "0.72.3" - metro-core "0.72.3" - metro-file-map "0.72.3" - metro-hermes-compiler "0.72.3" - metro-inspector-proxy "0.72.3" - metro-minify-uglify "0.72.3" - metro-react-native-babel-preset "0.72.3" - metro-resolver "0.72.3" - metro-runtime "0.72.3" - metro-source-map "0.72.3" - metro-symbolicate "0.72.3" - metro-transform-plugins "0.72.3" - metro-transform-worker "0.72.3" - mime-types "^2.1.27" - node-fetch "^2.2.0" - nullthrows "^1.1.1" - rimraf "^2.5.4" - serialize-error "^2.1.0" - source-map "^0.5.6" - strip-ansi "^6.0.0" - temp "0.8.3" - throat "^5.0.0" - ws "^7.5.1" - yargs "^15.3.1" - metro@0.73.10: version "0.73.10" resolved "https://registry.yarnpkg.com/metro/-/metro-0.73.10.tgz#d9a0efb1e403e3aee5cf5140e0a96a7220c23901" @@ -21522,11 +21265,6 @@ ob1@0.71.1: resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.71.1.tgz#e70aa35e19e13e64ff4027066c06acee50d98362" integrity sha512-Tb8dhat5XmFNJ3zx0EkDQuqOGA5glo70c1mj58ifDDZqKyac86wKocY++RA8a5bCkeuyGhKGO5kTxbAjyVyurQ== -ob1@0.72.3: - version "0.72.3" - resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.72.3.tgz#fc1efcfe156f12ed23615f2465a796faad8b91e4" - integrity sha512-OnVto25Sj7Ghp0vVm2THsngdze3tVq0LOg9LUHsAVXMecpqOP0Y8zaATW8M9gEgs2lNEAcCqV0P/hlmOPhVRvg== - ob1@0.73.10: version "0.73.10" resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.73.10.tgz#bf0a2e8922bb8687ddca82327c5cf209414a1bd4" From 44da518336c9d8e2dfaac27e6cdbbc67211e63a3 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Wed, 25 Oct 2023 16:52:04 +0100 Subject: [PATCH 51/53] Remove stale Device util static method isIphone12 Tech debt: Device.isIphone12 is unused --- app/util/device/index.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/util/device/index.js b/app/util/device/index.js index 2054c473856..ace28980ae8 100644 --- a/app/util/device/index.js +++ b/app/util/device/index.js @@ -86,12 +86,6 @@ export default class Device { return this.getDeviceHeight() > 736; } - static isIphone12() { - const model = getModel(); - const models = ['iPhone 12', 'iPhone 12 Pro', 'iPhone 12 Pro Max']; - return models.includes(model); - } - static hasNotch() { return hasNotch(); } From 8e5c7d5fabb7b67b8ff9f7de8a7f43704c75314d Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Wed, 25 Oct 2023 16:57:36 +0100 Subject: [PATCH 52/53] Bump Browserstack iPhone 12 Pro devices to iPhone 13 Pro --- wdio/config/ios.config.browserstack.js | 2 +- wdio/config/ios.config.browserstack.local.js | 2 +- wdio/config/ios.config.debug.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wdio/config/ios.config.browserstack.js b/wdio/config/ios.config.browserstack.js index 96c1657454c..297ca462ab4 100644 --- a/wdio/config/ios.config.browserstack.js +++ b/wdio/config/ios.config.browserstack.js @@ -9,7 +9,7 @@ config.capabilities = [ fullReset: false, maxInstances: 1, automationName: 'XCUITest', - deviceName: 'iPhone 12 Pro', + deviceName: 'iPhone 13 Pro', platformVersion: '15.5', app: './ios/build/Build/Products/Release-iphonesimulator/MetaMask-QA.app', settings: { diff --git a/wdio/config/ios.config.browserstack.local.js b/wdio/config/ios.config.browserstack.local.js index 0c66dd5dc11..65e34453f0a 100644 --- a/wdio/config/ios.config.browserstack.local.js +++ b/wdio/config/ios.config.browserstack.local.js @@ -17,7 +17,7 @@ config.capabilities = [ maxInstances: 1, build: 'iOS QA E2E Tests', automationName: 'XCUITest', - deviceName: 'iPhone 12 Pro', + deviceName: 'iPhone 13 Pro', platformVersion: '16', app: process.env.BROWSERSTACK_APP_URL, // TODO: Add package ID when upload to BrowserStack 'browserstack.debug': true, diff --git a/wdio/config/ios.config.debug.js b/wdio/config/ios.config.debug.js index 41fdb5bea20..46063520ca4 100644 --- a/wdio/config/ios.config.debug.js +++ b/wdio/config/ios.config.debug.js @@ -9,7 +9,7 @@ config.capabilities = [ fullReset: false, maxInstances: 1, automationName: 'XCUITest', - deviceName: 'iPhone 12 Pro', + deviceName: 'iPhone 13 Pro', platformVersion: '15.5', app: './ios/build/Build/Products/Debug-iphonesimulator/MetaMask-QA.app', settings: { From c6bbee3eed3a393cffbb0a8f3fc0934f5d6d66c3 Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Wed, 25 Oct 2023 17:22:06 +0100 Subject: [PATCH 53/53] Fix lint error remove unused var --- app/util/device/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util/device/index.js b/app/util/device/index.js index ace28980ae8..df04b68a24d 100644 --- a/app/util/device/index.js +++ b/app/util/device/index.js @@ -1,7 +1,7 @@ 'use strict'; import { Dimensions, Platform } from 'react-native'; -import { getModel, hasNotch, getApiLevel } from 'react-native-device-info'; +import { hasNotch, getApiLevel } from 'react-native-device-info'; export default class Device { static getDeviceWidth() {