Bump dependencies and fix more dependency conflicts (#2489)

* Bump dependencies and fix more dependency conflicts * Update verification metadata * Update verification metadata
SpongePowered · Mar 31, 2024 · 09513aa · 09513aa
1 parent 844012c
commit 09513aa
Show file tree

Hide file tree

Showing 3 changed files with 212 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -87,23 +87,28 @@ dependencies {
     api(platform(libs.configurate.bom))
     api(libs.configurate.core) {
         exclude(group = "org.checkerframework", module = "checker-qual") // We use our own version
+        exclude(group = "com.google.errorprone", module = "error_prone_annotations")
     }
     api(libs.configurate.hocon) {
         exclude(group = "org.spongepowered", module = "configurate-core")
         exclude(group = "org.checkerframework", module = "checker-qual")
+        exclude(group = "com.google.errorprone", module = "error_prone_annotations")
 
     }
     api(libs.configurate.gson) {
         exclude(group = "org.spongepowered", module = "configurate-core")
         exclude(group = "com.google.code.gson", module = "gson") // We have the same version technically, but use the gson we provide.
         exclude(group = "org.checkerframework", module = "checker-qual")
+        exclude(group = "com.google.errorprone", module = "error_prone_annotations")
     }
     api(libs.configurate.yaml) {
         exclude(group = "org.spongepowered", module = "configurate-core")
         exclude(group = "org.checkerframework", module = "checker-qual")
+        exclude(group = "com.google.errorprone", module = "error_prone_annotations")
     }
     api(libs.configurate.extraGuice) {
         exclude(group = "com.google.inject", module = "guice")
+        exclude(group = "com.google.errorprone", module = "error_prone_annotations")
     }
 
     // Compile-time static analysis

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,15 +7,15 @@ caffeine = "3.1.8"
 checker = "3.42.0"
 checkstyle = "10.12.7"
 configurate = "4.1.2"
-errorprone = "2.24.1"
+errorprone = "2.26.1"
 gson = "2.10.1"
 guice = "5.0.1"
-ideaExt = "1.1.7"
+ideaExt = "1.1.8"
 indra = "3.1.3"
-junit = "5.10.1"
+junit = "5.10.2"
 log4j = "2.19.0"
 math = "2.0.1"
-mockito = "5.9.0"
+mockito = "5.11.0"
 pluginSpi = "0.3.0"
 
 [libraries]
@@ -63,5 +63,5 @@ indra-checkstyle = { id = "net.kyori.indra.checkstyle", version.ref = "indra" }
 indra-crossdoc = { id = "net.kyori.indra.crossdoc", version.ref = "indra" }
 indra-publishing = { id = "net.kyori.indra.publishing", version.ref = "indra" }
 indra-publishing-sonatype = { id = "net.kyori.indra.publishing.sonatype", version.ref = "indra" }
-nexusPublish = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0-rc-1"}
+nexusPublish = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0-rc-2"}
 spongeGradle-convention = { id = "org.spongepowered.gradle.sponge.dev", version = "2.2.0" }