Only process Java-related configurations (#195)

guillermo-varela · web-flow · commit 3b2a22177734 · 2025-05-09T13:59:43.000-05:00
diff --git a/README.md b/README.md
@@ -66,14 +66,14 @@ Gradle can be used to build projects developed in various programming languages.
 
 ```
 plugins {
-  id 'org.sonatype.gradle.plugins.scan' version '3.1.0' // Update the version as needed
+  id 'org.sonatype.gradle.plugins.scan' version '3.1.1' // Update the version as needed
 }
 ```
 
 - Or `build.gradle.kts`:
 ```
 plugins {
-    id ("org.sonatype.gradle.plugins.scan") version "3.1.0" // Update the version as needed
+    id ("org.sonatype.gradle.plugins.scan") version "3.1.1" // Update the version as needed
 }
 ```
 
diff --git a/gradle.properties b/gradle.properties
@@ -15,5 +15,5 @@
 #
 
 group=org.sonatype.gradle.plugins
-version=3.1.0-SNAPSHOT
+version=3.1.1-SNAPSHOT
 release.useAutomaticVersion=true
diff --git a/src/main/java/org/sonatype/gradle/plugins/scan/common/DependenciesFinder.java b/src/main/java/org/sonatype/gradle/plugins/scan/common/DependenciesFinder.java
@@ -42,6 +42,7 @@
 import org.gradle.api.artifacts.ResolvedArtifact;
 import org.gradle.api.artifacts.ResolvedDependency;
 import org.gradle.api.attributes.Attribute;
+import org.gradle.api.attributes.Usage;
 import org.gradle.api.plugins.PluginContainer;
 import org.gradle.internal.impldep.com.google.common.annotations.VisibleForTesting;
 
@@ -276,6 +277,11 @@ private boolean isParent(
   }
 
   private boolean isAcceptableConfiguration(Configuration configuration, boolean allConfigurations) {
+    Usage usage = configuration.getAttributes().getAttribute(Usage.USAGE_ATTRIBUTE);
+    if (usage != null && !usage.getName().equals(Usage.JAVA_API) && !usage.getName().equals(Usage.JAVA_RUNTIME)) {
+      return false;
+    }
+
     if (allConfigurations) {
       return configuration.isCanBeResolved();
     }
diff --git a/src/test/java/org/sonatype/gradle/plugins/scan/common/DependenciesFinderTest.java b/src/test/java/org/sonatype/gradle/plugins/scan/common/DependenciesFinderTest.java
@@ -20,20 +20,18 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Stream;
 
 import com.sonatype.insight.scan.module.model.Artifact;
 import com.sonatype.insight.scan.module.model.Dependency;
 import com.sonatype.insight.scan.module.model.Module;
 
 import com.google.common.collect.Sets;
 import org.gradle.api.Project;
-import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.artifacts.ConfigurationContainer;
-import org.gradle.api.artifacts.ResolveException;
 import org.gradle.api.artifacts.ResolvedArtifact;
 import org.gradle.api.artifacts.ResolvedDependency;
 import org.gradle.api.artifacts.dsl.DependencyHandler;
+import org.gradle.api.attributes.Usage;
+import org.gradle.api.model.ObjectFactory;
 import org.gradle.testfixtures.ProjectBuilder;
 import org.junit.Before;
 import org.junit.Test;
@@ -46,7 +44,6 @@
 import static org.gradle.api.plugins.JavaPlugin.RUNTIME_ONLY_CONFIGURATION_NAME;
 import static org.gradle.api.plugins.JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 public class DependenciesFinderTest
@@ -168,18 +165,16 @@ public void testFindResolvedDependencies_multiModuleProject() {
   }
 
   @Test
-  public void testFindResolvedDependencies_copyConfigurationAfterResolveException() {
-    Project project = spy(buildProject(IMPLEMENTATION_CONFIGURATION_NAME, false));
-    ConfigurationContainer configurationContainer = spy(project.getConfigurations());
-    Configuration configuration = spy(configurationContainer.iterator().next());
+  public void testFindResolvedDependencies_excludeNonJavaConfiguration() {
+    Project project = buildProject("implementationDependenciesMetadata", true);
 
-    when(configuration.getResolvedConfiguration()).thenThrow(ResolveException.class);
-    when(configurationContainer.stream()).thenReturn(Stream.of(configuration));
-    when(project.getConfigurations()).thenReturn(configurationContainer);
-    when(project.getAllprojects()).thenReturn(Sets.newHashSet(project));
+    project.getConfigurations().getByName("implementationDependenciesMetadata").attributes(attributeContainer -> {
+      ObjectFactory factory = project.getObjects();
+      attributeContainer.attribute(Usage.USAGE_ATTRIBUTE, factory.named(Usage.class, Usage.NATIVE_LINK));
+    });
 
     Set<ResolvedDependency> result = finder.findResolvedDependencies(project, true, emptyMap(), false);
-    assertThat(result).hasSize(1);
+    assertThat(result).isEmpty();
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -66,14 +66,14 @@ Gradle can be used to build projects developed in various programming languages.`
`66`	`66`
`67`	`67`	```
`68`	`68`	`plugins {`
`69`		`- id 'org.sonatype.gradle.plugins.scan' version '3.1.0' // Update the version as needed`
	`69`	`+ id 'org.sonatype.gradle.plugins.scan' version '3.1.1' // Update the version as needed`
`70`	`70`	`}`
`71`	`71`	```
`72`	`72`
`73`	`73`	- Or `build.gradle.kts`:
`74`	`74`	```
`75`	`75`	`plugins {`
`76`		`- id ("org.sonatype.gradle.plugins.scan") version "3.1.0" // Update the version as needed`
	`76`	`+ id ("org.sonatype.gradle.plugins.scan") version "3.1.1" // Update the version as needed`
`77`	`77`	`}`
`78`	`78`	```
`79`	`79`
Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,5 @@`
`15`	`15`	`#`
`16`	`16`
`17`	`17`	`group=org.sonatype.gradle.plugins`
`18`		`-version=3.1.0-SNAPSHOT`
	`18`	`+version=3.1.1-SNAPSHOT`
`19`	`19`	`release.useAutomaticVersion=true`