Skip to content

Commit

Permalink
fix(ios): fix pod install --project-directory=ios failing (#37992)
Browse files Browse the repository at this point in the history
Summary:
![image](https://user-images.githubusercontent.com/4123478/217618490-4f99e408-1a07-4acf-a05c-e8837562a931.png)

`pod install --project-directory=ios` currently fails when new arch is enabled: react-native-async-storage/async-storage#910

- Patch for 0.71: #37993
- Patch for 0.72: #37994

## Changelog:

[IOS] [FIXED] - Fix `pod install --project-directory=...` when New Arch is enabled

Pull Request resolved: #37992

Test Plan:
```
git clone https://github.com/react-native-async-storage/async-storage.git
cd async-storage
gh pr checkout 910
yarn
RCT_NEW_ARCH_ENABLED=1 pod install --project-directory=example/ios
```

Reviewed By: cortinico

Differential Revision: D46966225

Pulled By: cipolleschi

fbshipit-source-id: 00b4650189175c09c9ec928f85d075890ba4c7c1
  • Loading branch information
tido64 authored and facebook-github-bot committed Jun 23, 2023
1 parent a94bbfb commit eb5f23c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ def testUseReactCodegenDiscovery_whenParametersAreGood_executeCodegen
'[Codegen] warn: using experimental new codegen integration'
])
assert_equal(codegen_utils_mock.get_react_codegen_script_phases_params, [{
:app_path => "~/app",
:app_path => app_path,
:config_file_dir => "",
:config_key => "codegenConfig",
:fabric_enabled => false,
Expand All @@ -382,7 +382,7 @@ def testUseReactCodegenDiscovery_whenParametersAreGood_executeCodegen
assert_equal(codegen_utils_mock.get_react_codegen_spec_params, [{
:fabric_enabled => false,
:folly_version=>"2021.07.22.00",
:package_json_file => "../node_modules/react-native/package.json",
:package_json_file => "#{app_path}/ios/../node_modules/react-native/package.json",
:script_phases => "echo TestScript"
}])
assert_equal(codegen_utils_mock.generate_react_codegen_spec_params, [{
Expand Down
4 changes: 2 additions & 2 deletions packages/react-native/scripts/cocoapods/codegen_utils.rb
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ def get_react_codegen_spec(package_json_file, folly_version: '2021.07.22.00', fa
"React-jsi": [],
"ReactCommon/turbomodule/bridging": [],
"ReactCommon/turbomodule/core": [],
"React-NativeModulesApple": [],
"React-NativeModulesApple": [],
"glog": [],
"DoubleConversion": [],
}
Expand Down Expand Up @@ -318,7 +318,7 @@ def use_react_native_codegen_discovery!(
:config_key => config_key
)
react_codegen_spec = codegen_utils.get_react_codegen_spec(
file_manager.join(react_native_path, "package.json"),
file_manager.join(relative_installation_root, react_native_path, "package.json"),
:folly_version => folly_version,
:fabric_enabled => fabric_enabled,
:hermes_enabled => hermes_enabled,
Expand Down

0 comments on commit eb5f23c

Please sign in to comment.