fix: compute/printDuplicateDependencies works even when not all proje…

…cts apply this plugin.
autonomousapps · Jan 29, 2025 · 09b77a5 · 09b77a5
1 parent 523d7bc
commit 09b77a5
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/src/functionalTest/groovy/com/autonomousapps/android/DuplicateDependencyVersionsSpec.groovy b/src/functionalTest/groovy/com/autonomousapps/android/DuplicateDependencyVersionsSpec.groovy
@@ -35,6 +35,11 @@ final class DuplicateDependencyVersionsSpec extends AbstractAndroidSpec {
       .containsExactlyElementsIn(project.expectedResolvedDependenciesForLib2)
       .inOrder()
 
+    and: 'jvm-lib resolved dependencies'
+    assertThat(project.actualResolvedDependenciesFor('group:jvm-lib'))
+      .containsExactlyElementsIn(project.expectedResolvedDependenciesForJvmLib)
+      .inOrder()
+
     and: 'duplicates report'
     def report = project.actualDuplicateDependencies()
     assertThat(report['junit:junit']).containsExactlyElementsIn('4.11', '4.12', '4.13').inOrder()

diff --git a/...Test/groovy/com/autonomousapps/android/projects/DuplicateDependencyVersionsProject.groovy b/...Test/groovy/com/autonomousapps/android/projects/DuplicateDependencyVersionsProject.groovy
@@ -4,7 +4,6 @@ package com.autonomousapps.android.projects
 
 import com.autonomousapps.kit.GradleProject
 import com.autonomousapps.kit.gradle.Dependency
-import com.autonomousapps.kit.gradle.dependencies.Plugins
 
 import static com.autonomousapps.AdviceHelper.duplicateDependenciesReport
 import static com.autonomousapps.AdviceHelper.resolvedDependenciesReport
@@ -44,15 +43,23 @@ final class DuplicateDependencyVersionsProject extends AbstractAndroidProject {
           ]
         }
       }
-      .withAndroidLibProject('lib2', 'com.example.lib2') { assets ->
-        assets.withBuildScript { bs ->
+      .withAndroidLibProject('lib2', 'com.example.lib2') { lib ->
+        lib.withBuildScript { bs ->
           bs.plugins = androidLibPlugin
           bs.android = defaultAndroidLibBlock(false, 'com.example.lib2')
           bs.dependencies = [
             new Dependency('api', 'junit:junit:4.13')
           ]
         }
-      }.write()
+      }
+    // This "project" only exists for organizational reasons
+      .withSubproject('group') {}
+      .withSubproject('group:jvm-lib') { lib ->
+        lib.withBuildScript { bs ->
+          bs.plugins = javaLibrary
+        }
+      }
+      .write()
   }
 
   Map<String, Set<String>> actualDuplicateDependencies() {
@@ -105,4 +112,6 @@ final class DuplicateDependencyVersionsProject extends AbstractAndroidProject {
     'junit:junit:4.13',
     'org.hamcrest:hamcrest-core:1.3',
   ]
+
+  List<String> expectedResolvedDependenciesForJvmLib = []
 }
diff --git a/src/main/kotlin/com/autonomousapps/subplugin/RootPlugin.kt b/src/main/kotlin/com/autonomousapps/subplugin/RootPlugin.kt
@@ -96,7 +96,14 @@ internal class RootPlugin(private val project: Project) {
     val paths = RootOutputPaths(this)
 
     val computeDuplicatesTask = tasks.register<ComputeDuplicateDependenciesTask>("computeDuplicateDependencies") {
-      resolvedDependenciesReports.setFrom(resolvedDepsResolver.internal)
+      resolvedDependenciesReports.setFrom(resolvedDepsResolver.internal.map { c ->
+        c.incoming.artifactView {
+          // Not all projects in the build will have DAGP applied, meaning they won't have any artifact to consume.
+          // Setting `lenient(true)` means we can still have a dependency on those projects, and not fail this task when
+          // we find nothing there.
+          lenient(true)
+        }.artifacts.artifactFiles
+      })
       output.set(paths.duplicateDependenciesPath)
     }