From e5764b958d0e8562fc155e4a01e003c941a79e18 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Tue, 19 Apr 2022 00:48:23 +0200 Subject: [PATCH] build: Replace jsr305 with spotbugs (#3576) --- Bukkit/build.gradle.kts | 2 +- Core/build.gradle.kts | 2 +- gradle/libs.versions.toml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Bukkit/build.gradle.kts b/Bukkit/build.gradle.kts index 8d925d183..529e2dcb2 100644 --- a/Bukkit/build.gradle.kts +++ b/Bukkit/build.gradle.kts @@ -83,7 +83,7 @@ tasks.named("shadowJar") { relocate("org.jetbrains", "com.plotsquared.core.annotations") relocate("org.intellij.lang", "com.plotsquared.core.intellij.annotations") relocate("javax.annotation", "com.plotsquared.core.annotation") - relocate("com.google.code.findbugs", "com.plotsquared.core.findbugs") + relocate("com.github.spotbugs", "com.plotsquared.core.spotbugs") relocate("javax.inject", "com.plotsquared.core.annotation.inject") // Get rid of all the libs which are 100% unused. diff --git a/Core/build.gradle.kts b/Core/build.gradle.kts index fa79fa3bb..9bf697e9d 100644 --- a/Core/build.gradle.kts +++ b/Core/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { api(libs.guiceassistedinject) { exclude("com.google.inject", "guice") } - api(libs.findbugs) + api(libs.spotbugs) // Plugins compileOnly(libs.worldeditCore) { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 689baf52c..10f1156a3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ guava = "31.0.1-jre" # Version set by Minecraft paper = "1.18.1-R0.1-SNAPSHOT" checker-qual = "3.21.4" guice = "5.1.0" -findbugs = "3.0.1" +spotbugs = "4.6.0" snakeyaml = "1.30" # Version set by Bukkit # Adventure & MiniMessage @@ -56,7 +56,7 @@ log4j = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = snakeyaml = { group = "org.yaml", name = "snakeyaml", version.ref = "snakeyaml" } guice = { group = "com.google.inject", name = "guice", version.ref = "guice" } guiceassistedinject = { group = "com.google.inject.extensions", name = "guice-assistedinject", version.ref = "guice" } -findbugs = { group = "com.google.code.findbugs", name = "annotations", version.ref = "findbugs" } +spotbugs = { group = "com.github.spotbugs", name = "spotbugs-annotations", version.ref = "spotbugs" } # Adventure & MiniMessage adventure = { group = "net.kyori", name = "adventure-api", version.ref = "adventure-api" }