Skip to content

Commit

Permalink
Source extension supportedAnnotationTypes in contribution merging whe…
Browse files Browse the repository at this point in the history
…n deciding when to defer. (#54)
  • Loading branch information
ZacSweers authored Aug 13, 2024
1 parent ef6eb14 commit 5801439
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
**Unreleased**
--------------

- Source `AnvilKspExtension.supportedAnnotationTypes` in contribution merging when deciding when to defer.

0.2.4
-----

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ internal class KspContributionMerger(
addAll(it.splitToSequence(':').filterNot(String::isBlank))
}
}
addAll(extensions.flatMap { it.supportedAnnotationTypes })
// contributesSubcomponentFqName is handled uniquely
}.filterNotTo(mutableSetOf()) { it in MERGE_ANNOTATION_NAMES }

Expand Down

0 comments on commit 5801439

Please sign in to comment.