Merge branch 'main' into psi_resolution_WIP_2

* main:
  parse the declarations of named companion objects and their members fixes #705
  use graphviz-java for dot graph generation
  Update dependency com.autonomousapps.dependency-analysis to v1.4.0
  Update dependency com.osacky.doctor to v0.8.1
  update website actions to use node 18.x
  treat annotation processor dependencies the same as runtime dependencies for `McProject.uses()` and overshot behavior (#701)

# Conflicts:
#	modulecheck-gradle/plugin/src/main/kotlin/modulecheck/gradle/internal/GradleProjectProvider.kt
#	modulecheck-project/testing/build.gradle.kts
#	modulecheck-project/testing/src/main/kotlin/modulecheck/project/test/McProjectBuilder.kt
#	modulecheck-project/testing/src/main/kotlin/modulecheck/project/test/ProjectCollector.kt

Author: RBusarow

.github/workflows/ci.yml

@@ -210,7 +210,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 18.x
           cache: yarn
           cache-dependency-path: website/yarn.lock
 

.github/workflows/website.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 18.x
           cache: yarn
           cache-dependency-path: website/yarn.lock
 

artifacts.json

@@ -281,26 +281,42 @@
   },
   {
     "gradlePath": ":modulecheck-gradle:platforms:internal-android",
-    "group": "com.rickbusarow.modulecheck",
-    "artifactId": "modulecheck-gradle-platform-internal-android",
-    "description": "Fast dependency graph linting for Gradle projects",
-    "packaging": "jar",
-    "javaVersion": "11"
-  },
-  {
-    "gradlePath": ":modulecheck-gradle:platforms:internal-jvm",
-    "group": "com.rickbusarow.modulecheck",
-    "artifactId": "modulecheck-gradle-platform-internal-jvm",
-    "description": "Fast dependency graph linting for Gradle projects",
-    "packaging": "jar",
-    "javaVersion": "11"
-  },
-  {
-    "gradlePath": ":modulecheck-parsing:source:api",
-    "group": "com.rickbusarow.modulecheck",
-    "artifactId": "modulecheck-parsing-source-api",
-    "description": "Fast dependency graph linting for Gradle projects",
-    "packaging": "jar",
+    "group" : "com.rickbusarow.modulecheck",
+    "artifactId" : "modulecheck-gradle-platform-internal-android",
+    "description" : "Fast dependency graph linting for Gradle projects",
+    "packaging" : "jar",
+    "javaVersion" : "11"
+  },
+  {
+    "gradlePath" : ":modulecheck-gradle:platforms:internal-jvm",
+    "group" : "com.rickbusarow.modulecheck",
+    "artifactId" : "modulecheck-gradle-platform-internal-jvm",
+    "description" : "Fast dependency graph linting for Gradle projects",
+    "packaging" : "jar",
+    "javaVersion" : "11"
+  },
+  {
+    "gradlePath" : ":modulecheck-model:dependency:api",
+    "group" : "com.rickbusarow.modulecheck",
+    "artifactId" : "modulecheck-model-dependency-api",
+    "description" : "Fast dependency graph linting for Gradle projects",
+    "packaging" : "jar",
+    "javaVersion" : "11"
+  },
+  {
+    "gradlePath" : ":modulecheck-model:dependency:impl",
+    "group" : "com.rickbusarow.modulecheck",
+    "artifactId" : "modulecheck-model-dependency-impl",
+    "description" : "Fast dependency graph linting for Gradle projects",
+    "packaging" : "jar",
+    "javaVersion" : "11"
+  },
+  {
+    "gradlePath" : ":modulecheck-parsing:source:api",
+    "group" : "com.rickbusarow.modulecheck",
+    "artifactId" : "modulecheck-parsing-source-api",
+    "description" : "Fast dependency graph linting for Gradle projects",
+    "packaging" : "jar",
     "javaVersion": "11"
   },
   {

detekt/detekt-baseline.xml

@@ -22,7 +22,7 @@ benManes-versions = "0.42.0"
 changeTracker = "0.7.4"
 coil = "1.3.2"
 compileSdk = "30"
-dependencyAnalysis = "1.3.0"
+dependencyAnalysis = "1.4.0"
 detekt = "1.20.0-RC2"
 dokka = "1.6.21"
 dropbox-dependencyGuard = "0.3.0"
@@ -32,7 +32,8 @@ google-accompanist = "0.18.0"
 google-dagger = "2.42"
 google-material = "1.4.0"
 
-gradleDoctor = "0.8.0"
+gradleDoctor = "0.8.1"
+graphviz = "0.18.1"
 groovy = "3.0.10"
 jUnit = "5.8.2"
 javaParser = "3.24.2"
@@ -112,6 +113,10 @@ google-dagger-compiler = { module = "com.google.dagger:dagger-compiler", version
 
 google-ksp = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "google-ksp" }
 
+graphviz-java = { module = "guru.nidi:graphviz-java", version.ref = "graphviz" }
+graphviz-java-min = { module = "guru.nidi:graphviz-java-min-deps", version.ref = "graphviz" }
+graphviz-kotlin = { module = "guru.nidi:graphviz-kotlin", version.ref = "graphviz" }
+
 groovy = { module = "org.codehaus.groovy:groovy", version.ref = "groovy" }
 groovyXml = { module = "org.codehaus.groovy:groovy-xml", version.ref = "groovy" }
 

gradle/libs.versions.toml

@@ -29,6 +29,7 @@ dependencies {
 
   api(project(path = ":modulecheck-finding:api"))
   api(project(path = ":modulecheck-finding:name"))
+  api(project(path = ":modulecheck-model:dependency:api"))
   api(project(path = ":modulecheck-parsing:android"))
   api(project(path = ":modulecheck-parsing:gradle:model:api"))
   api(project(path = ":modulecheck-parsing:source:api"))
@@ -40,6 +41,8 @@ dependencies {
 
   implementation(libs.kotlin.compiler)
 
+  implementation(project(path = ":modulecheck-config:api"))
+
   testImplementation(libs.bundles.hermit)
   testImplementation(libs.bundles.jUnit)
   testImplementation(libs.bundles.kotest)

modulecheck-api/build.gradle.kts

@@ -75,10 +75,10 @@ data class AndroidResourceDeclaredNames(
         .mapAsyncNotNull { tpd ->
 
           val transitiveSourceSetName = tpd.source.declaringSourceSetName(
-            isAndroid = tpd.source.project(project.projectCache).isAndroid()
+            isAndroid = tpd.source.project(project).isAndroid()
           )
 
-          tpd.contributed.project(project.projectCache)
+          tpd.contributed.project(project)
             .androidUnqualifiedDeclarationNamesForSourceSetName(transitiveSourceSetName)
         } else flowOf()
 

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

@@ -20,7 +20,7 @@ import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.mapNotNull
-import modulecheck.parsing.gradle.model.ConfiguredProjectDependency
+import modulecheck.model.dependency.ProjectDependency
 import modulecheck.parsing.gradle.model.SourceSetName
 import modulecheck.parsing.source.AnvilScopeName
 import modulecheck.parsing.source.AnvilScopeNameEntry
@@ -162,7 +162,7 @@ data class AnvilGraph(
         .orEmpty()
         .asFlow()
         .mapNotNull { cpd ->
-          cpd.project(project.projectCache)
+          cpd.project(project)
             .declarations()
             .get(SourceSetName.MAIN, includeUpstream = true)
             .filter { maybeExtraReferences.contains(it) }
@@ -183,7 +183,7 @@ data class AnvilGraph(
     return AnvilScopeName(rawScopeName)
   }
 
-  private fun McProject.dependenciesBySourceSetName(): Map<SourceSetName, List<ConfiguredProjectDependency>> {
+  private fun McProject.dependenciesBySourceSetName(): Map<SourceSetName, List<ProjectDependency>> {
     return configurations
       .map { (configurationName, _) ->
         configurationName.toSourceSetName() to projectDependencies[configurationName].orEmpty()

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

@@ -15,22 +15,22 @@
 
 package modulecheck.api.context
 
-import modulecheck.parsing.gradle.model.ConfiguredProjectDependency
+import modulecheck.model.dependency.ProjectDependency
 import modulecheck.parsing.gradle.model.SourceSetName
 import modulecheck.project.McProject
 import modulecheck.project.ProjectContext
 import modulecheck.project.project
 import modulecheck.utils.cache.SafeCache
 
 data class AnvilScopeDependencies(
-  private val delegate: SafeCache<SourceSetName, List<ConfiguredProjectDependency>>,
+  private val delegate: SafeCache<SourceSetName, List<ProjectDependency>>,
   private val project: McProject
 ) : ProjectContext.Element {
 
   override val key: ProjectContext.Key<AnvilScopeDependencies>
     get() = Key
 
-  suspend fun get(sourceSetName: SourceSetName): List<ConfiguredProjectDependency> {
+  suspend fun get(sourceSetName: SourceSetName): List<ProjectDependency> {
     return delegate.getOrPut(sourceSetName) {
       val merged = project.anvilScopeMergesForSourceSetName(sourceSetName)
 
@@ -43,8 +43,7 @@ data class AnvilScopeDependencies(
         .distinct()
         .filter { cpd ->
 
-          val contributed = cpd
-            .project(project.projectCache)
+          val contributed = cpd.project(project)
             .anvilScopeContributionsForSourceSetName(cpd.configurationName.toSourceSetName())
 
           contributed.any { (scopeName, _) ->
@@ -67,4 +66,4 @@ suspend fun ProjectContext.anvilScopeDependencies(): AnvilScopeDependencies =
 
 suspend fun ProjectContext.anvilScopeDependenciesForSourceSetName(
   sourceSetName: SourceSetName
-): List<ConfiguredProjectDependency> = anvilScopeDependencies().get(sourceSetName)
+): List<ProjectDependency> = anvilScopeDependencies().get(sourceSetName)

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

@@ -15,9 +15,9 @@
 
 package modulecheck.api.context
 
+import modulecheck.model.dependency.TransitiveProjectDependency
 import modulecheck.parsing.gradle.model.ConfigurationName
 import modulecheck.parsing.gradle.model.SourceSetName
-import modulecheck.parsing.gradle.model.TransitiveProjectDependency
 import modulecheck.project.McProject
 import modulecheck.project.ProjectContext
 import modulecheck.utils.cache.SafeCache

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

@@ -19,7 +19,7 @@ import kotlinx.coroutines.flow.toList
 import modulecheck.api.context.Declarations.DeclarationsKey.ALL
 import modulecheck.api.context.Declarations.DeclarationsKey.WithUpstream
 import modulecheck.api.context.Declarations.DeclarationsKey.WithoutUpstream
-import modulecheck.parsing.gradle.model.ConfiguredProjectDependency
+import modulecheck.model.dependency.ProjectDependency
 import modulecheck.parsing.gradle.model.SourceSetName
 import modulecheck.parsing.source.DeclaredName
 import modulecheck.project.McProject
@@ -114,7 +114,7 @@ data class Declarations private constructor(
 
 suspend fun ProjectContext.declarations(): Declarations = get(Declarations)
 
-suspend fun ConfiguredProjectDependency.declarations(
+suspend fun ProjectDependency.declarations(
   projectCache: ProjectCache
 ): LazySet<DeclaredName> {
   val project = projectCache.getValue(path)

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

@@ -17,7 +17,7 @@ package modulecheck.api.context
 
 import modulecheck.api.context.DependencySources.SourceResult.Found
 import modulecheck.api.context.DependencySources.SourceResult.NOT_PRESENT
-import modulecheck.parsing.gradle.model.ConfiguredProjectDependency
+import modulecheck.model.dependency.ProjectDependency
 import modulecheck.parsing.gradle.model.ProjectPath
 import modulecheck.parsing.gradle.model.SourceSetName
 import modulecheck.project.McProject
@@ -36,7 +36,7 @@ data class DependencySources(
   )
 
   sealed interface SourceResult {
-    data class Found(val sourceDependency: ConfiguredProjectDependency) : SourceResult
+    data class Found(val sourceDependency: ProjectDependency) : SourceResult
     object NOT_PRESENT : SourceResult
   }
 
@@ -47,7 +47,7 @@ data class DependencySources(
     dependencyProjectPath: ProjectPath,
     sourceSetName: SourceSetName,
     isTestFixture: Boolean
-  ): ConfiguredProjectDependency? {
+  ): ProjectDependency? {
 
     val key = SourceKey(
       sourceSetName = sourceSetName,
@@ -91,7 +91,7 @@ suspend fun McProject.requireSourceOf(
   dependencyProject: McProject,
   sourceSetName: SourceSetName,
   isTestFixture: Boolean
-): ConfiguredProjectDependency {
+): ProjectDependency {
   return dependencySources().sourceOfOrNull(
     dependencyProjectPath = dependencyProject.path,
     sourceSetName = sourceSetName,

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

@@ -44,7 +44,7 @@ data class Depths(
 
   private suspend fun fetchForSourceSet(sourceSetName: SourceSetName): ProjectDepth {
     val (childDepth, children) = project.projectDependencies[sourceSetName]
-      .map { it.project(project.projectCache) }
+      .map { it.project(project) }
       .distinct()
       .map { it.depthForSourceSetName(SourceSetName.MAIN) }
       .groupBy { it.depth }

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

@@ -15,7 +15,7 @@
 
 package modulecheck.api.context
 
-import modulecheck.parsing.gradle.model.DownstreamDependency
+import modulecheck.model.dependency.DownstreamDependency
 import modulecheck.project.McProject
 import modulecheck.project.ProjectContext
 import modulecheck.project.project
@@ -38,11 +38,11 @@ data class DownstreamProjects(
           otherProject
             .classpathDependencies()
             .all()
-            .filter { it.contributed.project(project.projectCache) == project }
+            .filter { it.contributed.project(project) == project }
             .map { transitive ->
               DownstreamDependency(
                 dependentProjectPath = otherProject.path,
-                configuredProjectDependency = transitive.withContributedConfiguration().contributed
+                projectDependency = transitive.withContributedConfiguration().contributed
               )
             }
         }

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

@@ -15,8 +15,9 @@
 
 package modulecheck.api.context
 
+import modulecheck.model.dependency.ConfiguredDependency
 import modulecheck.parsing.gradle.model.ConfigurationName
-import modulecheck.parsing.gradle.model.ConfiguredDependency
+import modulecheck.parsing.gradle.model.MavenCoordinates
 import modulecheck.parsing.gradle.model.all
 import modulecheck.project.McProject
 import modulecheck.project.ProjectContext
@@ -48,16 +49,19 @@ data class KaptDependencies(
       val allDependencies = external + internal
 
       allDependencies
-        .filterNot { it.name == KAPT_PLUGIN_COORDS }
+        .filterNot { it.identifier == KAPT_PLUGIN_COORDS }
         .filter { it.configurationName == configurationName }
         .toSet()
     }
   }
 
   companion object Key : ProjectContext.Key<KaptDependencies> {
 
-    internal const val KAPT_PLUGIN_COORDS =
-      "org.jetbrains.kotlin:kotlin-annotation-processing-gradle"
+    internal val KAPT_PLUGIN_COORDS = MavenCoordinates(
+      group = "org.jetbrains.kotlin",
+      moduleName = "kotlin-annotation-processing-gradle",
+      version = null
+    )
 
     override suspend operator fun invoke(project: McProject): KaptDependencies {
       return KaptDependencies(SafeCache(), project)