Add support for annotation and interface merging #1119
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JoelWilcox
force-pushed
the
joel/merging-poc-finish
branch
from
682eaaf to
32cf177
Compare
JoelWilcox
force-pushed
the
joel/merging-poc-finish
branch
3 times, most recently
from
7399601 to
dfa6791
Compare
RBusarow
reviewed
Feb 21, 2025
compiler-k2/build.gradle.kts
Outdated
| kotlinCompilerArgs.addAll( | ||
| // The flag is needed because we extend an interface that uses @JvmDefault and the Kotlin | ||
| // compiler requires this flag when doing so. | ||
| "-Xjvm-default=all", |
There was a problem hiding this comment.
Is this actually needed?
There was a problem hiding this comment.
Looks like it's not 👍, removed
Comment on lines
201
to
205
| val newModulesText = when { | ||
| oldModulesArg == null -> "modules = [$classArgList]" | ||
| existingModuleArgExpressions.isEmpty() -> "modules = [$classArgList]" | ||
| else -> "modules = [$classArgList]" | ||
| } |
There was a problem hiding this comment.
When I first wrote this, it actually did different things for different conditions. Now, it seems decidedly less useful.
There was a problem hiding this comment.
Good catch! Updated to be a direct assignment
JoelWilcox
force-pushed
the
joel/merging-poc-finish
branch
from
dfa6791 to
8d67335
Compare
RBusarow
approved these changes
Feb 21, 2025
JoelWilcox
force-pushed
the
joel/merging-poc-finish
branch
from
8d67335 to
39500f2
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This continues the work started in rick/main-k2-merging-pt-2 which gets us baseline merging support for @MergeComponent.