From 2362a6f190d174f66f16721a53b8157427e46dad Mon Sep 17 00:00:00 2001 From: Tony Robalik Date: Thu, 16 Jan 2025 14:27:11 -0800 Subject: [PATCH 1/2] fix: pluginJarFiles.from() can accept a Configuration directly. --- src/main/kotlin/com/github/spotbugs/snom/SpotBugsTask.kt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/com/github/spotbugs/snom/SpotBugsTask.kt b/src/main/kotlin/com/github/spotbugs/snom/SpotBugsTask.kt index 839446224..19cebb5d8 100644 --- a/src/main/kotlin/com/github/spotbugs/snom/SpotBugsTask.kt +++ b/src/main/kotlin/com/github/spotbugs/snom/SpotBugsTask.kt @@ -291,7 +291,7 @@ abstract class SpotBugsTask : DefaultTask(), VerificationTask { private var enableWorkerApi: Boolean = true - @get:Internal + @get:Classpath abstract val pluginJarFiles: ConfigurableFileCollection @get:Internal @@ -372,10 +372,8 @@ 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 pluginConfiguration = project.configurations.named(SpotBugsPlugin.PLUGINS_CONFIG_NAME) + pluginJarFiles.from(pluginConfiguration) val configuration = project.configurations.getByName(SpotBugsPlugin.CONFIG_NAME) val spotbugsSlf4j = project.configurations.getByName(SpotBugsPlugin.SLF4J_CONFIG_NAME) spotbugsClasspath.from( From 96dda4eeceb3ab33ed113d79365ff5832ee93a12 Mon Sep 17 00:00:00 2001 From: Tony Robalik Date: Thu, 16 Jan 2025 14:28:31 -0800 Subject: [PATCH 2/2] fix: spotbugsClasspath probably should follow the same pattern as pluginJarFiles. Done for consistency. Have not tested. --- .../kotlin/com/github/spotbugs/snom/SpotBugsTask.kt | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/main/kotlin/com/github/spotbugs/snom/SpotBugsTask.kt b/src/main/kotlin/com/github/spotbugs/snom/SpotBugsTask.kt index 19cebb5d8..4daadbcf5 100644 --- a/src/main/kotlin/com/github/spotbugs/snom/SpotBugsTask.kt +++ b/src/main/kotlin/com/github/spotbugs/snom/SpotBugsTask.kt @@ -294,7 +294,7 @@ abstract class SpotBugsTask : DefaultTask(), VerificationTask { @get:Classpath abstract val pluginJarFiles: ConfigurableFileCollection - @get:Internal + @get:Classpath abstract val spotbugsClasspath: ConfigurableFileCollection @get:Nested @@ -374,14 +374,9 @@ abstract class SpotBugsTask : DefaultTask(), VerificationTask { val pluginConfiguration = project.configurations.named(SpotBugsPlugin.PLUGINS_CONFIG_NAME) pluginJarFiles.from(pluginConfiguration) - 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 configuration = project.configurations.named(SpotBugsPlugin.CONFIG_NAME) + val spotbugsSlf4j = project.configurations.named(SpotBugsPlugin.SLF4J_CONFIG_NAME) + spotbugsClasspath.from(configuration, spotbugsSlf4j) } /**