Skip to content

Ignore adding additional optIns also for "jvmCoreMain" source set #3830

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

Merged
merged 1 commit into from
Jul 31, 2023

Conversation

Tapchicoma
Copy link
Contributor

After changes required for https://youtrack.jetbrains.com/issue/KT-57292/Rework-configuration-of-compiler-settings-in-MPP-Projects consistency checks were move later in configuration phase. Now they started also catch inconsistency between "jvmMain" and "jvmCoreMain" source sets.

@Tapchicoma Tapchicoma requested review from qwwdfsad and woainikk July 28, 2023 14:52
@Tapchicoma
Copy link
Contributor Author

Fixes build failure in this MR

@qwwdfsad
Copy link
Member

Could you please target develop branch though?
That way there won't be heisen-commits across mainline and aggregator branches. Release manager will take care of it after the merge

@qwwdfsad qwwdfsad added the kotlin-merge-blocker PRs labeled as merge-blockers are effectively preventing a corresponding merge into main Kotlin repo label Jul 28, 2023
@Tapchicoma Tapchicoma changed the base branch from kotlin-community/dev to develop July 28, 2023 14:55
@Tapchicoma
Copy link
Contributor Author

Oh, I will rebase it now.

After changes required for https://youtrack.jetbrains.com/issue/KT-57292/Rework-configuration-of-compiler-settings-in-MPP-Projects
consistency checks were move later in configuration phase. Now they
started also catch inconsistency between "jvmMain" and "jvmCoreMain"
source sets.
@Tapchicoma Tapchicoma force-pushed the yahor/fix-optin-inconsistency branch from 9f500ab to bb21e8e Compare July 28, 2023 15:00
@woainikk woainikk merged commit 1a09305 into develop Jul 31, 2023
@mshishkina
Copy link

Merged in kotlin-community/dev branch.

@Tapchicoma Tapchicoma deleted the yahor/fix-optin-inconsistency branch July 31, 2023 13:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kotlin-merge-blocker PRs labeled as merge-blockers are effectively preventing a corresponding merge into main Kotlin repo
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants