From 5801439683ee12d972b3fb7c3ec6586e6acfc046 Mon Sep 17 00:00:00 2001
From: Zac Sweers <pandanomic@gmail.com>
Date: Tue, 13 Aug 2024 18:12:01 -0400
Subject: [PATCH] Source extension supportedAnnotationTypes in contribution
 merging when deciding when to defer. (#54)

---
 CHANGELOG.md                                                    | 2 ++
 .../java/com/squareup/anvil/compiler/KspContributionMerger.kt   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a5d3232b..a67702a33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
 **Unreleased**
 --------------
 
+- Source `AnvilKspExtension.supportedAnnotationTypes` in contribution merging when deciding when to defer.
+
 0.2.4
 -----
 
diff --git a/compiler/src/main/java/com/squareup/anvil/compiler/KspContributionMerger.kt b/compiler/src/main/java/com/squareup/anvil/compiler/KspContributionMerger.kt
index ebe0be06e..56982ddc2 100644
--- a/compiler/src/main/java/com/squareup/anvil/compiler/KspContributionMerger.kt
+++ b/compiler/src/main/java/com/squareup/anvil/compiler/KspContributionMerger.kt
@@ -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 }