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

Pass friendPaths via BaseKotlinCompile$friendPath #247

Merged
merged 4 commits into from Sep 28, 2022

Conversation

mvicsokolova
Copy link
Collaborator

Fix for KT-54167

compilation.compileKotlinTask.doFirst {
kotlinOptions.addFriendPaths(originalMainClassesDirs)
(it as BaseKotlinCompile).setFriendPaths(originalMainClassesDirs)
Copy link
Contributor

Choose a reason for hiding this comment

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

I think wrapping it in doFirst is not needed here, friendsPaths value should be calculated on task execution.

@@ -396,7 +390,7 @@ fun Project.configureJvmTransformation(
originalMainClassesDirs + sourceSet.compileClasspath - mainSourceSet.output.classesDirs

(this as? KotlinCompile<*>)?.doFirst {
kotlinOptions.addFriendPaths(originalMainClassesDirs)
(it as BaseKotlinCompile).setFriendPaths(originalMainClassesDirs)
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here - remove .doFirst

@mvicsokolova mvicsokolova merged commit b09e1b2 into develop Sep 28, 2022
@mvicsokolova mvicsokolova deleted the fix-compatibility-1.8.20 branch September 28, 2022 15:06
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