diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index e902038a..6d0ee1c2 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - - + \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23a..a4413138 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a42..b740cf13 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/src/main/kotlin/com/github/spotbugs/snom/internal/SpotBugsHtmlReport.kt b/src/main/kotlin/com/github/spotbugs/snom/internal/SpotBugsHtmlReport.kt index 8e213706..5a3baebb 100644 --- a/src/main/kotlin/com/github/spotbugs/snom/internal/SpotBugsHtmlReport.kt +++ b/src/main/kotlin/com/github/spotbugs/snom/internal/SpotBugsHtmlReport.kt @@ -19,6 +19,7 @@ import com.github.spotbugs.snom.SpotBugsTask import javax.inject.Inject import org.gradle.api.InvalidUserDataException import org.gradle.api.artifacts.Configuration +import org.gradle.api.artifacts.component.ModuleComponentIdentifier import org.gradle.api.model.ObjectFactory import org.gradle.api.provider.Property import org.gradle.api.resources.TextResource @@ -49,9 +50,15 @@ internal abstract class SpotBugsHtmlReport @Inject constructor( configuration: Configuration, textResourceFactory: TextResourceFactory, ): TextResource { - val spotbugsJar = configuration.files { - it.group == "com.github.spotbugs" && it.name == "spotbugs" - }.find { it.isFile } + val spotbugsJar = configuration.incoming.artifactView { + it.componentFilter { identifier -> + when (identifier) { + is ModuleComponentIdentifier -> + identifier.group == "com.github.spotbugs" && identifier.module == "spotbugs" + else -> false + } + } + }.files return if (spotbugsJar != null) { textResourceFactory.fromArchiveEntry(spotbugsJar, path) } else {