DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

Make all headers public and add #ifdef __cplusplus #1150

Closed
janicduplessis wants to merge 1 commits from cppheaders into main
pull from: cppheaders
merge into: DaddyFrosty:main
Conversation 12 Commits 1 Files Changed 10 +44 -1
janicduplessis commented 2022-06-05 10:39:52 -07:00 (Migrated from github.com)
Copy Link

This change is mostly needed to support the new react-native architecture with Swift. Some private yoga headers end up being included in the swift build and result in compilation failure since swift cannot compile c++ modules. See https://github.com/facebook/react-native/pull/33381.

The most reliable fix is to include all headers as public headers, and add #ifdef __cplusplus to those that include c++. This is already what we do for other headers, this applies this to all headers.

Tested in the YogaKitSample, and also in a react-native app.

This change is mostly needed to support the new react-native architecture with Swift. Some private yoga headers end up being included in the swift build and result in compilation failure since swift cannot compile c++ modules. See https://github.com/facebook/react-native/pull/33381. The most reliable fix is to include all headers as public headers, and add `#ifdef __cplusplus` to those that include c++. This is already what we do for other headers, this applies this to all headers. Tested in the YogaKitSample, and also in a react-native app.
facebook-github-bot commented 2022-06-07 02:56:32 -07:00 (Migrated from github.com)
Copy Link

@cortinico has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@cortinico has imported this pull request. If you are a Meta employee, you can view this diff [on Phabricator](https://www.internalfb.com/diff/D36966687).
dmytrorykun commented 2022-06-07 03:16:29 -07:00 (Migrated from github.com)
Copy Link

Hi @janicduplessis, can we revert https://github.com/facebook/react-native/pull/33381 as the next step?

Hi @janicduplessis, can we revert https://github.com/facebook/react-native/pull/33381 as the next step?
👍 1
Kudo commented 2022-06-07 03:36:26 -07:00 (Migrated from github.com)
Copy Link

Yes, please. But I think the change to react_native_pods.rb don’t need to be reverted. I can create a pr for this later today if it works.

Yes, please. But I think the change to react_native_pods.rb don’t need to be reverted. I can create a pr for this later today if it works.
👍 1
janicduplessis commented 2022-06-07 07:54:30 -07:00 (Migrated from github.com)
Copy Link

Yea we don't want to revert the whole thing. Sounds good @Kudo you can do the follow up PR in react-native.

Yea we don't want to revert the whole thing. Sounds good @Kudo you can do the follow up PR in react-native.
kelset commented 2022-06-07 08:03:16 -07:00 (Migrated from github.com)
Copy Link

What's the process now to get this version of Yoga with the fix to be consumed by RN? (yoga is actually missing from https://reactnative.dev/contributing/release-dependencies 😅)

What's the process now to get this version of Yoga with the fix to be consumed by RN? (yoga is actually missing from https://reactnative.dev/contributing/release-dependencies 😅)
cortinico commented 2022-06-07 09:19:55 -07:00 (Migrated from github.com)
Copy Link

What's the process now to get this version of Yoga with the fix to be consumed by RN?

Yoga is dir-synced inside ReactCommon/yoga/yoga so we don't need any version bump at all at this stage 👍

> What's the process now to get this version of Yoga with the fix to be consumed by RN? Yoga is dir-synced inside `ReactCommon/yoga/yoga` so we don't need any version bump at all at this stage 👍
👍 1
kelset commented 2022-06-07 09:59:47 -07:00 (Migrated from github.com)
Copy Link

ok so we just need to have (basically) a sync commit land on master, and that one could potentially be even cherry-picked?

ok so we just need to have (basically) a sync commit land on master, and that one could potentially be even cherry-picked?
cortinico commented 2022-06-07 10:03:02 -07:00 (Migrated from github.com)
Copy Link

@kelset Correct. This landed on main 43f831b23c and can be cherry-picked wherever its needed.

@kelset Correct. This landed on `main` https://github.com/facebook/react-native/commit/43f831b23caf22e59af5c6d3fdd62fed3d20d4ec and can be cherry-picked wherever its needed.
👍 1
kelset commented 2022-06-07 10:18:21 -07:00 (Migrated from github.com)
Copy Link

@Kudo @brentvatne you were saying that you wanted to fix in 0.69 right for Expo next SDK version, right?

@Kudo @brentvatne you were saying that you wanted to fix in 0.69 right for Expo next SDK version, right?
Kudo commented 2022-06-07 16:33:58 -07:00 (Migrated from github.com)
Copy Link

the revert pr is in https://github.com/facebook/react-native/pull/33973. we want to have both 43f831b23c and https://github.com/facebook/react-native/pull/33973 in 0.69. thanks for making it happens.

the revert pr is in https://github.com/facebook/react-native/pull/33973. we want to have both https://github.com/facebook/react-native/commit/43f831b23caf22e59af5c6d3fdd62fed3d20d4ec and https://github.com/facebook/react-native/pull/33973 in 0.69. thanks for making it happens.
👍 1
kelset commented 2022-06-08 02:11:31 -07:00 (Migrated from github.com)
Copy Link

@Kudo , sounds good - can you add those requests here? https://github.com/reactwg/react-native-releases/discussions/21

since they are about Yoga I feel we'd need a new RC to ensure everything goes smoothly 😅

@Kudo , sounds good - can you add those requests here? https://github.com/reactwg/react-native-releases/discussions/21 since they are about Yoga I feel we'd need a new RC to ensure everything goes smoothly 😅
Kudo commented 2022-06-08 02:17:14 -07:00 (Migrated from github.com)
Copy Link

thanks @kelset! i'll add the commits after https://github.com/facebook/react-native/pull/33973 landed.

thanks @kelset! i'll add the commits after https://github.com/facebook/react-native/pull/33973 landed.
👍 1

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
Algorithm
Build and Infrastructure
C#
C++ Enhancement
CLA Signed
Discussion
Documentation
Feature Request
Java
JavaScript
Merged
Question
Reverted
Shared with Meta
Applied via automation to indicate that an Issue or Pull Request has been shared with the team.
YogaKit
YogaLayout ViewGroup
bug
dependencies
Pull requests that update a dependency file
duplicate
enhancement
fb-exported
fh:direct-merge-enabled
invalid
ruby
Pull requests that update Ruby code
wontfix
No Label
CLA Signed
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
DaddyFrosty
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: DaddyFrosty/yoga#1150
No description provided.
Delete Branch "cppheaders"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?