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

Add explicit module-info for JPMS compatibility #201

Merged
merged 4 commits into from
Nov 16, 2021
Merged

Add explicit module-info for JPMS compatibility #201

merged 4 commits into from
Nov 16, 2021

Conversation

lion7
Copy link
Contributor

@lion7 lion7 commented Sep 7, 2021

Largely based on Kotlin/kotlinx.serialization#1624 and the review comments there.
Note: I did have to update the ASM API version to ASM6 for the build to succeed..

@qwwdfsad qwwdfsad requested a review from mvicsokolova October 6, 2021 09:23
@lion7 lion7 changed the base branch from master to develop November 16, 2021 05:28
# Conflicts:
#	atomicfu-transformer/src/main/kotlin/kotlinx/atomicfu/transformer/AtomicFUTransformer.kt
@lion7
Copy link
Contributor Author

lion7 commented Nov 16, 2021

This project consists of only 1 published runtime JAR, similar to kotlinx.datetime.
I moved the configuration of the module-info compilation task to an inline Gradle script, assuming that the comments of @ilya-g in Kotlin/kotlinx-datetime#135 also apply here.

Note: I also reverted the ASM API change since it is already upgraded to ASM9 in a previous PR. I did have to upgrade the Gralde version so I could use the Java toolchain feature.

Copy link
Collaborator

@mvicsokolova mvicsokolova left a comment

Choose a reason for hiding this comment

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

Thanks a lot for your work! I've read the review of JPMS support for kotlinx-datetime as the structure here is pretty much the same. Looks good to me.
I've asked @ilya-g to take the final look before merge.

@mvicsokolova mvicsokolova requested a review from ilya-g November 16, 2021 12:08
@mvicsokolova mvicsokolova merged commit 8e489e7 into Kotlin:develop Nov 16, 2021
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.

3 participants