Merge pull request #976 from spotbugs/merge-5.1.4

Merge 5.1.4 to the beta branch
spotbugs · Oct 8, 2023 · 83a9be7 · 83a9be7
2 parents 75f5baf + 57d5b58
commit 83a9be7
Show file tree

Hide file tree

Showing 23 changed files with 1,259 additions and 1,308 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -34,7 +34,7 @@ dependencies {
     compileOnly(localGroovy())
     compileOnly("com.github.spotbugs:spotbugs:$spotBugsVersion")
     compileOnly("com.android.tools.build:gradle:$androidGradlePluginVersion")
-    testImplementation("com.tngtech.archunit:archunit:1.0.1")
+    testImplementation("com.tngtech.archunit:archunit:1.1.0")
 }
 
 val signingKey: String? = System.getenv("SIGNING_KEY")

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     `kotlin-dsl`
-    id("com.diffplug.spotless") version "6.20.0"
+    id("com.diffplug.spotless") version "6.22.0"
 }
 
 repositories {
@@ -9,10 +9,10 @@ repositories {
 }
 
 dependencies {
-    implementation("com.diffplug.spotless:spotless-plugin-gradle:6.20.0")
+    implementation("com.diffplug.spotless:spotless-plugin-gradle:6.22.0")
     implementation("net.ltgt.gradle:gradle-errorprone-plugin:3.1.0")
-    implementation("com.gradle.publish:plugin-publish-plugin:1.2.0")
-    implementation("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.3.0.3225")
+    implementation("com.gradle.publish:plugin-publish-plugin:1.2.1")
+    implementation("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.4.1.3373")
 }
 
 spotless {

diff --git a/detekt-baseline.xml b/detekt-baseline.xml
@@ -12,14 +12,14 @@
     <ID>LongMethod:SpotBugsRunner.kt$SpotBugsRunner$protected fun buildArguments(task: SpotBugsTask): List&lt;String></ID>
     <ID>MagicNumber:SemanticVersion.kt$SemanticVersion$10</ID>
     <ID>MagicNumber:SemanticVersion.kt$SemanticVersion$3</ID>
-    <ID>MaxLineLength:SemanticVersion.kt$SemanticVersion.Companion$"^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$"</ID>
+    <ID>MaxLineLength:SemanticVersion.kt$SemanticVersion.Companion$"(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$"</ID>
     <ID>MaxLineLength:SpotBugsBasePlugin.kt$SpotBugsBasePlugin.Companion$*</ID>
     <ID>MaxLineLength:SpotBugsExtension.kt$SpotBugsExtension$*</ID>
     <ID>MaxLineLength:SpotBugsExtension.kt$SpotBugsExtension$* Property to specify the extra arguments for JVM process. Default value is empty so JVM process will get no extra argument.</ID>
     <ID>MaxLineLength:SpotBugsExtension.kt$SpotBugsExtension$* Property to specify the name of project. Some reporting formats use this property. Default value is the name of your Gradle project.</ID>
-    <ID>MaxLineLength:SpotBugsHtmlReport.kt$SpotBugsHtmlReport$private</ID>
-    <ID>MaxLineLength:SpotBugsHtmlReport.kt$SpotBugsHtmlReport$val</ID>
+    <ID>MaxLineLength:SpotBugsHtmlReport.kt$SpotBugsHtmlReport$configuration.files { dependency: Dependency -> dependency.group == "com.github.spotbugs" &amp;&amp; dependency.name == "spotbugs" }</ID>
     <ID>MaxLineLength:SpotBugsRunnerForHybrid.kt$SpotBugsRunnerForHybrid.Companion$*</ID>
+    <ID>MaxLineLength:SpotBugsRunnerForWorker.kt$SpotBugsRunnerForWorker$"Spotbugs will be executed using Java Toolchain configuration: Vendor: {} | Version: {}"</ID>
     <ID>MaxLineLength:SpotBugsTask.kt$SpotBugsTask$*</ID>
     <ID>MaxLineLength:SpotBugsTask.kt$SpotBugsTask$* Property to set the directory to generate report files. Default is {@code "$buildDir/reports/spotbugs/$taskName"}.</ID>
     <ID>MaxLineLength:SpotBugsTask.kt$SpotBugsTask$* Property to specify the extra arguments for JVM process. Default value is empty so JVM process will get no extra argument.</ID>