From e1d960aa224ebe2ff189979be20f99ce9cf526ab Mon Sep 17 00:00:00 2001 From: Tony Robalik Date: Thu, 16 Jan 2025 17:52:57 -0800 Subject: [PATCH] fix: pluginJarFiles.from() can accept a Configuration directly. (#1311) * fix: pluginJarFiles.from() can accept a Configuration directly. * fix: spotbugsClasspath probably should follow the same pattern as pluginJarFiles. Done for consistency. Have not tested. --- .../com/github/spotbugs/snom/SpotBugsTask.kt | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/main/kotlin/com/github/spotbugs/snom/SpotBugsTask.kt b/src/main/kotlin/com/github/spotbugs/snom/SpotBugsTask.kt index 83944622..4daadbcf 100644 --- a/src/main/kotlin/com/github/spotbugs/snom/SpotBugsTask.kt +++ b/src/main/kotlin/com/github/spotbugs/snom/SpotBugsTask.kt @@ -291,10 +291,10 @@ abstract class SpotBugsTask : DefaultTask(), VerificationTask { private var enableWorkerApi: Boolean = true - @get:Internal + @get:Classpath abstract val pluginJarFiles: ConfigurableFileCollection - @get:Internal + @get:Classpath abstract val spotbugsClasspath: ConfigurableFileCollection @get:Nested @@ -372,18 +372,11 @@ abstract class SpotBugsTask : DefaultTask(), VerificationTask { analyseClassFile.set(project.layout.buildDirectory.file("$name-analyse-class-file.txt")) - val pluginConfiguration = project.configurations.getByName(SpotBugsPlugin.PLUGINS_CONFIG_NAME) - pluginJarFiles.from( - project.provider { pluginConfiguration.files }, - ) - val configuration = project.configurations.getByName(SpotBugsPlugin.CONFIG_NAME) - val spotbugsSlf4j = project.configurations.getByName(SpotBugsPlugin.SLF4J_CONFIG_NAME) - spotbugsClasspath.from( - project.layout.files( - project.provider { spotbugsSlf4j.files }, - project.provider { configuration.files }, - ), - ) + val pluginConfiguration = project.configurations.named(SpotBugsPlugin.PLUGINS_CONFIG_NAME) + pluginJarFiles.from(pluginConfiguration) + val configuration = project.configurations.named(SpotBugsPlugin.CONFIG_NAME) + val spotbugsSlf4j = project.configurations.named(SpotBugsPlugin.SLF4J_CONFIG_NAME) + spotbugsClasspath.from(configuration, spotbugsSlf4j) } /**