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

Use both macos targets in ui-showcase #3663

Merged
merged 2 commits into from
Jul 9, 2024
Merged

Conversation

whyoleg
Copy link
Contributor

@whyoleg whyoleg commented Jul 3, 2024

TL;DR;
This is needed because of the issue with rendering expect/actual. I would propose for now to just add macosArm64 target and resolve underlying issue during implementation of #3386 for Dokka K2. We will anyway need to do something with such sourceSets.

In #3662 test started to fail on ui-showcase module because of ERROR CLASS.
Checking the page where the fail happened, I found that for some reason ui-showcase currently (on master) doesn't contain an actual declaration for macos sourceSet:
image
asyncWithDelay doesn't have macos tab, but actual declaration exists in sourceSet.

If we run the same test with the changes from #3662, macos tab is now appeared but shows ERROR CLASS:
image
All other declarations of asyncWithDelay for other sourceSets look the same as before.

Also, other declarations (which don't depend on coroutines) like getCurrentDate which also has expect/actual defined in the same - work fine on master and macos tab exist:
image

Most probably the issue is very similar to #3386 (even though problem described here reproducible on K1).

If we build ui-showcase with Dokka K2:

@whyoleg whyoleg self-assigned this Jul 3, 2024
Copy link
Member

@vmishenev vmishenev left a comment

Choose a reason for hiding this comment

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

all source sets are shown but both linux and macos will show ERROR CLASS

Currently, does the linux tab have <ERROR CLASS>.asyncWithDelay... for K2, but K1 renders normally?
Can we fix it with an extra target as well?

@whyoleg
Copy link
Contributor Author

whyoleg commented Jul 4, 2024

Currently, does the linux tab have .asyncWithDelay... for K2, but K1 renders normally?

Yeah, for K1 linux renders fine for some reason with K1. With K2 it will be ERROR CLASS. May be because coroutines does have some apple/macos related stuff in publication which confuses Dokka with K1

Can we fix it with an extra target as well?

Probably yes, I will recheck it one more time for both K1 and K2 and adapt PR

@whyoleg
Copy link
Contributor Author

whyoleg commented Jul 5, 2024

Adding extra linuxArm64 target not only solves ERROR CLASS for asyncWithDelay but also resolves issue with CPointer for K2 - so now, ui-showcase works for both K1 and K2.

@whyoleg whyoleg requested a review from vmishenev July 5, 2024 09:07
@whyoleg whyoleg merged commit 6a4a88d into master Jul 9, 2024
13 checks passed
@whyoleg whyoleg deleted the ui-showcase-reproducer branch July 9, 2024 11:55
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.

None yet

2 participants