Don't report classes annotated with MergeComponent

SchwarzIT · Aug 23, 2024 · 2794964 · 2794964
1 parent 11a6171
commit 2794964
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -20,6 +20,7 @@ ksp_gradle_plugin = { module = "com.google.devtools.ksp:symbol-processing-gradle
 ksp_api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
 kotlin_gradle_plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 ktlint = { module = "com.pinterest.ktlint:ktlint-cli", version = "1.3.1" }
+anvil_annotations = { module = "com.squareup.anvil:annotations", version = "2.4.9" }
 
 [plugins]
 kotlin_plugin = { id = "org.jetbrains.kotlin", version.ref = "kotlin" }

diff --git a/lightsaber/build.gradle.kts b/lightsaber/build.gradle.kts
@@ -36,6 +36,7 @@ dependencies {
  testImplementation(libs.truth)
  testImplementation(libs.kctfork.core)
  testImplementation(libs.kctfork.ksp)
+ testImplementation(libs.anvil.annotations)
 }
 
 configure<com.diffplug.gradle.spotless.SpotlessExtension> {

diff --git a/lightsaber/src/main/java/schwarz/it/lightsaber/checkers/UnusedScopes.kt b/lightsaber/src/main/java/schwarz/it/lightsaber/checkers/UnusedScopes.kt
@@ -58,6 +58,8 @@ internal fun checkUnusedScopes(
 private val ignoreAnnotatedWith = listOf(
  Component::class.qualifiedName!!,
  Subcomponent::class.qualifiedName!!,
+ "com.squareup.anvil.annotations.MergeComponent",
+ "com.squareup.anvil.annotations.MergeSubcomponent",
 )
 
 internal class UnusedScopesKsp : LightsaberKspRule {

diff --git a/lightsaber/src/test/kotlin/schwarz/it/lightsaber/checkers/UnusedScopesKtTest.kt b/lightsaber/src/test/kotlin/schwarz/it/lightsaber/checkers/UnusedScopesKtTest.kt
@@ -198,7 +198,7 @@ internal class UnusedScopesKtTest {
  }
 
  @ParameterizedTest
- @CsvSource("kapt,Component", "kapt,Subcomponent", "ksp,Component", "ksp,Subcomponent")
+ @CsvSource("kapt,Component", "kapt,Subcomponent", "kapt,MergeComponent(Singleton::class)", "kapt,MergeSubcomponent(Singleton::class)", "ksp,Component", "ksp,Subcomponent")
  fun noReportAComponentNorSubcomponent(
  @ConvertWith(CompilerArgumentConverter::class) compiler: KotlinCompiler,
  type: String,
@@ -207,6 +207,8 @@ internal class UnusedScopesKtTest {
  """
  package test
 
+ import com.squareup.anvil.annotations.MergeComponent
+ import com.squareup.anvil.annotations.MergeSubcomponent
  import dagger.Component
  import dagger.Subcomponent
  import javax.inject.Inject