Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove RNTester/RNTester-macOS/TurboModuleCxx and download files from microsoft/react-native-windows #630

Merged
merged 24 commits into from
Oct 6, 2020

Conversation

ZihanChen-MSFT
Copy link

@ZihanChen-MSFT ZihanChen-MSFT commented Oct 5, 2020

Please select one of the following

  • I am removing an existing difference between facebook/react-native and microsoft/react-native-macos 👍
  • I am cherry-picking a change from Facebook's react-native into microsoft/react-native-macos 👍
  • I am making a fix / change for the macOS implementation of react-native
  • I am making a change required for Microsoft usage of react-native

Summary

Some files in RNTester/RNTester-macOS/TurboModuleCxx are copied from microsoft/react-native-windows before.
This change downloads all of them by cocpapods.

I have created 3 cocoapods in ReactTurboModuleCxx folder:

  • React-TurboModuleCxx-WinRTShared: This will be deleted and merged to *-WinRTPort after proper files in react-native-windows are updated later (very soon)
  • React-TurboModuleCxx-WinRTPort: A minimum port of WinRT to macOS because source files comming from react-native-windows are based on WinRT. Removing the dependency to make them "real" C++ is in the plan.
  • React-TurboModuleCxx-RNW: Download proper files from react-native-windows.

Changelog

[macOS] [Fixed] - Remove RNTester/RNTester-macOS/TurboModuleCxx and download files from microsoft/react-native-windows

Test Plan

Manually built

NOTE: This change affects the snapshot/screenshot test page, but the test page was broken before I made this change. I will address it in another pull request.

Microsoft Reviewers: Open in CodeFlow

@ZihanChen-MSFT ZihanChen-MSFT requested a review from alloy as a code owner October 5, 2020 15:52
Copy link
Member

@alloy alloy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

Can you at least update the Podfile.lock changes by installing the expected CocoaPods version?

ReactTurboModuleCxx/React-TurboModuleCxx-RNW.podspec Outdated Show resolved Hide resolved
ReactTurboModuleCxx/React-TurboModuleCxx-WinRTPort.podspec Outdated Show resolved Hide resolved
RNTester/Podfile.lock Outdated Show resolved Hide resolved
@ghost ghost removed the Needs: Author Feedback label Oct 5, 2020
Copy link
Member

@alloy alloy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great! :shipit:

@alloy alloy merged commit 6fc5e78 into microsoft:master Oct 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants