From efd5760e03f4bc713d71e5f35ca343c83604ee29 Mon Sep 17 00:00:00 2001 From: Alex Hoffer Date: Thu, 21 Mar 2024 15:08:20 -0700 Subject: [PATCH 1/9] update packages --- nextjs/package.json | 2 +- react/README.md | 6 +-- react/package.json | 4 +- react_native/README.md | 4 +- .../TinyQuickstartReactNative/.node-version | 2 +- react_native/TinyQuickstartReactNative/.nvmrc | 2 +- .../TinyQuickstartReactNative/.ruby-version | 2 +- .../TinyQuickstartReactNative/Gemfile | 2 +- .../TinyQuickstartReactNative/package.json | 4 +- vanilla_js/package.json | 2 +- vanilla_js/server.js | 46 +++++++++++++++++-- vanilla_typescript/package.json | 2 +- 12 files changed, 59 insertions(+), 19 deletions(-) diff --git a/nextjs/package.json b/nextjs/package.json index e7cebd7..4cd2c50 100644 --- a/nextjs/package.json +++ b/nextjs/package.json @@ -3,7 +3,7 @@ "dependencies": { "iron-session": "^6.1.3", "next": "^12.2.4", - "plaid": "^10.9.0", + "plaid": "^21.0.0", "react": "^18.2.0", "react-dom": "^18.2.0", "react-plaid-link": "^3.3.0" diff --git a/react/README.md b/react/README.md index 8ff58c5..9629040 100644 --- a/react/README.md +++ b/react/README.md @@ -8,14 +8,14 @@ If you're looking for a more fully-featured quickstart, covering more API endpoi #### Set up your environment -This app uses Node 16 and should work with recent versions of Node. You can use a tool such as [nvm](https://github.com/nvm-sh/nvm) to make sure the app uses your desired version of Node. For information on installing Node, see [How to install Node.js](https://nodejs.dev/learn/how-to-install-nodejs). +This app uses Node 20 and should work with recent versions of Node. You can use a tool such as [nvm](https://github.com/nvm-sh/nvm) to make sure the app uses the target version of Node. For information on installing Node, see [How to install Node.js](https://nodejs.dev/learn/how-to-install-nodejs). #### Install dependencies Ensure you're in the **react/** folder, then install the necessary dependencies: ```bash -yarn install +npm install ``` #### Equip the app with credentials @@ -31,7 +31,7 @@ Fill out the contents of the **.env** file with the [client ID and Sandbox secre #### Start the server ```bash -yarn start +npm start ``` The app will run on port 3000 and will hot-reload if you make edits. diff --git a/react/package.json b/react/package.json index 243e955..4cf4312 100644 --- a/react/package.json +++ b/react/package.json @@ -7,7 +7,7 @@ "express": "^4.17.1", "express-session": "^1.17.2", "npm-run-all": "^4.1.5", - "plaid": "^9.0.0-beta.11", + "plaid": "^21.0.0", "react": "^18.2.0", "react-dom": "^18.2.0", "react-plaid-link": "^3.5.1", @@ -41,7 +41,7 @@ }, "proxy": "http://localhost:8080", "devDependencies": { - "nodemon": "^2.0.7", + "nodemon": "^3.1.0", "npm-run-all": "^4.1.5", "sass": "^1.49.9" }, diff --git a/react_native/README.md b/react_native/README.md index 9bce65e..b459a95 100644 --- a/react_native/README.md +++ b/react_native/README.md @@ -16,7 +16,7 @@ Follow the environment setup instructions found in the official React Native doc #### Install dependencies -Ensure your Node version is >= 16.14.0. Next, run `npm install` in the **TinyQuickstartReactNative/** folder. +Ensure you're using Node 20; you can run `nvm use` to make sure you are using a compatible version of Node for this project. Next, run `npm install` in the **TinyQuickstartReactNative/** folder. Navigate to the **ios/** folder and run `pod install` to install all necessary iOS dependencies. @@ -99,4 +99,4 @@ To observe OAuth in action, type "oauth" into the search bar when prompted to se * Wipe all data from the Android emulator. First, quit the Android emulator. Next, open Android studio. In the "Device Manager", wipe data from the corresponding device/emulator by expanding the menu under "Actions" and clicking "Wipe Data". Restart the emulator and rebuild the app using `npx react-native run-android`. -![Android Studio wipe data](./android-studio-wipe-data.png) \ No newline at end of file +![Android Studio wipe data](./android-studio-wipe-data.png) diff --git a/react_native/TinyQuickstartReactNative/.node-version b/react_native/TinyQuickstartReactNative/.node-version index b6a7d89..209e3ef 100644 --- a/react_native/TinyQuickstartReactNative/.node-version +++ b/react_native/TinyQuickstartReactNative/.node-version @@ -1 +1 @@ -16 +20 diff --git a/react_native/TinyQuickstartReactNative/.nvmrc b/react_native/TinyQuickstartReactNative/.nvmrc index bf79505..ee09fac 100644 --- a/react_native/TinyQuickstartReactNative/.nvmrc +++ b/react_native/TinyQuickstartReactNative/.nvmrc @@ -1 +1 @@ -v16.14.0 +v20.11.1 diff --git a/react_native/TinyQuickstartReactNative/.ruby-version b/react_native/TinyQuickstartReactNative/.ruby-version index a603bb5..eb39e53 100644 --- a/react_native/TinyQuickstartReactNative/.ruby-version +++ b/react_native/TinyQuickstartReactNative/.ruby-version @@ -1 +1 @@ -2.7.5 +3.3 diff --git a/react_native/TinyQuickstartReactNative/Gemfile b/react_native/TinyQuickstartReactNative/Gemfile index 5efda89..9687b47 100644 --- a/react_native/TinyQuickstartReactNative/Gemfile +++ b/react_native/TinyQuickstartReactNative/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version -ruby '2.7.5' +ruby '3.3' gem 'cocoapods', '~> 1.11', '>= 1.11.2' diff --git a/react_native/TinyQuickstartReactNative/package.json b/react_native/TinyQuickstartReactNative/package.json index e615914..36be323 100644 --- a/react_native/TinyQuickstartReactNative/package.json +++ b/react_native/TinyQuickstartReactNative/package.json @@ -3,7 +3,7 @@ "version": "0.0.1", "private": true, "engines": { - "node": "^16.14.0" + "node": "^20.11.1" }, "scripts": { "android": "react-native run-android", @@ -22,7 +22,7 @@ "dotenv": "^16.0.3", "express": "^4.18.1", "express-session": "^1.17.3", - "plaid": "^11.0.0", + "plaid": "^21.0.0", "react": "18.2.0", "react-native": "0.71.14", "react-native-gesture-handler": "^2.7.0", diff --git a/vanilla_js/package.json b/vanilla_js/package.json index 09faa36..9ed2883 100644 --- a/vanilla_js/package.json +++ b/vanilla_js/package.json @@ -15,6 +15,6 @@ "express": "^4.17.2", "express-session": "^1.17.2", "path": "^0.12.7", - "plaid": "^9.10.0" + "plaid": "^12.4.0" } } diff --git a/vanilla_js/server.js b/vanilla_js/server.js index 23bcdc1..53d8b31 100644 --- a/vanilla_js/server.js +++ b/vanilla_js/server.js @@ -49,7 +49,7 @@ app.get("/api/create_link_token", async (req, res, next) => { user: { client_user_id: req.sessionID }, client_name: "Plaid's Tiny Quickstart", language: "en", - products: ["auth"], + products: ["identity"], country_codes: ["US"], redirect_uri: process.env.PLAID_SANDBOX_REDIRECT_URI, }); @@ -58,6 +58,7 @@ app.get("/api/create_link_token", async (req, res, next) => { // Exchanges the public token from Plaid Link for an access token app.post("/api/exchange_public_token", async (req, res, next) => { + console.log(req.body.public_token) const exchangeResponse = await client.itemPublicTokenExchange({ public_token: req.body.public_token, }); @@ -71,9 +72,48 @@ app.post("/api/exchange_public_token", async (req, res, next) => { // Fetches balance data using the Node client library for Plaid app.get("/api/data", async (req, res, next) => { const access_token = req.session.access_token; - const balanceResponse = await client.accountsBalanceGet({ access_token }); + console.log(access_token); + const user = { + name: 'jane', + phone: '857-488-7937', + email: 'jane.doe@gmail.com', + address: { + city: 'new haven', + region: 'ct', + street: '183 bishop st', + country: 'us', + zip: '06511' + } + } + console.log(user); + const identityMatchResponse = await client.identityMatch({ + access_token: access_token, + user: { + legal_name: user.name, + phone_number: user.phone, + email_address: user.email, + address: { + city: user.address.city, + region: user.address.state, + street: user.address.street, + postal_code: user.address.zip, + country: user.address.country + } + } + }); + console.log(identityMatchResponse.data); + const account = identityMatchResponse.data.accounts[0]; + const scores = { + 'name': account.legal_name.score, + 'phone': account.phone_number.score, + 'email': account.email_address.score, + 'address': account.address.score + }; + console.log(scores) + //const balanceResponse = await client.accountsBalanceGet({ access_token }); res.json({ - Balance: balanceResponse.data, + Balance: identityMatchResponse.data, + //Balance: balanceResponse.data, }); }); diff --git a/vanilla_typescript/package.json b/vanilla_typescript/package.json index cdbea27..6afd338 100644 --- a/vanilla_typescript/package.json +++ b/vanilla_typescript/package.json @@ -25,7 +25,7 @@ "express": "^4.18.2", "express-session": "^1.17.3", "path": "^0.12.7", - "plaid": "^16.0.0", + "plaid": "^21.0.0", "ts-node": "^10.9.1" } } From a183c26c2cef6a32406bfb6390d128332cb16e7c Mon Sep 17 00:00:00 2001 From: Alex Hoffer Date: Thu, 21 Mar 2024 15:11:41 -0700 Subject: [PATCH 2/9] undo mistaken update and update package.json --- vanilla_js/package.json | 2 +- vanilla_js/server.js | 46 +++-------------------------------------- 2 files changed, 4 insertions(+), 44 deletions(-) diff --git a/vanilla_js/package.json b/vanilla_js/package.json index 9ed2883..5738a51 100644 --- a/vanilla_js/package.json +++ b/vanilla_js/package.json @@ -15,6 +15,6 @@ "express": "^4.17.2", "express-session": "^1.17.2", "path": "^0.12.7", - "plaid": "^12.4.0" + "plaid": "^21.0.0" } } diff --git a/vanilla_js/server.js b/vanilla_js/server.js index 53d8b31..23bcdc1 100644 --- a/vanilla_js/server.js +++ b/vanilla_js/server.js @@ -49,7 +49,7 @@ app.get("/api/create_link_token", async (req, res, next) => { user: { client_user_id: req.sessionID }, client_name: "Plaid's Tiny Quickstart", language: "en", - products: ["identity"], + products: ["auth"], country_codes: ["US"], redirect_uri: process.env.PLAID_SANDBOX_REDIRECT_URI, }); @@ -58,7 +58,6 @@ app.get("/api/create_link_token", async (req, res, next) => { // Exchanges the public token from Plaid Link for an access token app.post("/api/exchange_public_token", async (req, res, next) => { - console.log(req.body.public_token) const exchangeResponse = await client.itemPublicTokenExchange({ public_token: req.body.public_token, }); @@ -72,48 +71,9 @@ app.post("/api/exchange_public_token", async (req, res, next) => { // Fetches balance data using the Node client library for Plaid app.get("/api/data", async (req, res, next) => { const access_token = req.session.access_token; - console.log(access_token); - const user = { - name: 'jane', - phone: '857-488-7937', - email: 'jane.doe@gmail.com', - address: { - city: 'new haven', - region: 'ct', - street: '183 bishop st', - country: 'us', - zip: '06511' - } - } - console.log(user); - const identityMatchResponse = await client.identityMatch({ - access_token: access_token, - user: { - legal_name: user.name, - phone_number: user.phone, - email_address: user.email, - address: { - city: user.address.city, - region: user.address.state, - street: user.address.street, - postal_code: user.address.zip, - country: user.address.country - } - } - }); - console.log(identityMatchResponse.data); - const account = identityMatchResponse.data.accounts[0]; - const scores = { - 'name': account.legal_name.score, - 'phone': account.phone_number.score, - 'email': account.email_address.score, - 'address': account.address.score - }; - console.log(scores) - //const balanceResponse = await client.accountsBalanceGet({ access_token }); + const balanceResponse = await client.accountsBalanceGet({ access_token }); res.json({ - Balance: identityMatchResponse.data, - //Balance: balanceResponse.data, + Balance: balanceResponse.data, }); }); From 630866a90edeab8872bc2ccb696db00d905713f8 Mon Sep 17 00:00:00 2001 From: Alex Hoffer Date: Fri, 22 Mar 2024 11:57:21 -0700 Subject: [PATCH 3/9] update deps and attempt to work around https://github.com/facebook/react-native/issues/43335 --- react_native/README.md | 2 ++ .../TinyQuickstartReactNative/.ruby-version | 2 +- .../ios/Podfile.lock | 20 +++++++++---------- .../TinyQuickstartReactNative/package.json | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/react_native/README.md b/react_native/README.md index b459a95..47f7ce6 100644 --- a/react_native/README.md +++ b/react_native/README.md @@ -20,6 +20,8 @@ Ensure you're using Node 20; you can run `nvm use` to make sure you are using a Navigate to the **ios/** folder and run `pod install` to install all necessary iOS dependencies. +If `pod install` fails, you may need to first install the required version of Ruby and/or cocoapods. You can use `rbenv` to manage your Ruby version and then `rbenv install 3.3.0`. To install cocoapods, run `sudo gem install cocoapods`. + #### Equip the app with API credentials Copy the contents of **.env.example** to a new file called **.env**: diff --git a/react_native/TinyQuickstartReactNative/.ruby-version b/react_native/TinyQuickstartReactNative/.ruby-version index eb39e53..15a2799 100644 --- a/react_native/TinyQuickstartReactNative/.ruby-version +++ b/react_native/TinyQuickstartReactNative/.ruby-version @@ -1 +1 @@ -3.3 +3.3.0 diff --git a/react_native/TinyQuickstartReactNative/ios/Podfile.lock b/react_native/TinyQuickstartReactNative/ios/Podfile.lock index a244cb2..d1cc6e9 100644 --- a/react_native/TinyQuickstartReactNative/ios/Podfile.lock +++ b/react_native/TinyQuickstartReactNative/ios/Podfile.lock @@ -78,7 +78,7 @@ PODS: - hermes-engine/Pre-built (0.71.14) - libevent (2.1.12) - OpenSSL-Universal (1.1.1100) - - Plaid (5.0.0) + - Plaid (5.3.1) - RCT-Folly (2021.07.22.00): - boost - DoubleConversion @@ -330,10 +330,10 @@ PODS: - React-jsinspector (0.71.14) - React-logger (0.71.14): - glog - - react-native-plaid-link-sdk (11.0.3): - - Plaid (~> 5.0.0) + - react-native-plaid-link-sdk (11.6.0): + - Plaid (~> 5.3.1) - React-Core - - react-native-safe-area-context (4.8.2): + - react-native-safe-area-context (4.9.0): - React-Core - React-perflogger (0.71.14) - React-RCTActionSheet (0.71.14): @@ -421,7 +421,7 @@ PODS: - React-perflogger (= 0.71.14) - RNCClipboard (1.5.1): - React-Core - - RNGestureHandler (2.14.0): + - RNGestureHandler (2.15.0): - RCT-Folly (= 2021.07.22.00) - React-Core - RNScreens (3.29.0): @@ -617,7 +617,7 @@ SPEC CHECKSUMS: hermes-engine: d7cc127932c89c53374452d6f93473f1970d8e88 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c - Plaid: c5da02bbacd3065116e52d2e0405c2718e34917e + Plaid: d6a4901b2474faac2f7c7871cdabcf916c444fb4 RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 RCTRequired: e9df143e880d0e879e7a498dc06923d728809c79 RCTTypeSafety: c2d89c8308829c12c038ec1f431191eaa0d8c15c @@ -632,8 +632,8 @@ SPEC CHECKSUMS: React-jsiexecutor: 94cfc1788637ceaf8841ef1f69b10cc0d62baadc React-jsinspector: 7bf923954b4e035f494b01ac16633963412660d7 React-logger: 655ff5db8bd922acfbe76a4983ffab048916343e - react-native-plaid-link-sdk: 54173417f7fa05746b19435dc500f7b90d9efe3a - react-native-safe-area-context: 0ee144a6170530ccc37a0fd9388e28d06f516a89 + react-native-plaid-link-sdk: 3f208a472b285df6f8479a8373b87c3eabba3db0 + react-native-safe-area-context: b97eb6f9e3b7f437806c2ce5983f479f8eb5de4b React-perflogger: 4987ad83731c23d11813c84263963b0d3028c966 React-RCTActionSheet: 5ad952b2a9740d87a5bd77280c4bc23f6f89ea0c React-RCTAnimation: d2de22af3f536cc80bb5b3918e1a455114d1b985 @@ -648,7 +648,7 @@ SPEC CHECKSUMS: React-runtimeexecutor: ffe826b7b1cfbc32a35ed5b64d5886c0ff75f501 ReactCommon: 7f3dd5e98a9ec627c6b03d26c062bf37ea9fc888 RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495 - RNGestureHandler: 32a01c29ecc9bb0b5bf7bc0a33547f61b4dc2741 + RNGestureHandler: 7909c50383a18f0cb10ce1db7262b9a6da504c03 RNScreens: 3c5b9f4a9dcde752466854b6109b79c0e205dad3 SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 Yoga: e71803b4c1fff832ccf9b92541e00f9b873119b9 @@ -656,4 +656,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 0193b0b19825d171dbeef902b7c5a24c23c2f3f8 -COCOAPODS: 1.14.3 +COCOAPODS: 1.15.2 diff --git a/react_native/TinyQuickstartReactNative/package.json b/react_native/TinyQuickstartReactNative/package.json index 36be323..1c2a882 100644 --- a/react_native/TinyQuickstartReactNative/package.json +++ b/react_native/TinyQuickstartReactNative/package.json @@ -24,7 +24,7 @@ "express-session": "^1.17.3", "plaid": "^21.0.0", "react": "18.2.0", - "react-native": "0.71.14", + "react-native": "0.73.6", "react-native-gesture-handler": "^2.7.0", "react-native-plaid-link-sdk": "^11.0.3", "react-native-safe-area-context": "^4.4.1", From c1a885d2ece54b6980f829d2b14f6f4ad040977e Mon Sep 17 00:00:00 2001 From: Alex Hoffer Date: Fri, 22 Mar 2024 14:34:06 -0700 Subject: [PATCH 4/9] update react native ios part --- .../TinyQuickstartReactNative/Gemfile | 11 +- .../TinyQuickstartReactNative/babel.config.js | 2 +- .../TinyQuickstartReactNative/ios/Podfile | 47 +- .../ios/Podfile.lock | 1405 +++++++++++++---- .../project.pbxproj | 24 +- .../TinyQuickstartReactNative/AppDelegate.h | 12 +- .../TinyQuickstartReactNative/AppDelegate.mm | 119 +- .../TinyQuickstartReactNative/metro.config.js | 23 +- .../TinyQuickstartReactNative/package.json | 26 +- 9 files changed, 1159 insertions(+), 510 deletions(-) diff --git a/react_native/TinyQuickstartReactNative/Gemfile b/react_native/TinyQuickstartReactNative/Gemfile index 9687b47..d735a09 100644 --- a/react_native/TinyQuickstartReactNative/Gemfile +++ b/react_native/TinyQuickstartReactNative/Gemfile @@ -1,6 +1,9 @@ source 'https://rubygems.org' - + # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version -ruby '3.3' - -gem 'cocoapods', '~> 1.11', '>= 1.11.2' +ruby ">= 2.6.10" + +# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper +# bound in the template on Cocoapods with next React Native release. +gem 'cocoapods', '>= 1.13', '< 1.15' +gem 'activesupport', '>= 6.1.7.5', '< 7.1.0' diff --git a/react_native/TinyQuickstartReactNative/babel.config.js b/react_native/TinyQuickstartReactNative/babel.config.js index f842b77..f7b3da3 100644 --- a/react_native/TinyQuickstartReactNative/babel.config.js +++ b/react_native/TinyQuickstartReactNative/babel.config.js @@ -1,3 +1,3 @@ module.exports = { - presets: ['module:metro-react-native-babel-preset'], + presets: ['module:@react-native/babel-preset'], }; diff --git a/react_native/TinyQuickstartReactNative/ios/Podfile b/react_native/TinyQuickstartReactNative/ios/Podfile index 7f0e2e3..6b7d1a4 100644 --- a/react_native/TinyQuickstartReactNative/ios/Podfile +++ b/react_native/TinyQuickstartReactNative/ios/Podfile @@ -1,27 +1,40 @@ -require_relative '../node_modules/react-native/scripts/react_native_pods' -require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' +# Resolve react_native_pods.rb with node to allow for hoisting +require Pod::Executable.execute_command('node', ['-p', + 'require.resolve( + "react-native/scripts/react_native_pods.rb", + {paths: [process.argv[1]]}, + )', __dir__]).strip platform :ios, '14.0' -install! 'cocoapods', :deterministic_uuids => false +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 } } } : {}), +# ``` +flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled + +linkage = ENV['USE_FRAMEWORKS'] +if linkage != nil + Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green + use_frameworks! :linkage => linkage.to_sym +end target 'TinyQuickstartReactNative' do config = use_native_modules! - # Flags change depending on the env values. - flags = get_default_flags() - use_react_native!( :path => config[:reactNativePath], - # Hermes is now enabled by default. Disable by setting this flag to false. - # Upcoming versions of React Native may rely on get_default_flags(), but - # we make it explicit here to aid in the React Native upgrade process. - :hermes_enabled => true, - :fabric_enabled => flags[:fabric_enabled], # Enables Flipper. # # Note that if you have use_frameworks! enabled, Flipper will not work and # you should disable the next line. - :flipper_configuration => FlipperConfiguration.enabled, + :flipper_configuration => flipper_config, # An absolute path to your application root. :app_path => "#{Pod::Config.instance.installation_root}/.." ) @@ -32,17 +45,11 @@ target 'TinyQuickstartReactNative' do end post_install do |installer| - installer.pods_project.targets.each do |target| - target.build_configurations.each do |config| - config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET' - end - end + # https://github.com/facebook/react-native/blob/main/packages/react-native/scripts/react_native_pods.rb#L197-L202 react_native_post_install( installer, - # Set `mac_catalyst_enabled` to `true` in order to apply patches - # necessary for Mac Catalyst builds + config[:reactNativePath], :mac_catalyst_enabled => false ) - __apply_Xcode_12_5_M1_post_install_workaround(installer) end end diff --git a/react_native/TinyQuickstartReactNative/ios/Podfile.lock b/react_native/TinyQuickstartReactNative/ios/Podfile.lock index d1cc6e9..d38ecd6 100644 --- a/react_native/TinyQuickstartReactNative/ios/Podfile.lock +++ b/react_native/TinyQuickstartReactNative/ios/Podfile.lock @@ -1,18 +1,17 @@ PODS: - - boost (1.76.0) + - boost (1.83.0) - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - - FBLazyVector (0.71.14) - - FBReactNativeSpec (0.71.14): - - RCT-Folly (= 2021.07.22.00) - - 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): + - FBLazyVector (0.73.6) + - FBReactNativeSpec (0.73.6): + - RCT-Folly (= 2022.05.16.00) + - RCTRequired (= 0.73.6) + - RCTTypeSafety (= 0.73.6) + - React-Core (= 0.73.6) + - React-jsi (= 0.73.6) + - ReactCommon/turbomodule/core (= 0.73.6) + - Flipper (0.201.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) @@ -25,98 +24,101 @@ PODS: - 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 (0.201.0): + - FlipperKit/Core (= 0.201.0) + - FlipperKit/Core (0.201.0): + - Flipper (~> 0.201.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): + - FlipperKit/CppBridge (0.201.0): + - Flipper (~> 0.201.0) + - FlipperKit/FBCxxFollyDynamicConvert (0.201.0): - Flipper-Folly (~> 2.6) - - FlipperKit/FBDefines (0.125.0) - - FlipperKit/FKPortForwarding (0.125.0): + - FlipperKit/FBDefines (0.201.0) + - FlipperKit/FKPortForwarding (0.201.0): - CocoaAsyncSocket (~> 7.6) - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.125.0) - - FlipperKit/FlipperKitLayoutHelpers (0.125.0): + - FlipperKit/FlipperKitHighlightOverlay (0.201.0) + - FlipperKit/FlipperKitLayoutHelpers (0.201.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutTextSearchable - - FlipperKit/FlipperKitLayoutIOSDescriptors (0.125.0): + - FlipperKit/FlipperKitLayoutIOSDescriptors (0.201.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutHelpers - - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutPlugin (0.125.0): + - FlipperKit/FlipperKitLayoutPlugin (0.201.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/FlipperKitLayoutTextSearchable (0.201.0) + - FlipperKit/FlipperKitNetworkPlugin (0.201.0): - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.125.0): + - FlipperKit/FlipperKitReactPlugin (0.201.0): - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.125.0): + - FlipperKit/FlipperKitUserDefaultsPlugin (0.201.0): - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.125.0): + - FlipperKit/SKIOSNetworkPlugin (0.201.0): - FlipperKit/Core - FlipperKit/FlipperKitNetworkPlugin - fmt (6.2.1) - glog (0.3.5) - - hermes-engine (0.71.14): - - hermes-engine/Pre-built (= 0.71.14) - - hermes-engine/Pre-built (0.71.14) + - hermes-engine (0.73.6): + - hermes-engine/Pre-built (= 0.73.6) + - hermes-engine/Pre-built (0.73.6) - libevent (2.1.12) - OpenSSL-Universal (1.1.1100) - Plaid (5.3.1) - - RCT-Folly (2021.07.22.00): + - RCT-Folly (2022.05.16.00): + - boost + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - RCT-Folly/Default (= 2022.05.16.00) + - RCT-Folly/Default (2022.05.16.00): - boost - DoubleConversion - fmt (~> 6.2.1) - glog - - RCT-Folly/Default (= 2021.07.22.00) - - RCT-Folly/Default (2021.07.22.00): + - RCT-Folly/Fabric (2022.05.16.00): - boost - DoubleConversion - fmt (~> 6.2.1) - glog - - RCT-Folly/Futures (2021.07.22.00): + - RCT-Folly/Futures (2022.05.16.00): - boost - DoubleConversion - fmt (~> 6.2.1) - glog - libevent - - RCTRequired (0.71.14) - - 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): + - RCTRequired (0.73.6) + - RCTTypeSafety (0.73.6): + - FBLazyVector (= 0.73.6) + - RCTRequired (= 0.73.6) + - React-Core (= 0.73.6) + - React (0.73.6): + - React-Core (= 0.73.6) + - React-Core/DevSupport (= 0.73.6) + - React-Core/RCTWebSocket (= 0.73.6) + - React-RCTActionSheet (= 0.73.6) + - React-RCTAnimation (= 0.73.6) + - React-RCTBlob (= 0.73.6) + - React-RCTImage (= 0.73.6) + - React-RCTLinking (= 0.73.6) + - React-RCTNetwork (= 0.73.6) + - React-RCTSettings (= 0.73.6) + - React-RCTText (= 0.73.6) + - React-RCTVibration (= 0.73.6) + - React-callinvoker (0.73.6) + - React-Codegen (0.73.6): + - DoubleConversion - FBReactNativeSpec + - glog - hermes-engine - RCT-Folly - RCTRequired @@ -124,345 +126,1041 @@ PODS: - React-Core - React-jsi - React-jsiexecutor + - React-NativeModulesApple + - React-rncore - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - - React-Core (0.71.14): + - React-Core (0.73.6): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.71.14) - - React-cxxreact (= 0.71.14) + - RCT-Folly (= 2022.05.16.00) + - React-Core/Default (= 0.73.6) + - React-cxxreact - React-hermes - - React-jsi (= 0.71.14) - - React-jsiexecutor (= 0.71.14) - - React-perflogger (= 0.71.14) + - React-jsi + - React-jsiexecutor + - React-perflogger + - React-runtimescheduler + - React-utils + - SocketRocket (= 0.6.1) - Yoga - - React-Core/CoreModulesHeaders (0.71.14): + - React-Core/CoreModulesHeaders (0.73.6): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2022.05.16.00) - React-Core/Default - - React-cxxreact (= 0.71.14) + - React-cxxreact - React-hermes - - React-jsi (= 0.71.14) - - React-jsiexecutor (= 0.71.14) - - React-perflogger (= 0.71.14) + - React-jsi + - React-jsiexecutor + - React-perflogger + - React-runtimescheduler + - React-utils + - SocketRocket (= 0.6.1) - Yoga - - React-Core/Default (0.71.14): + - React-Core/Default (0.73.6): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) - - React-cxxreact (= 0.71.14) + - RCT-Folly (= 2022.05.16.00) + - React-cxxreact - React-hermes - - React-jsi (= 0.71.14) - - React-jsiexecutor (= 0.71.14) - - React-perflogger (= 0.71.14) + - React-jsi + - React-jsiexecutor + - React-perflogger + - React-runtimescheduler + - React-utils + - SocketRocket (= 0.6.1) - Yoga - - React-Core/DevSupport (0.71.14): + - React-Core/DevSupport (0.73.6): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.71.14) - - React-Core/RCTWebSocket (= 0.71.14) - - React-cxxreact (= 0.71.14) + - RCT-Folly (= 2022.05.16.00) + - React-Core/Default (= 0.73.6) + - React-Core/RCTWebSocket (= 0.73.6) + - React-cxxreact - React-hermes - - React-jsi (= 0.71.14) - - React-jsiexecutor (= 0.71.14) - - React-jsinspector (= 0.71.14) - - React-perflogger (= 0.71.14) + - React-jsi + - React-jsiexecutor + - React-jsinspector (= 0.73.6) + - React-perflogger + - React-runtimescheduler + - React-utils + - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTActionSheetHeaders (0.71.14): + - React-Core/RCTActionSheetHeaders (0.73.6): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2022.05.16.00) - React-Core/Default - - React-cxxreact (= 0.71.14) + - React-cxxreact - React-hermes - - React-jsi (= 0.71.14) - - React-jsiexecutor (= 0.71.14) - - React-perflogger (= 0.71.14) + - React-jsi + - React-jsiexecutor + - React-perflogger + - React-runtimescheduler + - React-utils + - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTAnimationHeaders (0.71.14): + - React-Core/RCTAnimationHeaders (0.73.6): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2022.05.16.00) - React-Core/Default - - React-cxxreact (= 0.71.14) + - React-cxxreact - React-hermes - - React-jsi (= 0.71.14) - - React-jsiexecutor (= 0.71.14) - - React-perflogger (= 0.71.14) + - React-jsi + - React-jsiexecutor + - React-perflogger + - React-runtimescheduler + - React-utils + - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTBlobHeaders (0.71.14): + - React-Core/RCTBlobHeaders (0.73.6): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2022.05.16.00) - React-Core/Default - - React-cxxreact (= 0.71.14) + - React-cxxreact - React-hermes - - React-jsi (= 0.71.14) - - React-jsiexecutor (= 0.71.14) - - React-perflogger (= 0.71.14) + - React-jsi + - React-jsiexecutor + - React-perflogger + - React-runtimescheduler + - React-utils + - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTImageHeaders (0.71.14): + - React-Core/RCTImageHeaders (0.73.6): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2022.05.16.00) - React-Core/Default - - React-cxxreact (= 0.71.14) + - React-cxxreact - React-hermes - - React-jsi (= 0.71.14) - - React-jsiexecutor (= 0.71.14) - - React-perflogger (= 0.71.14) + - React-jsi + - React-jsiexecutor + - React-perflogger + - React-runtimescheduler + - React-utils + - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTLinkingHeaders (0.71.14): + - React-Core/RCTLinkingHeaders (0.73.6): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2022.05.16.00) - React-Core/Default - - React-cxxreact (= 0.71.14) + - React-cxxreact - React-hermes - - React-jsi (= 0.71.14) - - React-jsiexecutor (= 0.71.14) - - React-perflogger (= 0.71.14) + - React-jsi + - React-jsiexecutor + - React-perflogger + - React-runtimescheduler + - React-utils + - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTNetworkHeaders (0.71.14): + - React-Core/RCTNetworkHeaders (0.73.6): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2022.05.16.00) - React-Core/Default - - React-cxxreact (= 0.71.14) + - React-cxxreact - React-hermes - - React-jsi (= 0.71.14) - - React-jsiexecutor (= 0.71.14) - - React-perflogger (= 0.71.14) + - React-jsi + - React-jsiexecutor + - React-perflogger + - React-runtimescheduler + - React-utils + - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTSettingsHeaders (0.71.14): + - React-Core/RCTSettingsHeaders (0.73.6): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2022.05.16.00) - React-Core/Default - - React-cxxreact (= 0.71.14) + - React-cxxreact - React-hermes - - React-jsi (= 0.71.14) - - React-jsiexecutor (= 0.71.14) - - React-perflogger (= 0.71.14) + - React-jsi + - React-jsiexecutor + - React-perflogger + - React-runtimescheduler + - React-utils + - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTTextHeaders (0.71.14): + - React-Core/RCTTextHeaders (0.73.6): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2022.05.16.00) - React-Core/Default - - React-cxxreact (= 0.71.14) + - React-cxxreact - React-hermes - - React-jsi (= 0.71.14) - - React-jsiexecutor (= 0.71.14) - - React-perflogger (= 0.71.14) + - React-jsi + - React-jsiexecutor + - React-perflogger + - React-runtimescheduler + - React-utils + - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTVibrationHeaders (0.71.14): + - React-Core/RCTVibrationHeaders (0.73.6): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) + - RCT-Folly (= 2022.05.16.00) - React-Core/Default - - React-cxxreact (= 0.71.14) + - React-cxxreact - React-hermes - - React-jsi (= 0.71.14) - - React-jsiexecutor (= 0.71.14) - - React-perflogger (= 0.71.14) + - React-jsi + - React-jsiexecutor + - React-perflogger + - React-runtimescheduler + - React-utils + - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTWebSocket (0.71.14): + - React-Core/RCTWebSocket (0.73.6): - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.71.14) - - React-cxxreact (= 0.71.14) + - RCT-Folly (= 2022.05.16.00) + - React-Core/Default (= 0.73.6) + - React-cxxreact - React-hermes - - React-jsi (= 0.71.14) - - React-jsiexecutor (= 0.71.14) - - React-perflogger (= 0.71.14) + - React-jsi + - React-jsiexecutor + - React-perflogger + - React-runtimescheduler + - React-utils + - SocketRocket (= 0.6.1) - Yoga - - React-CoreModules (0.71.14): - - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.71.14) - - React-Codegen (= 0.71.14) - - React-Core/CoreModulesHeaders (= 0.71.14) - - React-jsi (= 0.71.14) + - React-CoreModules (0.73.6): + - RCT-Folly (= 2022.05.16.00) + - RCTTypeSafety (= 0.73.6) + - React-Codegen + - React-Core/CoreModulesHeaders (= 0.73.6) + - React-jsi (= 0.73.6) + - React-NativeModulesApple - React-RCTBlob - - React-RCTImage (= 0.71.14) - - ReactCommon/turbomodule/core (= 0.71.14) - - React-cxxreact (0.71.14): - - boost (= 1.76.0) + - React-RCTImage (= 0.73.6) + - ReactCommon + - SocketRocket (= 0.6.1) + - React-cxxreact (0.73.6): + - boost (= 1.83.0) - DoubleConversion + - fmt (~> 6.2.1) - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) - - 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-hermes (0.71.14): + - RCT-Folly (= 2022.05.16.00) + - React-callinvoker (= 0.73.6) + - React-debug (= 0.73.6) + - React-jsi (= 0.73.6) + - React-jsinspector (= 0.73.6) + - React-logger (= 0.73.6) + - React-perflogger (= 0.73.6) + - React-runtimeexecutor (= 0.73.6) + - React-debug (0.73.6) + - React-Fabric (0.73.6): - DoubleConversion + - fmt (~> 6.2.1) - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) - - RCT-Folly/Futures (= 2021.07.22.00) - - React-cxxreact (= 0.71.14) + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-Fabric/animations (= 0.73.6) + - React-Fabric/attributedstring (= 0.73.6) + - React-Fabric/componentregistry (= 0.73.6) + - React-Fabric/componentregistrynative (= 0.73.6) + - React-Fabric/components (= 0.73.6) + - React-Fabric/core (= 0.73.6) + - React-Fabric/imagemanager (= 0.73.6) + - React-Fabric/leakchecker (= 0.73.6) + - React-Fabric/mounting (= 0.73.6) + - React-Fabric/scheduler (= 0.73.6) + - React-Fabric/telemetry (= 0.73.6) + - React-Fabric/templateprocessor (= 0.73.6) + - React-Fabric/textlayoutmanager (= 0.73.6) + - React-Fabric/uimanager (= 0.73.6) + - React-graphics - React-jsi - - React-jsiexecutor (= 0.71.14) - - React-jsinspector (= 0.71.14) - - React-perflogger (= 0.71.14) - - React-jsi (0.71.14): - - boost (= 1.76.0) + - React-jsiexecutor + - React-logger + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - React-Fabric/animations (0.73.6): - DoubleConversion + - fmt (~> 6.2.1) - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) - - React-jsiexecutor (0.71.14): + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-graphics + - React-jsi + - React-jsiexecutor + - React-logger + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - React-Fabric/attributedstring (0.73.6): - DoubleConversion + - fmt (~> 6.2.1) - glog - hermes-engine - - RCT-Folly (= 2021.07.22.00) - - 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): + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-graphics + - React-jsi + - React-jsiexecutor + - React-logger + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - React-Fabric/componentregistry (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) - glog + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-graphics + - React-jsi + - React-jsiexecutor + - React-logger + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - React-Fabric/componentregistrynative (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-graphics + - React-jsi + - React-jsiexecutor + - React-logger + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - React-Fabric/components (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-Fabric/components/inputaccessory (= 0.73.6) + - React-Fabric/components/legacyviewmanagerinterop (= 0.73.6) + - React-Fabric/components/modal (= 0.73.6) + - React-Fabric/components/rncore (= 0.73.6) + - React-Fabric/components/root (= 0.73.6) + - React-Fabric/components/safeareaview (= 0.73.6) + - React-Fabric/components/scrollview (= 0.73.6) + - React-Fabric/components/text (= 0.73.6) + - React-Fabric/components/textinput (= 0.73.6) + - React-Fabric/components/unimplementedview (= 0.73.6) + - React-Fabric/components/view (= 0.73.6) + - React-graphics + - React-jsi + - React-jsiexecutor + - React-logger + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - React-Fabric/components/inputaccessory (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-graphics + - React-jsi + - React-jsiexecutor + - React-logger + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - React-Fabric/components/legacyviewmanagerinterop (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-graphics + - React-jsi + - React-jsiexecutor + - React-logger + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - React-Fabric/components/modal (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-graphics + - React-jsi + - React-jsiexecutor + - React-logger + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - React-Fabric/components/rncore (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-graphics + - React-jsi + - React-jsiexecutor + - React-logger + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - React-Fabric/components/root (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-graphics + - React-jsi + - React-jsiexecutor + - React-logger + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - React-Fabric/components/safeareaview (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-graphics + - React-jsi + - React-jsiexecutor + - React-logger + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - React-Fabric/components/scrollview (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-graphics + - React-jsi + - React-jsiexecutor + - React-logger + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - React-Fabric/components/text (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-graphics + - React-jsi + - React-jsiexecutor + - React-logger + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - React-Fabric/components/textinput (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-graphics + - React-jsi + - React-jsiexecutor + - React-logger + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - React-Fabric/components/unimplementedview (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-graphics + - React-jsi + - React-jsiexecutor + - React-logger + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - React-Fabric/components/view (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-graphics + - React-jsi + - React-jsiexecutor + - React-logger + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - Yoga + - React-Fabric/core (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-graphics + - React-jsi + - React-jsiexecutor + - React-logger + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - React-Fabric/imagemanager (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-graphics + - React-jsi + - React-jsiexecutor + - React-logger + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - React-Fabric/leakchecker (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-graphics + - React-jsi + - React-jsiexecutor + - React-logger + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - React-Fabric/mounting (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-graphics + - React-jsi + - React-jsiexecutor + - React-logger + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - React-Fabric/scheduler (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-graphics + - React-jsi + - React-jsiexecutor + - React-logger + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - React-Fabric/telemetry (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-graphics + - React-jsi + - React-jsiexecutor + - React-logger + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - React-Fabric/templateprocessor (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-graphics + - React-jsi + - React-jsiexecutor + - React-logger + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - React-Fabric/textlayoutmanager (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-Fabric/uimanager + - React-graphics + - React-jsi + - React-jsiexecutor + - React-logger + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - React-Fabric/uimanager (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-cxxreact + - React-debug + - React-graphics + - React-jsi + - React-jsiexecutor + - React-logger + - React-rendererdebug + - React-runtimescheduler + - React-utils + - ReactCommon/turbomodule/core + - React-FabricImage (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - RCTRequired (= 0.73.6) + - RCTTypeSafety (= 0.73.6) + - React-Fabric + - React-graphics + - React-ImageManager + - React-jsi + - React-jsiexecutor (= 0.73.6) + - React-logger + - React-rendererdebug + - React-utils + - ReactCommon + - Yoga + - React-graphics (0.73.6): + - glog + - RCT-Folly/Fabric (= 2022.05.16.00) + - React-Core/Default (= 0.73.6) + - React-utils + - React-hermes (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly (= 2022.05.16.00) + - RCT-Folly/Futures (= 2022.05.16.00) + - React-cxxreact (= 0.73.6) + - React-jsi + - React-jsiexecutor (= 0.73.6) + - React-jsinspector (= 0.73.6) + - React-perflogger (= 0.73.6) + - React-ImageManager (0.73.6): + - glog + - RCT-Folly/Fabric + - React-Core/Default + - React-debug + - React-Fabric + - React-graphics + - React-rendererdebug + - React-utils + - React-jserrorhandler (0.73.6): + - RCT-Folly/Fabric (= 2022.05.16.00) + - React-debug + - React-jsi + - React-Mapbuffer + - React-jsi (0.73.6): + - boost (= 1.83.0) + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly (= 2022.05.16.00) + - React-jsiexecutor (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly (= 2022.05.16.00) + - React-cxxreact (= 0.73.6) + - React-jsi (= 0.73.6) + - React-perflogger (= 0.73.6) + - React-jsinspector (0.73.6) + - React-logger (0.73.6): + - glog + - React-Mapbuffer (0.73.6): + - glog + - React-debug - react-native-plaid-link-sdk (11.6.0): - Plaid (~> 5.3.1) - React-Core - react-native-safe-area-context (4.9.0): - React-Core - - 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.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): + - React-nativeconfig (0.73.6) + - React-NativeModulesApple (0.73.6): + - glog + - hermes-engine + - React-callinvoker + - React-Core + - React-cxxreact + - React-jsi + - React-runtimeexecutor + - ReactCommon/turbomodule/bridging + - ReactCommon/turbomodule/core + - React-perflogger (0.73.6) + - React-RCTActionSheet (0.73.6): + - React-Core/RCTActionSheetHeaders (= 0.73.6) + - React-RCTAnimation (0.73.6): + - RCT-Folly (= 2022.05.16.00) + - RCTTypeSafety + - React-Codegen + - React-Core/RCTAnimationHeaders + - React-jsi + - React-NativeModulesApple + - ReactCommon + - React-RCTAppDelegate (0.73.6): - RCT-Folly - RCTRequired - RCTTypeSafety - React-Core - - ReactCommon/turbomodule/core - - React-RCTBlob (0.71.14): - - hermes-engine - - RCT-Folly (= 2021.07.22.00) - - 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.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.14) - - React-Codegen (= 0.71.14) - - React-Core/RCTNetworkHeaders (= 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.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.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 - - hermes-engine - - RCT-Folly (= 2021.07.22.00) - - 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 - - hermes-engine - - RCT-Folly (= 2021.07.22.00) - - 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) + - React-CoreModules + - React-hermes + - React-nativeconfig + - React-NativeModulesApple + - React-RCTFabric + - React-RCTImage + - React-RCTNetwork + - React-runtimescheduler + - ReactCommon + - React-RCTBlob (0.73.6): + - hermes-engine + - RCT-Folly (= 2022.05.16.00) + - React-Codegen + - React-Core/RCTBlobHeaders + - React-Core/RCTWebSocket + - React-jsi + - React-NativeModulesApple + - React-RCTNetwork + - ReactCommon + - React-RCTFabric (0.73.6): + - glog + - hermes-engine + - RCT-Folly/Fabric (= 2022.05.16.00) + - React-Core + - React-debug + - React-Fabric + - React-FabricImage + - React-graphics + - React-ImageManager + - React-jsi + - React-nativeconfig + - React-RCTImage + - React-RCTText + - React-rendererdebug + - React-runtimescheduler + - React-utils + - Yoga + - React-RCTImage (0.73.6): + - RCT-Folly (= 2022.05.16.00) + - RCTTypeSafety + - React-Codegen + - React-Core/RCTImageHeaders + - React-jsi + - React-NativeModulesApple + - React-RCTNetwork + - ReactCommon + - React-RCTLinking (0.73.6): + - React-Codegen + - React-Core/RCTLinkingHeaders (= 0.73.6) + - React-jsi (= 0.73.6) + - React-NativeModulesApple + - ReactCommon + - ReactCommon/turbomodule/core (= 0.73.6) + - React-RCTNetwork (0.73.6): + - RCT-Folly (= 2022.05.16.00) + - RCTTypeSafety + - React-Codegen + - React-Core/RCTNetworkHeaders + - React-jsi + - React-NativeModulesApple + - ReactCommon + - React-RCTSettings (0.73.6): + - RCT-Folly (= 2022.05.16.00) + - RCTTypeSafety + - React-Codegen + - React-Core/RCTSettingsHeaders + - React-jsi + - React-NativeModulesApple + - ReactCommon + - React-RCTText (0.73.6): + - React-Core/RCTTextHeaders (= 0.73.6) + - Yoga + - React-RCTVibration (0.73.6): + - RCT-Folly (= 2022.05.16.00) + - React-Codegen + - React-Core/RCTVibrationHeaders + - React-jsi + - React-NativeModulesApple + - ReactCommon + - React-rendererdebug (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - RCT-Folly (= 2022.05.16.00) + - React-debug + - React-rncore (0.73.6) + - React-runtimeexecutor (0.73.6): + - React-jsi (= 0.73.6) + - React-runtimescheduler (0.73.6): + - glog + - hermes-engine + - RCT-Folly (= 2022.05.16.00) + - React-callinvoker + - React-cxxreact + - React-debug + - React-jsi + - React-rendererdebug + - React-runtimeexecutor + - React-utils + - React-utils (0.73.6): + - glog + - RCT-Folly (= 2022.05.16.00) + - React-debug + - ReactCommon (0.73.6): + - React-logger (= 0.73.6) + - ReactCommon/turbomodule (= 0.73.6) + - ReactCommon/turbomodule (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly (= 2022.05.16.00) + - React-callinvoker (= 0.73.6) + - React-cxxreact (= 0.73.6) + - React-jsi (= 0.73.6) + - React-logger (= 0.73.6) + - React-perflogger (= 0.73.6) + - ReactCommon/turbomodule/bridging (= 0.73.6) + - ReactCommon/turbomodule/core (= 0.73.6) + - ReactCommon/turbomodule/bridging (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly (= 2022.05.16.00) + - React-callinvoker (= 0.73.6) + - React-cxxreact (= 0.73.6) + - React-jsi (= 0.73.6) + - React-logger (= 0.73.6) + - React-perflogger (= 0.73.6) + - ReactCommon/turbomodule/core (0.73.6): + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - hermes-engine + - RCT-Folly (= 2022.05.16.00) + - React-callinvoker (= 0.73.6) + - React-cxxreact (= 0.73.6) + - React-jsi (= 0.73.6) + - React-logger (= 0.73.6) + - React-perflogger (= 0.73.6) - RNCClipboard (1.5.1): - React-Core - RNGestureHandler (2.15.0): - - RCT-Folly (= 2021.07.22.00) + - glog + - RCT-Folly (= 2022.05.16.00) - React-Core - RNScreens (3.29.0): - - RCT-Folly (= 2021.07.22.00) + - glog + - RCT-Folly (= 2022.05.16.00) - React-Core - SocketRocket (0.6.1) - Yoga (1.14.0) - - YogaKit (1.18.1): - - Yoga (~> 1.14) DEPENDENCIES: - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`) - 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 (= 0.201.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) + - FlipperKit (= 0.201.0) + - FlipperKit/Core (= 0.201.0) + - FlipperKit/CppBridge (= 0.201.0) + - FlipperKit/FBCxxFollyDynamicConvert (= 0.201.0) + - FlipperKit/FBDefines (= 0.201.0) + - FlipperKit/FKPortForwarding (= 0.201.0) + - FlipperKit/FlipperKitHighlightOverlay (= 0.201.0) + - FlipperKit/FlipperKitLayoutPlugin (= 0.201.0) + - FlipperKit/FlipperKitLayoutTextSearchable (= 0.201.0) + - FlipperKit/FlipperKitNetworkPlugin (= 0.201.0) + - FlipperKit/FlipperKitReactPlugin (= 0.201.0) + - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.201.0) + - FlipperKit/SKIOSNetworkPlugin (= 0.201.0) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`) - libevent (~> 2.1.12) - OpenSSL-Universal (= 1.1.1100) - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) + - RCT-Folly/Fabric (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`) - React (from `../node_modules/react-native/`) @@ -473,25 +1171,39 @@ DEPENDENCIES: - 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`) + - React-debug (from `../node_modules/react-native/ReactCommon/react/debug`) + - React-Fabric (from `../node_modules/react-native/ReactCommon`) + - React-FabricImage (from `../node_modules/react-native/ReactCommon`) + - React-graphics (from `../node_modules/react-native/ReactCommon/react/renderer/graphics`) - React-hermes (from `../node_modules/react-native/ReactCommon/hermes`) + - React-ImageManager (from `../node_modules/react-native/ReactCommon/react/renderer/imagemanager/platform/ios`) + - React-jserrorhandler (from `../node_modules/react-native/ReactCommon/jserrorhandler`) - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`) - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) - - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) + - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector-modern`) - React-logger (from `../node_modules/react-native/ReactCommon/logger`) + - React-Mapbuffer (from `../node_modules/react-native/ReactCommon`) - react-native-plaid-link-sdk (from `../node_modules/react-native-plaid-link-sdk`) - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`) + - React-nativeconfig (from `../node_modules/react-native/ReactCommon`) + - React-NativeModulesApple (from `../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`) - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`) - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`) - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`) - React-RCTAppDelegate (from `../node_modules/react-native/Libraries/AppDelegate`) - React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`) + - React-RCTFabric (from `../node_modules/react-native/React`) - React-RCTImage (from `../node_modules/react-native/Libraries/Image`) - React-RCTLinking (from `../node_modules/react-native/Libraries/LinkingIOS`) - React-RCTNetwork (from `../node_modules/react-native/Libraries/Network`) - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`) - React-RCTText (from `../node_modules/react-native/Libraries/Text`) - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`) + - React-rendererdebug (from `../node_modules/react-native/ReactCommon/react/renderer/debug`) + - React-rncore (from `../node_modules/react-native/ReactCommon`) - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`) + - React-runtimescheduler (from `../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler`) + - React-utils (from `../node_modules/react-native/ReactCommon/react/utils`) - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - "RNCClipboard (from `../node_modules/@react-native-community/clipboard`)" - RNGestureHandler (from `../node_modules/react-native-gesture-handler`) @@ -508,14 +1220,12 @@ SPEC REPOS: - Flipper-Folly - Flipper-Glog - Flipper-PeerTalk - - Flipper-RSocket - FlipperKit - fmt - libevent - OpenSSL-Universal - Plaid - SocketRocket - - YogaKit EXTERNAL SOURCES: boost: @@ -530,6 +1240,7 @@ EXTERNAL SOURCES: :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec" hermes-engine: :podspec: "../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec" + :tag: hermes-2024-02-20-RNv0.73.5-18f99ace4213052c5e7cdbcd39ee9766cd5df7e4 RCT-Folly: :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec" RCTRequired: @@ -548,20 +1259,38 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/React/CoreModules" React-cxxreact: :path: "../node_modules/react-native/ReactCommon/cxxreact" + React-debug: + :path: "../node_modules/react-native/ReactCommon/react/debug" + React-Fabric: + :path: "../node_modules/react-native/ReactCommon" + React-FabricImage: + :path: "../node_modules/react-native/ReactCommon" + React-graphics: + :path: "../node_modules/react-native/ReactCommon/react/renderer/graphics" React-hermes: :path: "../node_modules/react-native/ReactCommon/hermes" + React-ImageManager: + :path: "../node_modules/react-native/ReactCommon/react/renderer/imagemanager/platform/ios" + React-jserrorhandler: + :path: "../node_modules/react-native/ReactCommon/jserrorhandler" React-jsi: :path: "../node_modules/react-native/ReactCommon/jsi" React-jsiexecutor: :path: "../node_modules/react-native/ReactCommon/jsiexecutor" React-jsinspector: - :path: "../node_modules/react-native/ReactCommon/jsinspector" + :path: "../node_modules/react-native/ReactCommon/jsinspector-modern" React-logger: :path: "../node_modules/react-native/ReactCommon/logger" + React-Mapbuffer: + :path: "../node_modules/react-native/ReactCommon" react-native-plaid-link-sdk: :path: "../node_modules/react-native-plaid-link-sdk" react-native-safe-area-context: :path: "../node_modules/react-native-safe-area-context" + React-nativeconfig: + :path: "../node_modules/react-native/ReactCommon" + React-NativeModulesApple: + :path: "../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios" React-perflogger: :path: "../node_modules/react-native/ReactCommon/reactperflogger" React-RCTActionSheet: @@ -572,6 +1301,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/Libraries/AppDelegate" React-RCTBlob: :path: "../node_modules/react-native/Libraries/Blob" + React-RCTFabric: + :path: "../node_modules/react-native/React" React-RCTImage: :path: "../node_modules/react-native/Libraries/Image" React-RCTLinking: @@ -584,8 +1315,16 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/Libraries/Text" React-RCTVibration: :path: "../node_modules/react-native/Libraries/Vibration" + React-rendererdebug: + :path: "../node_modules/react-native/ReactCommon/react/renderer/debug" + React-rncore: + :path: "../node_modules/react-native/ReactCommon" React-runtimeexecutor: :path: "../node_modules/react-native/ReactCommon/runtimeexecutor" + React-runtimescheduler: + :path: "../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler" + React-utils: + :path: "../node_modules/react-native/ReactCommon/react/utils" ReactCommon: :path: "../node_modules/react-native/ReactCommon" RNCClipboard: @@ -598,62 +1337,74 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/yoga" SPEC CHECKSUMS: - boost: 57d2868c099736d80fcd648bf211b4431e51a558 + boost: d3f49c53809116a5d38da093a8aa78bf551aed09 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 - DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 - FBLazyVector: 12ea01e587c9594e7b144e1bfc86ac4d9ac28fde - FBReactNativeSpec: b6ae48e67aaba46442f84d6f9ba598ccfbe2ee66 - Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 + DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953 + FBLazyVector: f64d1e2ea739b4d8f7e4740cde18089cd97fe864 + FBReactNativeSpec: 9f2b8b243131565335437dba74923a8d3015e780 + Flipper: c7a0093234c4bdd456e363f2f19b2e4b27652d44 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3 Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 - Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 - FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86 + FlipperKit: 37525a5d056ef9b93d1578e04bc3ea1de940094f fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 - glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b - hermes-engine: d7cc127932c89c53374452d6f93473f1970d8e88 + glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2 + hermes-engine: 9cecf9953a681df7556b8cc9c74905de8f3293c0 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c Plaid: d6a4901b2474faac2f7c7871cdabcf916c444fb4 - RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 - RCTRequired: e9df143e880d0e879e7a498dc06923d728809c79 - RCTTypeSafety: c2d89c8308829c12c038ec1f431191eaa0d8c15c - React: 52b89a818f4b2579c98567f3aa8bde880d9e843b - React-callinvoker: 56e399c88c05e037fe99c31978f30e75fad5c286 - React-Codegen: 7ece62f4d4896ad1933f834a7dad697676636318 - React-Core: f06b7b00e0d49433a316760ae61a0f8f5dee6629 - React-CoreModules: bd520e5688b5aa4666965a1b3b8e6d4a2e19df20 - React-cxxreact: ba6a1663685837fa4c2ac97daa95dd2e47f1acdc - React-hermes: c862e573ca0228070936b5ec4f475c3e19e900e0 - React-jsi: 533030c161bcfcbc3a4ad0b357ced8f7b2be457e - React-jsiexecutor: 94cfc1788637ceaf8841ef1f69b10cc0d62baadc - React-jsinspector: 7bf923954b4e035f494b01ac16633963412660d7 - React-logger: 655ff5db8bd922acfbe76a4983ffab048916343e + RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0 + RCTRequired: ca1d7414aba0b27efcfa2ccd37637edb1ab77d96 + RCTTypeSafety: 678e344fb976ff98343ca61dc62e151f3a042292 + React: e296bcebb489deaad87326067204eb74145934ab + React-callinvoker: d0b7015973fa6ccb592bb0363f6bc2164238ab8c + React-Codegen: f034a5de6f28e15e8d95d171df17e581d5309268 + React-Core: 44c936d0ab879e9c32e5381bd7596a677c59c974 + React-CoreModules: 558228e12cddb9ca00ff7937894cc5104a21be6b + React-cxxreact: 1fcf565012c203655b3638f35aa03c13c2ed7e9e + React-debug: d444db402065cca460d9c5b072caab802a04f729 + React-Fabric: 7d11905695e42f8bdaedddcf294959b43b290ab8 + React-FabricImage: 6e06a512d2fb5f55669c721578736785d915d4f5 + React-graphics: 5500206f7c9a481456365403c9fcf1638de108b7 + React-hermes: 783023e43af9d6be4fbaeeb96b5beee00649a5f7 + React-ImageManager: df193215ff3cf1a8dad297e554c89c632e42436c + React-jserrorhandler: a4d0f541c5852cf031db2f82f51de90be55b1334 + React-jsi: ae102ccb38d2e4d0f512b7074d0c9b4e1851f402 + React-jsiexecutor: bd12ec75873d3ef0a755c11f878f2c420430f5a9 + React-jsinspector: 85583ef014ce53d731a98c66a0e24496f7a83066 + React-logger: 3eb80a977f0d9669468ef641a5e1fabbc50a09ec + React-Mapbuffer: 84ea43c6c6232049135b1550b8c60b2faac19fab react-native-plaid-link-sdk: 3f208a472b285df6f8479a8373b87c3eabba3db0 react-native-safe-area-context: b97eb6f9e3b7f437806c2ce5983f479f8eb5de4b - React-perflogger: 4987ad83731c23d11813c84263963b0d3028c966 - React-RCTActionSheet: 5ad952b2a9740d87a5bd77280c4bc23f6f89ea0c - React-RCTAnimation: d2de22af3f536cc80bb5b3918e1a455114d1b985 - React-RCTAppDelegate: 27f7d735cad3d522c13008ea80020d350017c422 - React-RCTBlob: b697e0e2e38ec85bd726176851a3b476a490ad33 - React-RCTImage: a07e8c7d4768f62ebc6277e4680f6b979c619967 - React-RCTLinking: d00ae55db37b2c12ebab91135f06f75391c0708d - React-RCTNetwork: b3a401276e5c08487d8a14fdec1720e78b5888db - React-RCTSettings: d606cbac31403604c5d5746e6dab53bb332f9301 - React-RCTText: b3bd40bc71bca0c3e2cc5ce2c40870a438f303b1 - React-RCTVibration: 64e412b9ac684c4edc938fa1187135ada9af7faf - React-runtimeexecutor: ffe826b7b1cfbc32a35ed5b64d5886c0ff75f501 - ReactCommon: 7f3dd5e98a9ec627c6b03d26c062bf37ea9fc888 + React-nativeconfig: b4d4e9901d4cabb57be63053fd2aa6086eb3c85f + React-NativeModulesApple: cd26e56d56350e123da0c1e3e4c76cb58a05e1ee + React-perflogger: 5f49905de275bac07ac7ea7f575a70611fa988f2 + React-RCTActionSheet: 37edf35aeb8e4f30e76c82aab61f12d1b75c04ec + React-RCTAnimation: a69de7f3daa8462743094f4736c455e844ea63f7 + React-RCTAppDelegate: 51fb96b554a6acd0cd7818acecd5aa5ca2f3ab9f + React-RCTBlob: d91771caebf2d015005d750cd1dc2b433ad07c99 + React-RCTFabric: c5b9451d1f2b546119b7a0353226a8a26247d4a9 + React-RCTImage: a0bfe87b6908c7b76bd7d74520f40660bd0ad881 + React-RCTLinking: 5f10be1647952cceddfa1970fdb374087582fc34 + React-RCTNetwork: a0bc3dd45a2dc7c879c80cebb6f9707b2c8bbed6 + React-RCTSettings: 28c202b68afa59afb4067510f2c69c5a530fb9e3 + React-RCTText: 4119d9e53ca5db9502b916e1b146e99798986d21 + React-RCTVibration: 55bd7c48487eb9a2562f2bd3fdc833274f5b0636 + React-rendererdebug: 5fa97ba664806cee4700e95aec42dff1b6f8ea36 + React-rncore: b0a8e1d14dabb7115c7a5b4ec8b9b74d1727d382 + React-runtimeexecutor: bb328dbe2865f3a550df0240df8e2d8c3aaa4c57 + React-runtimescheduler: 9636eee762c699ca7c85751a359101797e4c8b3b + React-utils: d16c1d2251c088ad817996621947d0ac8167b46c + ReactCommon: 2aa35648354bd4c4665b9a5084a7d37097b89c10 RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495 - RNGestureHandler: 7909c50383a18f0cb10ce1db7262b9a6da504c03 - RNScreens: 3c5b9f4a9dcde752466854b6109b79c0e205dad3 + RNGestureHandler: 67fb54b3e6ca338a8044e85cd6f340265aa41091 + RNScreens: 17e2f657f1b09a71ec3c821368a04acbb7ebcb46 SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 - Yoga: e71803b4c1fff832ccf9b92541e00f9b873119b9 - YogaKit: f782866e155069a2cca2517aafea43200b01fd5a + Yoga: 805bf71192903b20fc14babe48080582fee65a80 -PODFILE CHECKSUM: 0193b0b19825d171dbeef902b7c5a24c23c2f3f8 +PODFILE CHECKSUM: d88601f14e6c38467e4187842bbf5978bd3bd1ae COCOAPODS: 1.15.2 diff --git a/react_native/TinyQuickstartReactNative/ios/TinyQuickstartReactNative.xcodeproj/project.pbxproj b/react_native/TinyQuickstartReactNative/ios/TinyQuickstartReactNative.xcodeproj/project.pbxproj index c1f33a6..29239a6 100644 --- a/react_native/TinyQuickstartReactNative/ios/TinyQuickstartReactNative.xcodeproj/project.pbxproj +++ b/react_native/TinyQuickstartReactNative/ios/TinyQuickstartReactNative.xcodeproj/project.pbxproj @@ -29,13 +29,13 @@ /* Begin PBXFileReference section */ 00E356EE1AD99517003FC87E /* TinyQuickstartReactNativeTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TinyQuickstartReactNativeTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 00E356F21AD99517003FC87E /* TinyQuickstartReactNativeTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TinyQuickstartReactNativeTests.m; sourceTree = ""; }; + 00E356F21AD99517003FC87E /* TinyQuickstartReactNativeTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = TinyQuickstartReactNativeTests.m; sourceTree = ""; }; 13B07F961A680F5B00A75B9A /* TinyQuickstartReactNative.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TinyQuickstartReactNative.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = TinyQuickstartReactNative/AppDelegate.h; sourceTree = ""; }; 13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = TinyQuickstartReactNative/AppDelegate.mm; sourceTree = ""; }; 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = TinyQuickstartReactNative/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = TinyQuickstartReactNative/Info.plist; sourceTree = ""; }; - 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = TinyQuickstartReactNative/main.m; sourceTree = ""; }; + 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = main.m; path = TinyQuickstartReactNative/main.m; sourceTree = ""; }; 19F6CBCC0A4E27FBF8BF4A61 /* libPods-TinyQuickstartReactNative-TinyQuickstartReactNativeTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-TinyQuickstartReactNative-TinyQuickstartReactNativeTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 3B4392A12AC88292D35C810B /* Pods-TinyQuickstartReactNative.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TinyQuickstartReactNative.debug.xcconfig"; path = "Target Support Files/Pods-TinyQuickstartReactNative/Pods-TinyQuickstartReactNative.debug.xcconfig"; sourceTree = ""; }; 5709B34CF0A7D63546082F79 /* Pods-TinyQuickstartReactNative.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TinyQuickstartReactNative.release.xcconfig"; path = "Target Support Files/Pods-TinyQuickstartReactNative/Pods-TinyQuickstartReactNative.release.xcconfig"; sourceTree = ""; }; @@ -540,7 +540,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_CXX_LANGUAGE_STANDARD = "c++17"; + CLANG_CXX_LANGUAGE_STANDARD = "c++20"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; @@ -597,19 +597,17 @@ ); MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; + OTHER_CFLAGS = "$(inherited)"; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", "-DFOLLY_MOBILE=1", "-DFOLLY_USE_LIBCPP=1", ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-Wl", - "-ld_classic", - ); + OTHER_LDFLAGS = "$(inherited)"; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; + USE_HERMES = true; }; name = Debug; }; @@ -618,7 +616,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_CXX_LANGUAGE_STANDARD = "c++17"; + CLANG_CXX_LANGUAGE_STANDARD = "c++20"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; @@ -670,19 +668,17 @@ "\"$(inherited)\"", ); MTL_ENABLE_DEBUG_INFO = NO; + OTHER_CFLAGS = "$(inherited)"; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DFOLLY_NO_CONFIG", "-DFOLLY_MOBILE=1", "-DFOLLY_USE_LIBCPP=1", ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-Wl", - "-ld_classic", - ); + OTHER_LDFLAGS = "$(inherited)"; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; + USE_HERMES = true; VALIDATE_PRODUCT = YES; }; name = Release; diff --git a/react_native/TinyQuickstartReactNative/ios/TinyQuickstartReactNative/AppDelegate.h b/react_native/TinyQuickstartReactNative/ios/TinyQuickstartReactNative/AppDelegate.h index ef1de86..555395d 100644 --- a/react_native/TinyQuickstartReactNative/ios/TinyQuickstartReactNative/AppDelegate.h +++ b/react_native/TinyQuickstartReactNative/ios/TinyQuickstartReactNative/AppDelegate.h @@ -1,8 +1,6 @@ -#import +#import #import - -@interface AppDelegate : UIResponder - -@property (nonatomic, strong) UIWindow *window; - -@end + +@interface AppDelegate : RCTAppDelegate + +@end \ No newline at end of file diff --git a/react_native/TinyQuickstartReactNative/ios/TinyQuickstartReactNative/AppDelegate.mm b/react_native/TinyQuickstartReactNative/ios/TinyQuickstartReactNative/AppDelegate.mm index b27103a..9c4c809 100644 --- a/react_native/TinyQuickstartReactNative/ios/TinyQuickstartReactNative/AppDelegate.mm +++ b/react_native/TinyQuickstartReactNative/ios/TinyQuickstartReactNative/AppDelegate.mm @@ -1,89 +1,25 @@ #import "AppDelegate.h" -#import #import -#import -#import - -#import - -#if RCT_NEW_ARCH_ENABLED -#import -#import -#import -#import -#import -#import - -#import - -static NSString *const kRNConcurrentRoot = @"concurrentRoot"; - -@interface AppDelegate () { - RCTTurboModuleManager *_turboModuleManager; - RCTSurfacePresenterBridgeAdapter *_bridgeAdapter; - std::shared_ptr _reactNativeConfig; - facebook::react::ContextContainer::Shared _contextContainer; -} -@end -#endif @implementation AppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - RCTAppSetupPrepareApp(application, true); - + self.moduleName = @"TinyQuickstartReactNative"; + // You can add your custom initial props in the dictionary below. + // They will be passed down to the ViewController used by React Native. + self.initialProps = @{}; - RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions]; - -#if RCT_NEW_ARCH_ENABLED - _contextContainer = std::make_shared(); - _reactNativeConfig = std::make_shared(); - _contextContainer->insert("ReactNativeConfig", _reactNativeConfig); - _bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:bridge contextContainer:_contextContainer]; - bridge.surfacePresenter = _bridgeAdapter.surfacePresenter; -#endif - - NSDictionary *initProps = [self prepareInitialProps]; - UIView *rootView = RCTAppSetupDefaultRootView(bridge, @"TinyQuickstartReactNative", initProps, true); - if (@available(iOS 13.0, *)) { - rootView.backgroundColor = [UIColor systemBackgroundColor]; - } else { - rootView.backgroundColor = [UIColor whiteColor]; - } - - self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; - UIViewController *rootViewController = [UIViewController new]; - rootViewController.view = rootView; - self.window.rootViewController = rootViewController; - [self.window makeKeyAndVisible]; - return YES; -} - -/// This method controls whether the `concurrentRoot`feature of React18 is turned on or off. -/// -/// @see: https://reactjs.org/blog/2022/03/29/react-v18.html -/// @note: This requires to be rendering on Fabric (i.e. on the New Architecture). -/// @return: `true` if the `concurrentRoot` feture is enabled. Otherwise, it returns `false`. -- (BOOL)concurrentRootEnabled -{ - // Switch this bool to turn on and off the concurrent root - return true; + return [super application:application didFinishLaunchingWithOptions:launchOptions]; } -- (NSDictionary *)prepareInitialProps +- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge { - NSMutableDictionary *initProps = [NSMutableDictionary new]; - -#ifdef RCT_NEW_ARCH_ENABLED - initProps[kRNConcurrentRoot] = @([self concurrentRootEnabled]); -#endif - - return initProps; + return [self getBundleURL]; } -- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge +- (NSURL *)getBundleURL { #if DEBUG return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"]; @@ -92,43 +28,4 @@ - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge #endif } -#if RCT_NEW_ARCH_ENABLED - -#pragma mark - RCTCxxBridgeDelegate - -- (std::unique_ptr)jsExecutorFactoryForBridge:(RCTBridge *)bridge -{ - _turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge - delegate:self - jsInvoker:bridge.jsCallInvoker]; - return RCTAppSetupDefaultJsExecutorFactory(bridge, _turboModuleManager); -} - -#pragma mark RCTTurboModuleManagerDelegate - -- (Class)getModuleClassFromName:(const char *)name -{ - return RCTCoreModulesClassProvider(name); -} - -- (std::shared_ptr)getTurboModule:(const std::string &)name - jsInvoker:(std::shared_ptr)jsInvoker -{ - return nullptr; -} - -- (std::shared_ptr)getTurboModule:(const std::string &)name - initParams: - (const facebook::react::ObjCTurboModule::InitParams &)params -{ - return nullptr; -} - -- (id)getModuleInstanceFromClass:(Class)moduleClass -{ - return RCTAppSetupDefaultModuleFromClass(moduleClass); -} - -#endif - @end diff --git a/react_native/TinyQuickstartReactNative/metro.config.js b/react_native/TinyQuickstartReactNative/metro.config.js index 53c2ea1..ad8f87b 100644 --- a/react_native/TinyQuickstartReactNative/metro.config.js +++ b/react_native/TinyQuickstartReactNative/metro.config.js @@ -1,20 +1,11 @@ +const {getDefaultConfig, mergeConfig} = require('@react-native/metro-config'); + /** - * Metro configuration for React Native - * https://github.com/facebook/react-native + * Metro configuration + * https://facebook.github.io/metro/docs/configuration * - * @format + * @type {import('metro-config').MetroConfig} */ +const config = {}; -module.exports = { - transformer: { - getTransformOptions: async () => ({ - transform: { - experimentalImportSupport: false, - inlineRequires: true, - }, - }), - }, - server: { - port: 8081, - }, -}; +module.exports = mergeConfig(getDefaultConfig(__dirname), config); diff --git a/react_native/TinyQuickstartReactNative/package.json b/react_native/TinyQuickstartReactNative/package.json index 1c2a882..7731735 100644 --- a/react_native/TinyQuickstartReactNative/package.json +++ b/react_native/TinyQuickstartReactNative/package.json @@ -3,7 +3,7 @@ "version": "0.0.1", "private": true, "engines": { - "node": "^20.11.1" + "node": ">=18" }, "scripts": { "android": "react-native run-android", @@ -33,15 +33,21 @@ "typescript": "^4.8.4" }, "devDependencies": { - "@babel/core": "^7.12.9", - "@babel/runtime": "^7.12.5", - "@react-native-community/eslint-config": "^2.0.0", - "babel-jest": "^26.6.3", - "eslint": "^7.32.0", - "jest": "^26.6.3", - "metro-react-native-babel-preset": "^0.72.1", - "react-test-renderer": "18.1.0" - }, + "@babel/core": "^7.20.0", + "@babel/preset-env": "^7.20.0", + "@babel/runtime": "^7.20.0", + "@react-native/babel-preset": "0.73.21", + "@react-native/eslint-config": "0.73.2", + "@react-native/metro-config": "0.73.5", + "@react-native/typescript-config": "0.73.1", + "@types/react": "^18.2.6", + "@types/react-test-renderer": "^18.0.0", + "babel-jest": "^29.6.3", + "eslint": "^8.19.0", + "jest": "^29.6.3", + "prettier": "2.8.8", + "react-test-renderer": "18.2.0", + "typescript": "5.0.4" }, "jest": { "preset": "react-native" }, From 22d07b207ac6ed7f295e1c19a6c3923423db9e93 Mon Sep 17 00:00:00 2001 From: Alex Hoffer Date: Fri, 22 Mar 2024 17:11:13 -0700 Subject: [PATCH 5/9] update rn for android --- .../android/app/build.gradle | 313 ++++-------------- .../android/app/src/debug/AndroidManifest.xml | 6 +- .../ReactNativeFlipper.java | 73 ---- .../MainActivity.java | 48 --- .../tinyquickstartreactnative/MainActivity.kt | 22 ++ .../MainApplication.java | 91 ----- .../MainApplication.kt | 46 +++ .../android/build.gradle | 24 +- .../android/gradle.properties | 7 +- .../gradle/wrapper/gradle-wrapper.properties | 4 +- .../TinyQuickstartReactNative/android/gradlew | 31 +- .../android/gradlew.bat | 15 +- .../android/settings.gradle | 9 +- .../ios/Podfile.lock | 6 - .../TinyQuickstartReactNative/package.json | 5 +- 15 files changed, 179 insertions(+), 521 deletions(-) delete mode 100644 react_native/TinyQuickstartReactNative/android/app/src/debug/java/com/tinyquickstartreactnative/ReactNativeFlipper.java delete mode 100644 react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/MainActivity.java create mode 100644 react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/MainActivity.kt delete mode 100644 react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/MainApplication.java create mode 100644 react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/MainApplication.kt diff --git a/react_native/TinyQuickstartReactNative/android/app/build.gradle b/react_native/TinyQuickstartReactNative/android/app/build.gradle index 8f62b84..e96ddc9 100644 --- a/react_native/TinyQuickstartReactNative/android/app/build.gradle +++ b/react_native/TinyQuickstartReactNative/android/app/build.gradle @@ -1,216 +1,86 @@ apply plugin: "com.android.application" +apply plugin: "org.jetbrains.kotlin.android" apply plugin: "com.facebook.react" -import com.android.build.OutputFile -/** -import com.android.build.OutputFile -import org.apache.tools.ant.taskdefs.condition.Os - -/** - * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets - * and bundleReleaseJsAndAssets). - * These basically call `react-native bundle` with the correct arguments during the Android build - * cycle. By default, bundleDebugJsAndAssets is skipped, as in debug/dev mode we prefer to load the - * bundle directly from the development server. Below you can see all the possible configurations - * and their defaults. If you decide to add a configuration block, make sure to add it before the - * `apply from: "../../node_modules/react-native/react.gradle"` line. - * - * project.ext.react = [ - * // the name of the generated asset file containing your JS bundle - * bundleAssetName: "index.android.bundle", - * - * // the entry file for bundle generation. If none specified and - * // "index.android.js" exists, it will be used. Otherwise "index.js" is - * // default. Can be overridden with ENTRY_FILE environment variable. - * entryFile: "index.android.js", - * - * // https://reactnative.dev/docs/performance#enable-the-ram-format - * bundleCommand: "ram-bundle", - * - * // whether to bundle JS and assets in debug mode - * bundleInDebug: false, - * - * // whether to bundle JS and assets in release mode - * bundleInRelease: true, - * - * // whether to bundle JS and assets in another build variant (if configured). - * // See http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Build-Variants - * // The configuration property can be in the following formats - * // 'bundleIn${productFlavor}${buildType}' - * // 'bundleIn${buildType}' - * // bundleInFreeDebug: true, - * // bundleInPaidRelease: true, - * // bundleInBeta: true, - * - * // whether to disable dev mode in custom build variants (by default only disabled in release) - * // for example: to disable dev mode in the staging build type (if configured) - * devDisabledInStaging: true, - * // The configuration property can be in the following formats - * // 'devDisabledIn${productFlavor}${buildType}' - * // 'devDisabledIn${buildType}' - * - * // the root of your project, i.e. where "package.json" lives - * root: "../../", - * - * // where to put the JS bundle asset in debug mode - * jsBundleDirDebug: "$buildDir/intermediates/assets/debug", - * - * // where to put the JS bundle asset in release mode - * jsBundleDirRelease: "$buildDir/intermediates/assets/release", - * - * // where to put drawable resources / React Native assets, e.g. the ones you use via - * // require('./image.png')), in debug mode - * resourcesDirDebug: "$buildDir/intermediates/res/merged/debug", - * - * // where to put drawable resources / React Native assets, e.g. the ones you use via - * // require('./image.png')), in release mode - * resourcesDirRelease: "$buildDir/intermediates/res/merged/release", - * - * // by default the gradle tasks are skipped if none of the JS files or assets change; this means - * // that we don't look at files in android/ or ios/ to determine whether the tasks are up to - * // date; if you have any other folders that you want to ignore for performance reasons (gradle - * // indexes the entire tree), add them here. Alternatively, if you have JS files in android/ - * // for example, you might want to remove it from here. - * inputExcludes: ["android/**", "ios/**"], - * - * // override which node gets called and with what additional arguments - * nodeExecutableAndArgs: ["node"], - * - * // supply additional arguments to the packager - * extraPackagerArgs: [] - * ] - */ - -project.ext.react = [ - enableHermes: true, // clean and rebuild if changing -] - -apply from: "../../node_modules/react-native/react.gradle" /** - * Set this to true to create two separate APKs instead of one: - * - An APK that only works on ARM devices - * - An APK that only works on x86 devices - * The advantage is the size of the APK is reduced by about 4MB. - * Upload all the APKs to the Play Store and people will download - * the correct one based on the CPU architecture of their device. + * This is the configuration block to customize your React Native Android app. + * By default you don't need to apply any configuration, just uncomment the lines you need. */ -def enableSeparateBuildPerCPUArchitecture = false +react { + /* Folders */ + // The root of your project, i.e. where "package.json" lives. Default is '..' + // root = file("../") + // The folder where the react-native NPM package is. Default is ../node_modules/react-native + // reactNativeDir = file("../node_modules/react-native") + // The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen + // codegenDir = file("../node_modules/@react-native/codegen") + // The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js + // cliFile = file("../node_modules/react-native/cli.js") + + /* Variants */ + // The list of variants to that are debuggable. For those we're going to + // skip the bundling of the JS bundle and the assets. By default is just 'debug'. + // If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants. + // debuggableVariants = ["liteDebug", "prodDebug"] + + /* Bundling */ + // A list containing the node command and its flags. Default is just 'node'. + // nodeExecutableAndArgs = ["node"] + // + // The command to run when bundling. By default is 'bundle' + // bundleCommand = "ram-bundle" + // + // The path to the CLI configuration file. Default is empty. + // bundleConfig = file(../rn-cli.config.js) + // + // The name of the generated asset file containing your JS bundle + // bundleAssetName = "MyApplication.android.bundle" + // + // The entry file for bundle generation. Default is 'index.android.js' or 'index.js' + // entryFile = file("../js/MyApplication.android.js") + // + // A list of extra flags to pass to the 'bundle' commands. + // See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle + // extraPackagerArgs = [] + + /* Hermes Commands */ + // The hermes compiler command to run. By default it is 'hermesc' + // hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc" + // + // The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map" + // hermesFlags = ["-O", "-output-source-map"] +} /** - * Run Proguard to shrink the Java bytecode in release builds. + * Set this to true to Run Proguard on Release builds to minify the Java bytecode. */ def enableProguardInReleaseBuilds = false /** - * The preferred build flavor of JavaScriptCore. + * The preferred build flavor of JavaScriptCore (JSC) * * For example, to use the international variant, you can use: * `def jscFlavor = 'org.webkit:android-jsc-intl:+'` * * The international variant includes ICU i18n library and necessary data * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that - * give correct results when using with locales other than en-US. Note that + * give correct results when using with locales other than en-US. Note that * this variant is about 6MiB larger per architecture than default. */ def jscFlavor = 'org.webkit:android-jsc:+' -/** - * Whether to enable the Hermes VM. - * - * This should be set on project.ext.react and that value will be read here. If it is not set - * on project.ext.react, JavaScript will not be compiled to Hermes Bytecode - * and the benefits of using Hermes will therefore be sharply reduced. - */ -def enableHermes = project.ext.react.get("enableHermes", false); - -/** - * Architectures to build native code for. - */ -def reactNativeArchitectures() { - def value = project.getProperties().get("reactNativeArchitectures") - return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"] -} - android { ndkVersion rootProject.ext.ndkVersion + buildToolsVersion rootProject.ext.buildToolsVersion + compileSdk rootProject.ext.compileSdkVersion - compileSdkVersion rootProject.ext.compileSdkVersion - + namespace "com.tinyquickstartreactnative" defaultConfig { applicationId "com.tinyquickstartreactnative" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" - buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() - - if (isNewArchitectureEnabled()) { - // We configure the CMake build only if you decide to opt-in for the New Architecture. - externalNativeBuild { - cmake { - arguments "-DPROJECT_BUILD_DIR=$buildDir", - "-DREACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid", - "-DREACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build", - "-DNODE_MODULES_DIR=$rootDir/../node_modules", - "-DANDROID_STL=c++_shared" - } - } - if (!enableSeparateBuildPerCPUArchitecture) { - ndk { - abiFilters (*reactNativeArchitectures()) - } - } - } - } - - if (isNewArchitectureEnabled()) { - // We configure the NDK build only if you decide to opt-in for the New Architecture. - externalNativeBuild { - cmake { - path "$projectDir/src/main/jni/CMakeLists.txt" - } - } - def reactAndroidProjectDir = project(':ReactAndroid').projectDir - def packageReactNdkDebugLibs = tasks.register("packageReactNdkDebugLibs", Copy) { - dependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck") - from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib") - into("$buildDir/react-ndk/exported") - } - def packageReactNdkReleaseLibs = tasks.register("packageReactNdkReleaseLibs", Copy) { - dependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck") - from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib") - into("$buildDir/react-ndk/exported") - } - afterEvaluate { - // If you wish to add a custom TurboModule or component locally, - // you should uncomment this line. - // preBuild.dependsOn("generateCodegenArtifactsFromSchema") - preDebugBuild.dependsOn(packageReactNdkDebugLibs) - preReleaseBuild.dependsOn(packageReactNdkReleaseLibs) - - // Due to a bug inside AGP, we have to explicitly set a dependency - // between configureCMakeDebug* tasks and the preBuild tasks. - // This can be removed once this is solved: https://issuetracker.google.com/issues/207403732 - configureCMakeRelWithDebInfo.dependsOn(preReleaseBuild) - configureCMakeDebug.dependsOn(preDebugBuild) - reactNativeArchitectures().each { architecture -> - tasks.findByName("configureCMakeDebug[${architecture}]")?.configure { - dependsOn("preDebugBuild") - } - tasks.findByName("configureCMakeRelWithDebInfo[${architecture}]")?.configure { - dependsOn("preReleaseBuild") - } - } - } - } - - splits { - abi { - reset() - enable enableSeparateBuildPerCPUArchitecture - universalApk false // If true, also generate a universal APK - include (*reactNativeArchitectures()) - } } signingConfigs { debug { @@ -220,7 +90,6 @@ android { keyPassword 'android' } } - namespace 'com.tinyquickstartreactnative' buildTypes { debug { signingConfig signingConfigs.debug @@ -233,84 +102,18 @@ android { proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" } } - - // applicationVariants are e.g. debug, release - applicationVariants.all { variant -> - variant.outputs.each { output -> - // For each separate APK per architecture, set a unique version code as described here: - // https://developer.android.com/studio/build/configure-apk-splits.html - // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc. - def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4] - def abi = output.getFilter(OutputFile.ABI) - if (abi != null) { // null for the universal-debug, universal-release variants - output.versionCodeOverride = - defaultConfig.versionCode * 1000 + versionCodes.get(abi) - } - - } - } } dependencies { - implementation fileTree(dir: "libs", include: ["*.jar"]) - - //noinspection GradleDynamicVersion - implementation "com.facebook.react:react-native:+" // From node_modules + // The version of react-native is set by the React Native Gradle Plugin + implementation("com.facebook.react:react-android") + implementation("com.facebook.react:flipper-integration") - implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" - - debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") { - exclude group:'com.facebook.fbjni' - } - - debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") { - exclude group:'com.facebook.flipper' - exclude group:'com.squareup.okhttp3', module:'okhttp' - } - - debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") { - exclude group:'com.facebook.flipper' - } - - if (enableHermes) { - //noinspection GradleDynamicVersion - implementation("com.facebook.react:hermes-engine:+") { // From node_modules - exclude group:'com.facebook.fbjni' - } + if (hermesEnabled.toBoolean()) { + implementation("com.facebook.react:hermes-android") } else { implementation jscFlavor } } -if (isNewArchitectureEnabled()) { - // If new architecture is enabled, we let you build RN from source - // Otherwise we fallback to a prebuilt .aar bundled in the NPM package. - // This will be applied to all the imported transtitive dependency. - configurations.all { - resolutionStrategy.dependencySubstitution { - substitute(module("com.facebook.react:react-native")) - .using(project(":ReactAndroid")) - .because("On New Architecture we're building React Native from source") - substitute(module("com.facebook.react:hermes-engine")) - .using(project(":ReactAndroid:hermes-engine")) - .because("On New Architecture we're building Hermes from source") - } - } -} - -// Run this once to be able to run the application with BUCK -// puts all compile dependencies into folder libs for BUCK to use -task copyDownloadableDepsToLibs(type: Copy) { - from configurations.implementation - into 'libs' -} - apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) - -def isNewArchitectureEnabled() { - // To opt-in for the New Architecture, you can either: - // - Set `newArchEnabled` to true inside the `gradle.properties` file - // - Invoke gradle with `-newArchEnabled=true` - // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true` - return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true" -} diff --git a/react_native/TinyQuickstartReactNative/android/app/src/debug/AndroidManifest.xml b/react_native/TinyQuickstartReactNative/android/app/src/debug/AndroidManifest.xml index 4b185bc..eb98c01 100644 --- a/react_native/TinyQuickstartReactNative/android/app/src/debug/AndroidManifest.xml +++ b/react_native/TinyQuickstartReactNative/android/app/src/debug/AndroidManifest.xml @@ -2,12 +2,8 @@ - - - - + tools:ignore="GoogleAppIndexingWarning"/> diff --git a/react_native/TinyQuickstartReactNative/android/app/src/debug/java/com/tinyquickstartreactnative/ReactNativeFlipper.java b/react_native/TinyQuickstartReactNative/android/app/src/debug/java/com/tinyquickstartreactnative/ReactNativeFlipper.java deleted file mode 100644 index fd537d4..0000000 --- a/react_native/TinyQuickstartReactNative/android/app/src/debug/java/com/tinyquickstartreactnative/ReactNativeFlipper.java +++ /dev/null @@ -1,73 +0,0 @@ -/** - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - *

This source code is licensed under the MIT license found in the LICENSE file in the root - * directory of this source tree. - */ -package com.tinyquickstartreactnative; - -import android.content.Context; -import com.facebook.flipper.android.AndroidFlipperClient; -import com.facebook.flipper.android.utils.FlipperUtils; -import com.facebook.flipper.core.FlipperClient; -import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin; -import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin; -import com.facebook.flipper.plugins.fresco.FrescoFlipperPlugin; -import com.facebook.flipper.plugins.inspector.DescriptorMapping; -import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin; -import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor; -import com.facebook.flipper.plugins.network.NetworkFlipperPlugin; -import com.facebook.flipper.plugins.react.ReactFlipperPlugin; -import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin; -import com.facebook.react.ReactInstanceEventListener; -import com.facebook.react.ReactInstanceManager; -import com.facebook.react.bridge.ReactContext; -import com.facebook.react.modules.network.NetworkingModule; -import okhttp3.OkHttpClient; - -public class ReactNativeFlipper { - public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) { - if (FlipperUtils.shouldEnableFlipper(context)) { - final FlipperClient client = AndroidFlipperClient.getInstance(context); - - client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults())); - client.addPlugin(new ReactFlipperPlugin()); - client.addPlugin(new DatabasesFlipperPlugin(context)); - client.addPlugin(new SharedPreferencesFlipperPlugin(context)); - client.addPlugin(CrashReporterPlugin.getInstance()); - - NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin(); - NetworkingModule.setCustomClientBuilder( - new NetworkingModule.CustomClientBuilder() { - @Override - public void apply(OkHttpClient.Builder builder) { - builder.addNetworkInterceptor(new FlipperOkhttpInterceptor(networkFlipperPlugin)); - } - }); - client.addPlugin(networkFlipperPlugin); - client.start(); - - // Fresco Plugin needs to ensure that ImagePipelineFactory is initialized - // Hence we run if after all native modules have been initialized - ReactContext reactContext = reactInstanceManager.getCurrentReactContext(); - if (reactContext == null) { - reactInstanceManager.addReactInstanceEventListener( - new ReactInstanceEventListener() { - @Override - public void onReactContextInitialized(ReactContext reactContext) { - reactInstanceManager.removeReactInstanceEventListener(this); - reactContext.runOnNativeModulesQueueThread( - new Runnable() { - @Override - public void run() { - client.addPlugin(new FrescoFlipperPlugin()); - } - }); - } - }); - } else { - client.addPlugin(new FrescoFlipperPlugin()); - } - } - } -} diff --git a/react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/MainActivity.java b/react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/MainActivity.java deleted file mode 100644 index 9ce5072..0000000 --- a/react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/MainActivity.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.tinyquickstartreactnative; - -import com.facebook.react.ReactActivity; -import com.facebook.react.ReactActivityDelegate; -import com.facebook.react.ReactRootView; - -public class MainActivity extends ReactActivity { - - /** - * Returns the name of the main component registered from JavaScript. This is used to schedule - * rendering of the component. - */ - @Override - protected String getMainComponentName() { - return "TinyQuickstartReactNative"; - } - - /** - * Returns the instance of the {@link ReactActivityDelegate}. There the RootView is created and - * you can specify the renderer you wish to use - the new renderer (Fabric) or the old renderer - * (Paper). - */ - @Override - protected ReactActivityDelegate createReactActivityDelegate() { - return new MainActivityDelegate(this, getMainComponentName()); - } - - public static class MainActivityDelegate extends ReactActivityDelegate { - public MainActivityDelegate(ReactActivity activity, String mainComponentName) { - super(activity, mainComponentName); - } - - @Override - protected ReactRootView createRootView() { - ReactRootView reactRootView = new ReactRootView(getContext()); - // If you opted-in for the New Architecture, we enable the Fabric Renderer. - reactRootView.setIsFabric(BuildConfig.IS_NEW_ARCHITECTURE_ENABLED); - return reactRootView; - } - - @Override - protected boolean isConcurrentRootEnabled() { - // If you opted-in for the New Architecture, we enable Concurrent Root (i.e. React 18). - // More on this on https://reactjs.org/blog/2022/03/29/react-v18.html - return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED; - } - } -} diff --git a/react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/MainActivity.kt b/react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/MainActivity.kt new file mode 100644 index 0000000..378ea1b --- /dev/null +++ b/react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/MainActivity.kt @@ -0,0 +1,22 @@ +package com.tinyquickstartreactnative + +import com.facebook.react.ReactActivity +import com.facebook.react.ReactActivityDelegate +import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled +import com.facebook.react.defaults.DefaultReactActivityDelegate + +class MainActivity : ReactActivity() { + + /** + * Returns the name of the main component registered from JavaScript. This is used to schedule + * rendering of the component. + */ + override fun getMainComponentName(): String = "TinyQuickstartReactNative" + + /** + * Returns the instance of the [ReactActivityDelegate]. We use [DefaultReactActivityDelegate] + * which allows you to enable New Architecture with a single boolean flags [fabricEnabled] + */ + override fun createReactActivityDelegate(): ReactActivityDelegate = + DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled) +} diff --git a/react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/MainApplication.java b/react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/MainApplication.java deleted file mode 100644 index 2e9f614..0000000 --- a/react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/MainApplication.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.tinyquickstartreactnative; - -import android.app.Application; -import android.content.Context; -import com.facebook.react.PackageList; -import com.facebook.react.ReactApplication; -import com.facebook.react.ReactInstanceManager; -import com.facebook.react.ReactNativeHost; -import com.facebook.react.ReactPackage; -import com.facebook.react.config.ReactFeatureFlags; -import com.facebook.soloader.SoLoader; -import com.tinyquickstartreactnative.newarchitecture.MainApplicationReactNativeHost; -import java.lang.reflect.InvocationTargetException; -import java.util.List; - -public class MainApplication extends Application implements ReactApplication { - - private final ReactNativeHost mReactNativeHost = - new ReactNativeHost(this) { - @Override - public boolean getUseDeveloperSupport() { - return BuildConfig.DEBUG; - } - - @Override - protected List getPackages() { - @SuppressWarnings("UnnecessaryLocalVariable") - List packages = new PackageList(this).getPackages(); - // Packages that cannot be autolinked yet can be added manually here, for example: - // packages.add(new MyReactNativePackage()); - return packages; - } - - @Override - protected String getJSMainModuleName() { - return "index"; - } - }; - - private final ReactNativeHost mNewArchitectureNativeHost = - new MainApplicationReactNativeHost(this); - - @Override - public ReactNativeHost getReactNativeHost() { - if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) { - return mNewArchitectureNativeHost; - } else { - return mReactNativeHost; - } - } - - @Override - public void onCreate() { - super.onCreate(); - // If you opted-in for the New Architecture, we enable the TurboModule system - ReactFeatureFlags.useTurboModules = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED; - SoLoader.init(this, /* native exopackage */ false); - initializeFlipper(this, getReactNativeHost().getReactInstanceManager()); - } - - /** - * Loads Flipper in React Native templates. Call this in the onCreate method with something like - * initializeFlipper(this, getReactNativeHost().getReactInstanceManager()); - * - * @param context - * @param reactInstanceManager - */ - private static void initializeFlipper( - Context context, ReactInstanceManager reactInstanceManager) { - if (BuildConfig.DEBUG) { - try { - /* - We use reflection here to pick up the class that initializes Flipper, - since Flipper library is not available in release mode - */ - Class aClass = Class.forName("com.tinyquickstartreactnative.ReactNativeFlipper"); - aClass - .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class) - .invoke(null, context, reactInstanceManager); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } catch (NoSuchMethodException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (InvocationTargetException e) { - e.printStackTrace(); - } - } - } -} diff --git a/react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/MainApplication.kt b/react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/MainApplication.kt new file mode 100644 index 0000000..54edd26 --- /dev/null +++ b/react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/MainApplication.kt @@ -0,0 +1,46 @@ +package com.tinyquickstartreactnative + +import android.app.Application +import com.facebook.react.PackageList +import com.facebook.react.ReactApplication +import com.facebook.react.ReactHost +import com.facebook.react.ReactNativeHost +import com.facebook.react.ReactPackage +import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load +import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost +import com.tinyquickstartreactnative.newarchitecture.MainApplicationReactNativeHost +import com.facebook.react.defaults.DefaultReactNativeHost +import com.facebook.react.flipper.ReactNativeFlipper +import com.facebook.soloader.SoLoader + +class MainApplication : Application(), ReactApplication { + + override val reactNativeHost: ReactNativeHost = + object : DefaultReactNativeHost(this) { + override fun getPackages(): List = + PackageList(this).packages.apply { + // Packages that cannot be autolinked yet can be added manually here, for example: + // add(MyReactNativePackage()) + } + + override fun getJSMainModuleName(): String = "index" + + override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG + + override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED + override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED + } + + override val reactHost: ReactHost + get() = getDefaultReactHost(this.applicationContext, reactNativeHost) + + override fun onCreate() { + super.onCreate() + SoLoader.init(this, false) + if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) { + // If you opted-in for the New Architecture, we load the native entry point for this app. + load() + } + ReactNativeFlipper.initializeFlipper(this, reactNativeHost.reactInstanceManager) + } +} diff --git a/react_native/TinyQuickstartReactNative/android/build.gradle b/react_native/TinyQuickstartReactNative/android/build.gradle index 819070a..680bf1e 100644 --- a/react_native/TinyQuickstartReactNative/android/build.gradle +++ b/react_native/TinyQuickstartReactNative/android/build.gradle @@ -2,32 +2,26 @@ buildscript { ext { - buildToolsVersion = "33.0.0" + buildToolsVersion = "34.0.0" minSdkVersion = 21 - compileSdkVersion = 33 - targetSdkVersion = 33 - - if (System.properties['os.arch'] == "aarch64") { - // For M1 Users we need to use the NDK 24 which added support for aarch64 - ndkVersion = "24.0.8215888" - } else { - // Otherwise we default to the side-by-side NDK version from AGP. - ndkVersion = "21.4.7075529" - } + compileSdkVersion = 34 + targetSdkVersion = 34 + ndkVersion = "25.1.8937393" + kotlinVersion = "1.8.0" } repositories { google() mavenCentral() } dependencies { - classpath('com.android.tools.build:gradle:7.4.2') + classpath("com.android.tools.build:gradle") classpath("com.facebook.react:react-native-gradle-plugin") - classpath("de.undercouch:gradle-download-task:5.0.1") - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin") } } +apply plugin: "com.facebook.react.rootproject" + allprojects { repositories { maven { diff --git a/react_native/TinyQuickstartReactNative/android/gradle.properties b/react_native/TinyQuickstartReactNative/android/gradle.properties index fa4feae..cc86a72 100644 --- a/react_native/TinyQuickstartReactNative/android/gradle.properties +++ b/react_native/TinyQuickstartReactNative/android/gradle.properties @@ -24,9 +24,6 @@ android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true -# Version of flipper SDK to use with React Native -FLIPPER_VERSION=0.125.0 - # Use this property to specify which architecture you want to build. # You can also override it from the CLI using # ./gradlew -PreactNativeArchitectures=x86_64 @@ -38,3 +35,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64 # to write custom TurboModules/Fabric components OR use libraries that # are providing them. newArchEnabled=false + +# Use this property to enable or disable the Hermes JS engine. +# If set to false, you will be using JSC instead. +hermesEnabled=true \ No newline at end of file diff --git a/react_native/TinyQuickstartReactNative/android/gradle/wrapper/gradle-wrapper.properties b/react_native/TinyQuickstartReactNative/android/gradle/wrapper/gradle-wrapper.properties index 8fad3f5..d11cdd9 100644 --- a/react_native/TinyQuickstartReactNative/android/gradle/wrapper/gradle-wrapper.properties +++ b/react_native/TinyQuickstartReactNative/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/react_native/TinyQuickstartReactNative/android/gradlew b/react_native/TinyQuickstartReactNative/android/gradlew index 1b6c787..0adc8e1 100755 --- a/react_native/TinyQuickstartReactNative/android/gradlew +++ b/react_native/TinyQuickstartReactNative/android/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,6 +198,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in @@ -205,6 +214,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/react_native/TinyQuickstartReactNative/android/gradlew.bat b/react_native/TinyQuickstartReactNative/android/gradlew.bat index ac1b06f..6689b85 100644 --- a/react_native/TinyQuickstartReactNative/android/gradlew.bat +++ b/react_native/TinyQuickstartReactNative/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/react_native/TinyQuickstartReactNative/android/settings.gradle b/react_native/TinyQuickstartReactNative/android/settings.gradle index 2632939..eedacf1 100644 --- a/react_native/TinyQuickstartReactNative/android/settings.gradle +++ b/react_native/TinyQuickstartReactNative/android/settings.gradle @@ -1,11 +1,4 @@ rootProject.name = 'TinyQuickstartReactNative' apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) include ':app' -includeBuild('../node_modules/react-native-gradle-plugin') - -if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") { - include(":ReactAndroid") - project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid') - include(":ReactAndroid:hermes-engine") - project(":ReactAndroid:hermes-engine").projectDir = file('../node_modules/react-native/ReactAndroid/hermes-engine') -} +includeBuild('../node_modules/@react-native/gradle-plugin') \ No newline at end of file diff --git a/react_native/TinyQuickstartReactNative/ios/Podfile.lock b/react_native/TinyQuickstartReactNative/ios/Podfile.lock index d38ecd6..40a487f 100644 --- a/react_native/TinyQuickstartReactNative/ios/Podfile.lock +++ b/react_native/TinyQuickstartReactNative/ios/Podfile.lock @@ -1117,8 +1117,6 @@ PODS: - React-jsi (= 0.73.6) - React-logger (= 0.73.6) - React-perflogger (= 0.73.6) - - RNCClipboard (1.5.1): - - React-Core - RNGestureHandler (2.15.0): - glog - RCT-Folly (= 2022.05.16.00) @@ -1205,7 +1203,6 @@ DEPENDENCIES: - React-runtimescheduler (from `../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler`) - React-utils (from `../node_modules/react-native/ReactCommon/react/utils`) - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - - "RNCClipboard (from `../node_modules/@react-native-community/clipboard`)" - RNGestureHandler (from `../node_modules/react-native-gesture-handler`) - RNScreens (from `../node_modules/react-native-screens`) - Yoga (from `../node_modules/react-native/ReactCommon/yoga`) @@ -1327,8 +1324,6 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/react/utils" ReactCommon: :path: "../node_modules/react-native/ReactCommon" - RNCClipboard: - :path: "../node_modules/@react-native-community/clipboard" RNGestureHandler: :path: "../node_modules/react-native-gesture-handler" RNScreens: @@ -1399,7 +1394,6 @@ SPEC CHECKSUMS: React-runtimescheduler: 9636eee762c699ca7c85751a359101797e4c8b3b React-utils: d16c1d2251c088ad817996621947d0ac8167b46c ReactCommon: 2aa35648354bd4c4665b9a5084a7d37097b89c10 - RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495 RNGestureHandler: 67fb54b3e6ca338a8044e85cd6f340265aa41091 RNScreens: 17e2f657f1b09a71ec3c821368a04acbb7ebcb46 SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 diff --git a/react_native/TinyQuickstartReactNative/package.json b/react_native/TinyQuickstartReactNative/package.json index 7731735..3e3d101 100644 --- a/react_native/TinyQuickstartReactNative/package.json +++ b/react_native/TinyQuickstartReactNative/package.json @@ -13,7 +13,6 @@ "lint": "eslint ." }, "dependencies": { - "@react-native-community/clipboard": "^1.5.1", "@react-navigation/native": "^6.0.13", "@react-navigation/native-stack": "^6.9.0", "@react-navigation/stack": "^6.3.1", @@ -26,6 +25,7 @@ "react": "18.2.0", "react-native": "0.73.6", "react-native-gesture-handler": "^2.7.0", + "react-native-gradle-plugin": "^0.71.19", "react-native-plaid-link-sdk": "^11.0.3", "react-native-safe-area-context": "^4.4.1", "react-native-screens": "^3.18.0", @@ -47,7 +47,8 @@ "jest": "^29.6.3", "prettier": "2.8.8", "react-test-renderer": "18.2.0", - "typescript": "5.0.4" }, + "typescript": "5.0.4" + }, "jest": { "preset": "react-native" }, From 1354bc6892c11879c1777ae7bf57198def35f471 Mon Sep 17 00:00:00 2001 From: Alex Hoffer Date: Fri, 22 Mar 2024 17:17:05 -0700 Subject: [PATCH 6/9] upgrade plaid rn --- react_native/TinyQuickstartReactNative/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/react_native/TinyQuickstartReactNative/package.json b/react_native/TinyQuickstartReactNative/package.json index 3e3d101..865f070 100644 --- a/react_native/TinyQuickstartReactNative/package.json +++ b/react_native/TinyQuickstartReactNative/package.json @@ -26,7 +26,7 @@ "react-native": "0.73.6", "react-native-gesture-handler": "^2.7.0", "react-native-gradle-plugin": "^0.71.19", - "react-native-plaid-link-sdk": "^11.0.3", + "react-native-plaid-link-sdk": "^11.6.0", "react-native-safe-area-context": "^4.4.1", "react-native-screens": "^3.18.0", "react-scripts": "^5.0.1", From 9f64d9d895109ae555a0dc3d9a8d2f9082e8f0c5 Mon Sep 17 00:00:00 2001 From: Alex Hoffer Date: Mon, 25 Mar 2024 12:18:11 -0700 Subject: [PATCH 7/9] add workaround to npm issue https://github.com/facebook/create-react-app/issues/13080 --- react_native/TinyQuickstartReactNative/package.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/react_native/TinyQuickstartReactNative/package.json b/react_native/TinyQuickstartReactNative/package.json index 865f070..71bc3b5 100644 --- a/react_native/TinyQuickstartReactNative/package.json +++ b/react_native/TinyQuickstartReactNative/package.json @@ -30,7 +30,7 @@ "react-native-safe-area-context": "^4.4.1", "react-native-screens": "^3.18.0", "react-scripts": "^5.0.1", - "typescript": "^4.8.4" + "typescript": "5.0.4" }, "devDependencies": { "@babel/core": "^7.20.0", @@ -49,6 +49,11 @@ "react-test-renderer": "18.2.0", "typescript": "5.0.4" }, + "overrides": { + "@typescript-eslint/typescript-estree": "^5.57.1", + "fork-ts-checker-webpack-plugin": "^6.5.3", + "typescript": "5.0.4" + }, "jest": { "preset": "react-native" }, From 071b0758d7e722c800904910c517c8b67bc74e86 Mon Sep 17 00:00:00 2001 From: Alex Hoffer Date: Mon, 25 Mar 2024 17:58:58 -0700 Subject: [PATCH 8/9] upgrade to react .74-rc5 --- .../TinyQuickstartReactNative/.gitignore | 12 +- .../TinyQuickstartReactNative/Gemfile.lock | 23 +- .../android/app/build.gradle | 4 +- .../MainApplication.kt | 19 +- .../MainApplicationReactNativeHost.java | 116 -- .../components/MainComponentsRegistry.java | 36 - ...ApplicationTurboModuleManagerDelegate.java | 48 - .../android/app/src/main/jni/CMakeLists.txt | 7 - .../jni/MainApplicationModuleProvider.cpp | 32 - .../main/jni/MainApplicationModuleProvider.h | 16 - ...nApplicationTurboModuleManagerDelegate.cpp | 45 - ...ainApplicationTurboModuleManagerDelegate.h | 38 - .../src/main/jni/MainComponentsRegistry.cpp | 65 -- .../app/src/main/jni/MainComponentsRegistry.h | 32 - .../android/app/src/main/jni/OnLoad.cpp | 11 - .../res/drawable/rn_edit_text_material.xml | 1 + .../android/build.gradle | 11 +- .../android/gradle.properties | 4 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../TinyQuickstartReactNative/android/gradlew | 12 +- .../android/gradlew.bat | 20 +- .../TinyQuickstartReactNative/ios/Podfile | 19 +- .../ios/Podfile.lock | 1014 +++++++++-------- .../project.pbxproj | 6 +- .../TinyQuickstartReactNative/AppDelegate.mm | 5 +- .../ios/TinyQuickstartReactNative/Info.plist | 2 +- .../TinyQuickstartReactNative/metro.config.js | 2 +- .../TinyQuickstartReactNative/package.json | 27 +- 28 files changed, 607 insertions(+), 1022 deletions(-) delete mode 100644 react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/newarchitecture/MainApplicationReactNativeHost.java delete mode 100644 react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/newarchitecture/components/MainComponentsRegistry.java delete mode 100644 react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java delete mode 100644 react_native/TinyQuickstartReactNative/android/app/src/main/jni/CMakeLists.txt delete mode 100644 react_native/TinyQuickstartReactNative/android/app/src/main/jni/MainApplicationModuleProvider.cpp delete mode 100644 react_native/TinyQuickstartReactNative/android/app/src/main/jni/MainApplicationModuleProvider.h delete mode 100644 react_native/TinyQuickstartReactNative/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp delete mode 100644 react_native/TinyQuickstartReactNative/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h delete mode 100644 react_native/TinyQuickstartReactNative/android/app/src/main/jni/MainComponentsRegistry.cpp delete mode 100644 react_native/TinyQuickstartReactNative/android/app/src/main/jni/MainComponentsRegistry.h delete mode 100644 react_native/TinyQuickstartReactNative/android/app/src/main/jni/OnLoad.cpp diff --git a/react_native/TinyQuickstartReactNative/.gitignore b/react_native/TinyQuickstartReactNative/.gitignore index 2423126..2de5345 100644 --- a/react_native/TinyQuickstartReactNative/.gitignore +++ b/react_native/TinyQuickstartReactNative/.gitignore @@ -20,7 +20,7 @@ DerivedData *.hmap *.ipa *.xcuserstate -ios/.xcode.env.local +**/.xcode.env.local # Android/IntelliJ # @@ -60,5 +60,13 @@ buck-out/ *.jsbundle # Ruby / CocoaPods -/ios/Pods/ +**/Pods/ /vendor/bundle/ + +# Yarn +.yarn/* +!.yarn/patches +!.yarn/plugins +!.yarn/releases +!.yarn/sdks +!.yarn/versions diff --git a/react_native/TinyQuickstartReactNative/Gemfile.lock b/react_native/TinyQuickstartReactNative/Gemfile.lock index 3030fde..848ca07 100644 --- a/react_native/TinyQuickstartReactNative/Gemfile.lock +++ b/react_native/TinyQuickstartReactNative/Gemfile.lock @@ -3,15 +3,10 @@ GEM specs: CFPropertyList (3.0.6) rexml - activesupport (7.1.2) - base64 - bigdecimal + activesupport (7.0.8.1) concurrent-ruby (~> 1.0, >= 1.0.2) - connection_pool (>= 2.2.5) - drb i18n (>= 1.6, < 2) minitest (>= 5.1) - mutex_m tzinfo (~> 2.0) addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) @@ -19,8 +14,6 @@ GEM httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) - base64 (0.2.0) - bigdecimal (3.1.5) claide (1.1.0) cocoapods (1.14.3) addressable (~> 2.8) @@ -60,10 +53,7 @@ GEM netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.2.2) - connection_pool (2.4.1) - drb (2.2.0) - ruby2_keywords + concurrent-ruby (1.2.3) escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) @@ -72,19 +62,17 @@ GEM fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (1.14.1) + i18n (1.14.4) concurrent-ruby (~> 1.0) json (2.7.1) - minitest (5.20.0) + minitest (5.22.3) molinillo (0.8.0) - mutex_m (0.2.0) nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) public_suffix (4.0.7) rexml (3.2.6) ruby-macho (2.5.1) - ruby2_keywords (0.0.5) typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) @@ -101,7 +89,8 @@ PLATFORMS ruby DEPENDENCIES - cocoapods (~> 1.11, >= 1.11.2) + activesupport (>= 6.1.7.5, < 7.1.0) + cocoapods (>= 1.13, < 1.15) RUBY VERSION ruby 2.7.5p203 diff --git a/react_native/TinyQuickstartReactNative/android/app/build.gradle b/react_native/TinyQuickstartReactNative/android/app/build.gradle index e96ddc9..c73b77f 100644 --- a/react_native/TinyQuickstartReactNative/android/app/build.gradle +++ b/react_native/TinyQuickstartReactNative/android/app/build.gradle @@ -90,6 +90,9 @@ android { keyPassword 'android' } } + buildFeatures { + buildConfig = true + } buildTypes { debug { signingConfig signingConfigs.debug @@ -107,7 +110,6 @@ android { dependencies { // The version of react-native is set by the React Native Gradle Plugin implementation("com.facebook.react:react-android") - implementation("com.facebook.react:flipper-integration") if (hermesEnabled.toBoolean()) { implementation("com.facebook.react:hermes-android") diff --git a/react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/MainApplication.kt b/react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/MainApplication.kt index 54edd26..2c3c431 100644 --- a/react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/MainApplication.kt +++ b/react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/MainApplication.kt @@ -8,13 +8,11 @@ import com.facebook.react.ReactNativeHost import com.facebook.react.ReactPackage import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost -import com.tinyquickstartreactnative.newarchitecture.MainApplicationReactNativeHost import com.facebook.react.defaults.DefaultReactNativeHost -import com.facebook.react.flipper.ReactNativeFlipper import com.facebook.soloader.SoLoader - + class MainApplication : Application(), ReactApplication { - + override val reactNativeHost: ReactNativeHost = object : DefaultReactNativeHost(this) { override fun getPackages(): List = @@ -22,18 +20,18 @@ class MainApplication : Application(), ReactApplication { // Packages that cannot be autolinked yet can be added manually here, for example: // add(MyReactNativePackage()) } - + override fun getJSMainModuleName(): String = "index" - + override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG - + override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED } - + override val reactHost: ReactHost - get() = getDefaultReactHost(this.applicationContext, reactNativeHost) - + get() = getDefaultReactHost(applicationContext, reactNativeHost) + override fun onCreate() { super.onCreate() SoLoader.init(this, false) @@ -41,6 +39,5 @@ class MainApplication : Application(), ReactApplication { // If you opted-in for the New Architecture, we load the native entry point for this app. load() } - ReactNativeFlipper.initializeFlipper(this, reactNativeHost.reactInstanceManager) } } diff --git a/react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/newarchitecture/MainApplicationReactNativeHost.java b/react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/newarchitecture/MainApplicationReactNativeHost.java deleted file mode 100644 index 431fc5d..0000000 --- a/react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/newarchitecture/MainApplicationReactNativeHost.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.tinyquickstartreactnative.newarchitecture; - -import android.app.Application; -import androidx.annotation.NonNull; -import com.facebook.react.PackageList; -import com.facebook.react.ReactInstanceManager; -import com.facebook.react.ReactNativeHost; -import com.facebook.react.ReactPackage; -import com.facebook.react.ReactPackageTurboModuleManagerDelegate; -import com.facebook.react.bridge.JSIModulePackage; -import com.facebook.react.bridge.JSIModuleProvider; -import com.facebook.react.bridge.JSIModuleSpec; -import com.facebook.react.bridge.JSIModuleType; -import com.facebook.react.bridge.JavaScriptContextHolder; -import com.facebook.react.bridge.ReactApplicationContext; -import com.facebook.react.bridge.UIManager; -import com.facebook.react.fabric.ComponentFactory; -import com.facebook.react.fabric.CoreComponentsRegistry; -import com.facebook.react.fabric.FabricJSIModuleProvider; -import com.facebook.react.fabric.ReactNativeConfig; -import com.facebook.react.uimanager.ViewManagerRegistry; -import com.tinyquickstartreactnative.BuildConfig; -import com.tinyquickstartreactnative.newarchitecture.components.MainComponentsRegistry; -import com.tinyquickstartreactnative.newarchitecture.modules.MainApplicationTurboModuleManagerDelegate; -import java.util.ArrayList; -import java.util.List; - -/** - * A {@link ReactNativeHost} that helps you load everything needed for the New Architecture, both - * TurboModule delegates and the Fabric Renderer. - * - *

Please note that this class is used ONLY if you opt-in for the New Architecture (see the - * `newArchEnabled` property). Is ignored otherwise. - */ -public class MainApplicationReactNativeHost extends ReactNativeHost { - public MainApplicationReactNativeHost(Application application) { - super(application); - } - - @Override - public boolean getUseDeveloperSupport() { - return BuildConfig.DEBUG; - } - - @Override - protected List getPackages() { - List packages = new PackageList(this).getPackages(); - // Packages that cannot be autolinked yet can be added manually here, for example: - // packages.add(new MyReactNativePackage()); - // TurboModules must also be loaded here providing a valid TurboReactPackage implementation: - // packages.add(new TurboReactPackage() { ... }); - // If you have custom Fabric Components, their ViewManagers should also be loaded here - // inside a ReactPackage. - return packages; - } - - @Override - protected String getJSMainModuleName() { - return "index"; - } - - @NonNull - @Override - protected ReactPackageTurboModuleManagerDelegate.Builder - getReactPackageTurboModuleManagerDelegateBuilder() { - // Here we provide the ReactPackageTurboModuleManagerDelegate Builder. This is necessary - // for the new architecture and to use TurboModules correctly. - return new MainApplicationTurboModuleManagerDelegate.Builder(); - } - - @Override - protected JSIModulePackage getJSIModulePackage() { - return new JSIModulePackage() { - @Override - public List getJSIModules( - final ReactApplicationContext reactApplicationContext, - final JavaScriptContextHolder jsContext) { - final List specs = new ArrayList<>(); - - // Here we provide a new JSIModuleSpec that will be responsible of providing the - // custom Fabric Components. - specs.add( - new JSIModuleSpec() { - @Override - public JSIModuleType getJSIModuleType() { - return JSIModuleType.UIManager; - } - - @Override - public JSIModuleProvider getJSIModuleProvider() { - final ComponentFactory componentFactory = new ComponentFactory(); - CoreComponentsRegistry.register(componentFactory); - - // Here we register a Components Registry. - // The one that is generated with the template contains no components - // and just provides you the one from React Native core. - MainComponentsRegistry.register(componentFactory); - - final ReactInstanceManager reactInstanceManager = getReactInstanceManager(); - - ViewManagerRegistry viewManagerRegistry = - new ViewManagerRegistry( - reactInstanceManager.getOrCreateViewManagers(reactApplicationContext)); - - return new FabricJSIModuleProvider( - reactApplicationContext, - componentFactory, - ReactNativeConfig.DEFAULT_CONFIG, - viewManagerRegistry); - } - }); - return specs; - } - }; - } -} diff --git a/react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/newarchitecture/components/MainComponentsRegistry.java b/react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/newarchitecture/components/MainComponentsRegistry.java deleted file mode 100644 index d7f12db..0000000 --- a/react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/newarchitecture/components/MainComponentsRegistry.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.tinyquickstartreactnative.newarchitecture.components; - -import com.facebook.jni.HybridData; -import com.facebook.proguard.annotations.DoNotStrip; -import com.facebook.react.fabric.ComponentFactory; -import com.facebook.soloader.SoLoader; - -/** - * Class responsible to load the custom Fabric Components. This class has native methods and needs a - * corresponding C++ implementation/header file to work correctly (already placed inside the jni/ - * folder for you). - * - *

Please note that this class is used ONLY if you opt-in for the New Architecture (see the - * `newArchEnabled` property). Is ignored otherwise. - */ -@DoNotStrip -public class MainComponentsRegistry { - static { - SoLoader.loadLibrary("fabricjni"); - } - - @DoNotStrip private final HybridData mHybridData; - - @DoNotStrip - private native HybridData initHybrid(ComponentFactory componentFactory); - - @DoNotStrip - private MainComponentsRegistry(ComponentFactory componentFactory) { - mHybridData = initHybrid(componentFactory); - } - - @DoNotStrip - public static MainComponentsRegistry register(ComponentFactory componentFactory) { - return new MainComponentsRegistry(componentFactory); - } -} diff --git a/react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java b/react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java deleted file mode 100644 index fc66618..0000000 --- a/react_native/TinyQuickstartReactNative/android/app/src/main/java/com/tinyquickstartreactnative/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.tinyquickstartreactnative.newarchitecture.modules; - -import com.facebook.jni.HybridData; -import com.facebook.react.ReactPackage; -import com.facebook.react.ReactPackageTurboModuleManagerDelegate; -import com.facebook.react.bridge.ReactApplicationContext; -import com.facebook.soloader.SoLoader; -import java.util.List; - -/** - * Class responsible to load the TurboModules. This class has native methods and needs a - * corresponding C++ implementation/header file to work correctly (already placed inside the jni/ - * folder for you). - * - *

Please note that this class is used ONLY if you opt-in for the New Architecture (see the - * `newArchEnabled` property). Is ignored otherwise. - */ -public class MainApplicationTurboModuleManagerDelegate - extends ReactPackageTurboModuleManagerDelegate { - - private static volatile boolean sIsSoLibraryLoaded; - - protected MainApplicationTurboModuleManagerDelegate( - ReactApplicationContext reactApplicationContext, List packages) { - super(reactApplicationContext, packages); - } - - protected native HybridData initHybrid(); - - native boolean canCreateTurboModule(String moduleName); - - public static class Builder extends ReactPackageTurboModuleManagerDelegate.Builder { - protected MainApplicationTurboModuleManagerDelegate build( - ReactApplicationContext context, List packages) { - return new MainApplicationTurboModuleManagerDelegate(context, packages); - } - } - - @Override - protected synchronized void maybeLoadOtherSoLibraries() { - if (!sIsSoLibraryLoaded) { - // If you change the name of your application .so file in the Android.mk file, - // make sure you update the name here as well. - SoLoader.loadLibrary("tinyquickstartreactnative_appmodules"); - sIsSoLibraryLoaded = true; - } - } -} diff --git a/react_native/TinyQuickstartReactNative/android/app/src/main/jni/CMakeLists.txt b/react_native/TinyQuickstartReactNative/android/app/src/main/jni/CMakeLists.txt deleted file mode 100644 index 769ebba..0000000 --- a/react_native/TinyQuickstartReactNative/android/app/src/main/jni/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -cmake_minimum_required(VERSION 3.13) - -# Define the library name here. -project(tinyquickstartreactnative_appmodules) - -# This file includes all the necessary to let you build your application with the New Architecture. -include(${REACT_ANDROID_DIR}/cmake-utils/ReactNative-application.cmake) diff --git a/react_native/TinyQuickstartReactNative/android/app/src/main/jni/MainApplicationModuleProvider.cpp b/react_native/TinyQuickstartReactNative/android/app/src/main/jni/MainApplicationModuleProvider.cpp deleted file mode 100644 index 26162dd..0000000 --- a/react_native/TinyQuickstartReactNative/android/app/src/main/jni/MainApplicationModuleProvider.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "MainApplicationModuleProvider.h" - -#include -#include - -namespace facebook { -namespace react { - -std::shared_ptr MainApplicationModuleProvider( - const std::string &moduleName, - const JavaTurboModule::InitParams ¶ms) { - // Here you can provide your own module provider for TurboModules coming from - // either your application or from external libraries. The approach to follow - // is similar to the following (for a library called `samplelibrary`: - // - // auto module = samplelibrary_ModuleProvider(moduleName, params); - // if (module != nullptr) { - // return module; - // } - // return rncore_ModuleProvider(moduleName, params); - - // Module providers autolinked by RN CLI - auto rncli_module = rncli_ModuleProvider(moduleName, params); - if (rncli_module != nullptr) { - return rncli_module; - } - - return rncore_ModuleProvider(moduleName, params); -} - -} // namespace react -} // namespace facebook diff --git a/react_native/TinyQuickstartReactNative/android/app/src/main/jni/MainApplicationModuleProvider.h b/react_native/TinyQuickstartReactNative/android/app/src/main/jni/MainApplicationModuleProvider.h deleted file mode 100644 index b38ccf5..0000000 --- a/react_native/TinyQuickstartReactNative/android/app/src/main/jni/MainApplicationModuleProvider.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include -#include - -#include - -namespace facebook { -namespace react { - -std::shared_ptr MainApplicationModuleProvider( - const std::string &moduleName, - const JavaTurboModule::InitParams ¶ms); - -} // namespace react -} // namespace facebook diff --git a/react_native/TinyQuickstartReactNative/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp b/react_native/TinyQuickstartReactNative/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp deleted file mode 100644 index 5fd688c..0000000 --- a/react_native/TinyQuickstartReactNative/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp +++ /dev/null @@ -1,45 +0,0 @@ -#include "MainApplicationTurboModuleManagerDelegate.h" -#include "MainApplicationModuleProvider.h" - -namespace facebook { -namespace react { - -jni::local_ref -MainApplicationTurboModuleManagerDelegate::initHybrid( - jni::alias_ref) { - return makeCxxInstance(); -} - -void MainApplicationTurboModuleManagerDelegate::registerNatives() { - registerHybrid({ - makeNativeMethod( - "initHybrid", MainApplicationTurboModuleManagerDelegate::initHybrid), - makeNativeMethod( - "canCreateTurboModule", - MainApplicationTurboModuleManagerDelegate::canCreateTurboModule), - }); -} - -std::shared_ptr -MainApplicationTurboModuleManagerDelegate::getTurboModule( - const std::string &name, - const std::shared_ptr &jsInvoker) { - // Not implemented yet: provide pure-C++ NativeModules here. - return nullptr; -} - -std::shared_ptr -MainApplicationTurboModuleManagerDelegate::getTurboModule( - const std::string &name, - const JavaTurboModule::InitParams ¶ms) { - return MainApplicationModuleProvider(name, params); -} - -bool MainApplicationTurboModuleManagerDelegate::canCreateTurboModule( - const std::string &name) { - return getTurboModule(name, nullptr) != nullptr || - getTurboModule(name, {.moduleName = name}) != nullptr; -} - -} // namespace react -} // namespace facebook diff --git a/react_native/TinyQuickstartReactNative/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h b/react_native/TinyQuickstartReactNative/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h deleted file mode 100644 index e95f462..0000000 --- a/react_native/TinyQuickstartReactNative/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h +++ /dev/null @@ -1,38 +0,0 @@ -#include -#include - -#include -#include - -namespace facebook { -namespace react { - -class MainApplicationTurboModuleManagerDelegate - : public jni::HybridClass< - MainApplicationTurboModuleManagerDelegate, - TurboModuleManagerDelegate> { - public: - // Adapt it to the package you used for your Java class. - static constexpr auto kJavaDescriptor = - "Lcom/tinyquickstartreactnative/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate;"; - - static jni::local_ref initHybrid(jni::alias_ref); - - static void registerNatives(); - - std::shared_ptr getTurboModule( - const std::string &name, - const std::shared_ptr &jsInvoker) override; - std::shared_ptr getTurboModule( - const std::string &name, - const JavaTurboModule::InitParams ¶ms) override; - - /** - * Test-only method. Allows user to verify whether a TurboModule can be - * created by instances of this class. - */ - bool canCreateTurboModule(const std::string &name); -}; - -} // namespace react -} // namespace facebook diff --git a/react_native/TinyQuickstartReactNative/android/app/src/main/jni/MainComponentsRegistry.cpp b/react_native/TinyQuickstartReactNative/android/app/src/main/jni/MainComponentsRegistry.cpp deleted file mode 100644 index 54f598a..0000000 --- a/react_native/TinyQuickstartReactNative/android/app/src/main/jni/MainComponentsRegistry.cpp +++ /dev/null @@ -1,65 +0,0 @@ -#include "MainComponentsRegistry.h" - -#include -#include -#include -#include -#include - -namespace facebook { -namespace react { - -MainComponentsRegistry::MainComponentsRegistry(ComponentFactory *delegate) {} - -std::shared_ptr -MainComponentsRegistry::sharedProviderRegistry() { - auto providerRegistry = CoreComponentsRegistry::sharedProviderRegistry(); - - // Autolinked providers registered by RN CLI - rncli_registerProviders(providerRegistry); - - // Custom Fabric Components go here. You can register custom - // components coming from your App or from 3rd party libraries here. - // - // providerRegistry->add(concreteComponentDescriptorProvider< - // AocViewerComponentDescriptor>()); - return providerRegistry; -} - -jni::local_ref -MainComponentsRegistry::initHybrid( - jni::alias_ref, - ComponentFactory *delegate) { - auto instance = makeCxxInstance(delegate); - - auto buildRegistryFunction = - [](EventDispatcher::Weak const &eventDispatcher, - ContextContainer::Shared const &contextContainer) - -> ComponentDescriptorRegistry::Shared { - auto registry = MainComponentsRegistry::sharedProviderRegistry() - ->createComponentDescriptorRegistry( - {eventDispatcher, contextContainer}); - - auto mutableRegistry = - std::const_pointer_cast(registry); - - mutableRegistry->setFallbackComponentDescriptor( - std::make_shared( - ComponentDescriptorParameters{ - eventDispatcher, contextContainer, nullptr})); - - return registry; - }; - - delegate->buildRegistryFunction = buildRegistryFunction; - return instance; -} - -void MainComponentsRegistry::registerNatives() { - registerHybrid({ - makeNativeMethod("initHybrid", MainComponentsRegistry::initHybrid), - }); -} - -} // namespace react -} // namespace facebook diff --git a/react_native/TinyQuickstartReactNative/android/app/src/main/jni/MainComponentsRegistry.h b/react_native/TinyQuickstartReactNative/android/app/src/main/jni/MainComponentsRegistry.h deleted file mode 100644 index a59e9f0..0000000 --- a/react_native/TinyQuickstartReactNative/android/app/src/main/jni/MainComponentsRegistry.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once - -#include -#include -#include -#include - -namespace facebook { -namespace react { - -class MainComponentsRegistry - : public facebook::jni::HybridClass { - public: - // Adapt it to the package you used for your Java class. - constexpr static auto kJavaDescriptor = - "Lcom/tinyquickstartreactnative/newarchitecture/components/MainComponentsRegistry;"; - - static void registerNatives(); - - MainComponentsRegistry(ComponentFactory *delegate); - - private: - static std::shared_ptr - sharedProviderRegistry(); - - static jni::local_ref initHybrid( - jni::alias_ref, - ComponentFactory *delegate); -}; - -} // namespace react -} // namespace facebook diff --git a/react_native/TinyQuickstartReactNative/android/app/src/main/jni/OnLoad.cpp b/react_native/TinyQuickstartReactNative/android/app/src/main/jni/OnLoad.cpp deleted file mode 100644 index c569b6e..0000000 --- a/react_native/TinyQuickstartReactNative/android/app/src/main/jni/OnLoad.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include "MainApplicationTurboModuleManagerDelegate.h" -#include "MainComponentsRegistry.h" - -JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) { - return facebook::jni::initialize(vm, [] { - facebook::react::MainApplicationTurboModuleManagerDelegate:: - registerNatives(); - facebook::react::MainComponentsRegistry::registerNatives(); - }); -} diff --git a/react_native/TinyQuickstartReactNative/android/app/src/main/res/drawable/rn_edit_text_material.xml b/react_native/TinyQuickstartReactNative/android/app/src/main/res/drawable/rn_edit_text_material.xml index f35d996..bfd9539 100644 --- a/react_native/TinyQuickstartReactNative/android/app/src/main/res/drawable/rn_edit_text_material.xml +++ b/react_native/TinyQuickstartReactNative/android/app/src/main/res/drawable/rn_edit_text_material.xml @@ -18,6 +18,7 @@ android:insetRight="@dimen/abc_edit_text_inset_horizontal_material" android:insetTop="@dimen/abc_edit_text_inset_top_material" android:insetBottom="@dimen/abc_edit_text_inset_bottom_material"> +