fix: failed to load SpotBugs plugin from 5.0.15

Signed-off-by: Kengo TODA <skypencil@gmail.com>
spotbugs · Aug 1, 2023 · 5ee13e4 · 5ee13e4
1 parent d8f800a
commit 5ee13e4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/main/groovy/com/github/spotbugs/snom/SpotBugsBasePlugin.java b/src/main/groovy/com/github/spotbugs/snom/SpotBugsBasePlugin.java
@@ -125,6 +125,7 @@ private Configuration createPluginConfiguration(Project project) {
     project
         .getConfigurations()
         .create(SpotBugsPlugin.INTERNAL_CONFIG_NAME)
+        .extendsFrom(configuration)
         .setDescription(
             "configuration for the external SpotBugs plugins excluding transitive dependencies")
         .setTransitive(false);

diff --git a/src/main/groovy/com/github/spotbugs/snom/SpotBugsTask.groovy b/src/main/groovy/com/github/spotbugs/snom/SpotBugsTask.groovy
@@ -352,17 +352,14 @@ abstract class SpotBugsTask extends DefaultTask implements VerificationTask {
         setDescription("Run SpotBugs analysis.")
         setGroup(JavaBasePlugin.VERIFICATION_GROUP)
         def internalPluginConfiguration = project.configurations.getByName(SpotBugsPlugin.INTERNAL_CONFIG_NAME)
+        def pluginConfiguration = project.configurations.getByName(SpotBugsPlugin.PLUGINS_CONFIG_NAME)
         pluginJarFiles = project.layout.files {
-            internalPluginConfiguration.files
+            internalPluginConfiguration.resolve()
         }
-        def pluginConfiguration = project.configurations.getByName(SpotBugsPlugin.PLUGINS_CONFIG_NAME)
-
         def configuration = project.getConfigurations().getByName(SpotBugsPlugin.CONFIG_NAME)
-        def logger = this.log
-
         def spotbugsSlf4j = project.configurations.getByName(SpotBugsPlugin.SLF4J_CONFIG_NAME)
         spotbugsClasspath = project.layout.files {
-            spotbugsSlf4j.files + pluginConfiguration.files + configuration.files
+            spotbugsSlf4j.resolve() + pluginConfiguration.resolve() + configuration.resolve()
         }
     }