Merge branch 'main' into AndroidManifest_per_SourceSet

* main:
  support multiple android base packages fixes #372 fixes #402

# Conflicts:
#	modulecheck-core/src/main/kotlin/modulecheck/core/rule/DisableViewBindingRule.kt
#	modulecheck-core/src/main/kotlin/modulecheck/core/rule/InheritedDependencyRule.kt
#	modulecheck-parsing/gradle/src/main/kotlin/modulecheck/parsing/gradle/SourceSet.kt

Author: RBusarow

modulecheck-api/src/main/kotlin/modulecheck/api/context/ClasspathDependencies.kt

@@ -49,7 +49,7 @@ data class ClasspathDependencies(
     ): Set<ConfigurationName> = setOfNotNull(
       sourceSetName.apiConfig(),
       ConfigurationName.api,
-      SourceSetName.TEST_FIXTURES.apiConfig().takeIf { isTestFixtures }
+      if (isTestFixtures) SourceSetName.TEST_FIXTURES.apiConfig() else null
     )
 
     val directDependencies = projectDependencies[sourceSetName]

modulecheck-api/src/main/kotlin/modulecheck/api/context/Declarations.kt

@@ -86,6 +86,7 @@ suspend fun ConfiguredProjectDependency.declarations(): LazySet<DeclarationName>
     project.declarations().get(SourceSetName.TEST_FIXTURES)
   } else {
     configurationName.toSourceSetName().withUpstream(project)
+      .filterNot { it == SourceSetName.TEST_FIXTURES }
       .map { project.declarations().get(it) }
       .let { lazySet(it, emptyDataSource()) }
   }

modulecheck-core/src/main/kotlin/modulecheck/core/context/OverShotDependencies.kt

@@ -34,34 +34,71 @@ data class OverShotDependencies(
   suspend fun get(configurationName: ConfigurationName): List<OverShotDependencyFinding> {
     return delegate.getOrPut(configurationName) {
 
+      fun log(msg: String) {
+        if (project.path == ":lib2") {
+          println(msg)
+        }
+      }
+
       project.unusedDependencies()
         .get(configurationName)
         .flatMap { unused ->
 
+          log(
+            "unused\n\n$unused\n" +
+              "~~cpd~~" +
+              "${unused.cpd()}\n" +
+              "_____________"
+          )
+
           val configSuffix = unused.configurationName
-            .nameWithoutSourceSet()
-            .takeIf { !it.equals(ConfigurationName.api.value, ignoreCase = true) }
+            .takeIf { !it.isApi() }
+            ?.nameWithoutSourceSet()
             ?: ConfigurationName.implementation.value
 
-          val allUsedByConfigName = project.sourceSets
-            .keys
-            .filterNot { it == unused.configurationName.toSourceSetName() }
+          log("suffix --> $configSuffix")
+
+          val allUsedByConfigName = unused.configurationName
+            .toSourceSetName()
+            .withDownStream(project)
             .mapNotNull { sourceSetName ->
 
               sourceSetName.javaConfigurationNames()
-                .filterNot { it == unused.configurationName }
+                .asSequence()
                 // check the same config as the unused configuration first.
-                // for instance, if `api` is unused, check `debugApi`, `testApi`, etc.
+                // for instance, if `api` is unused, check `debugApi`, `releaseApi`, etc.
                 .sortedByDescending {
                   it.nameWithoutSourceSet().equals(configSuffix, ignoreCase = true)
                 }
-                .firstNotNullOfOrNull { configName ->
+                .flatMap { configName ->
+                  setOf(
+                    configName to unused.cpd().isTestFixture,
+                    configName to false
+                  )
+                }
+                .map { (configName, isTestFixture) ->
+
                   ConfiguredProjectDependency(
                     configurationName = configName,
                     project = unused.dependencyProject,
-                    isTestFixture = unused.cpd().isTestFixture
+                    isTestFixture = isTestFixture
                   )
-                    .takeIf { project.uses(it) }
+                }
+                .filterNot {
+                  it.isTestFixture == unused.cpd().isTestFixture &&
+                    it.configurationName
+                      .toSourceSetName() == unused.cpd()
+                    .configurationName
+                    .toSourceSetName()
+                }
+                .firstNotNullOfOrNull { cpd ->
+
+                  cpd.takeIf {
+
+                    log("~~~~    checking cpd --> $it          =============   ${project.uses(it)}")
+
+                    project.uses(it)
+                  }
                 }
             }
             .groupBy { it.configurationName }
@@ -91,7 +128,9 @@ data class OverShotDependencies(
             newDependency = cpp,
             oldDependency = cpp.copy(configurationName = originalConfigurationName),
             configurationName = cpp.configurationName
-          )
+          ).also {
+            log("**  final overshot **\n$it\n++++++++++++++++++")
+          }
         }
         .sortedBy { it.dependencyProject }
         .distinctBy { it.dependencyProject }

modulecheck-core/src/main/kotlin/modulecheck/core/internal/uses.kt

@@ -15,6 +15,7 @@
 
 package modulecheck.core.internal
 
+import kotlinx.coroutines.flow.toList
 import modulecheck.api.context.anvilGraph
 import modulecheck.api.context.anvilScopeContributionsForSourceSetName
 import modulecheck.api.context.declarations
@@ -59,10 +60,27 @@ suspend fun McProject.uses(dependency: TransitiveProjectDependency): Boolean {
 
 suspend fun McProject.uses(dependency: ConfiguredProjectDependency): Boolean {
 
+
+  fun log(msg: String) {
+    if (path == ":lib2") {
+      println(msg)
+    }
+  }
+
+
   val sourceSetName = dependency.configurationName.toSourceSetName()
 
   val dependencyDeclarations = dependency.declarations()
 
+  log("""
+
+                  dependency ==? $dependency
+
+   ${dependencyDeclarations.toList() .joinToString("\n")}
+
+   =============
+  """.trimIndent())
+
   val refs = referencesForSourceSetName(sourceSetName)
 
   // Check whether human-written code references the dependency first.

modulecheck-core/src/main/kotlin/modulecheck/core/rule/DisableViewBindingRule.kt

@@ -63,7 +63,7 @@ class DisableViewBindingRule : ModuleCheckRule<DisableViewBindingGenerationFindi
             "$basePackage.databinding.$simpleBindingName".asExplicitReference()
           }
 
-        val usedInProject = sourceSetName.downStream(project, true)
+        val usedInProject = sourceSetName.withDownStream(project)
           .any { sourceSetNameOrDownstream ->
 
             generatedBindings.any { generated ->

modulecheck-core/src/main/kotlin/modulecheck/core/rule/InheritedDependencyRule.kt

@@ -42,7 +42,7 @@ class InheritedDependencyRule : ModuleCheckRule<InheritedDependencyFinding> {
     val dependencyPathCache = mutableMapOf<SourceSetName, Set<Pair<String, Boolean>>>()
 
     // Returns true if the dependency is already declared in this exact configuration, **or** if
-    // it's declared in an withUpstream configuration.
+    // it's declared in an upstream configuration.
     //
     // For example, this function will return true for a `testImplementation` configured dependency
     // which is already declared in the main source set (such as with `api` or `implementation`).
@@ -57,7 +57,7 @@ class InheritedDependencyRule : ModuleCheckRule<InheritedDependencyFinding> {
 
       return configurationName.toSourceSetName()
         // Check the receiver's configuration first, but if the dependency isn't used there, also
-        // check the withUpstream configurations.
+        // check the upstream configurations.
         .withUpstream(project)
         .any { sourceSet ->
           dependencyPathsForSourceSet(sourceSet)
@@ -128,14 +128,6 @@ class InheritedDependencyRule : ModuleCheckRule<InheritedDependencyFinding> {
           inherited.configurationName.implementationVariant()
         }
 
-        println("""
-          |-----------
-          |project --> ${project.path}
-          |inherited --> ${inherited.copy(newConfig)}
-          |source --> ${source}
-          |
-          |=====""".trimMargin())
-
         InheritedDependencyFinding(
           dependentProject = project,
           newDependency = inherited.copy(newConfig),