chore(deps): update dependency gradle to v8.8 (#1178)

* chore(deps): update dependency gradle to v8.8 * build: bump up Kotlin to v2 Signed-off-by: Kengo TODA <skypencil@gmail.com> * fix: replace deprecated API to support Gradle 9.0 https://docs.gradle.org/8.8/userguide/upgrading_version_8.html\#deprecate_filtered_configuration_file_and_filecollection_methods Signed-off-by: Kengo TODA <skypencil@gmail.com> --------- Signed-off-by: Kengo TODA <skypencil@gmail.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Kengo TODA <skypencil@gmail.com>
spotbugs · Jun 5, 2024 · 5a25caf · 5a25caf
1 parent e8dd197
commit 5a25caf
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git 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
diff --git 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 {