From 3d8989ced6002c3cef866a890c3dfa195353a306 Mon Sep 17 00:00:00 2001
From: ImMorpheus <ImMorpheus@users.noreply.github.com>
Date: Sun, 31 Mar 2024 05:54:46 +0200
Subject: [PATCH] Bump dependencies and fix more dependency conflicts

---
 build.gradle.kts                 |  5 +++
 gradle/libs.versions.toml        | 10 +++---
 gradle/verification-metadata.xml | 61 ++++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 6eb9da096e..c04a6415c2 100644
--- 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
index ec9145f143..fb8c18d8a4 100644
--- 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" }
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index d732544da0..c6fda9497b 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -153,6 +153,14 @@
             <sha256 value="13b4b50062949f8b1343927c581536d3bb051b8afea509aa6f902f4de28bc1b2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.auto" name="auto-common" version="1.2.2">
+         <artifact name="auto-common-1.2.2.jar">
+            <sha256 value="f50b1ce8a41fad31a8a819c052f8ffa362ea0a3dbe9ef8f7c7dc9a36d4738a59" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="auto-common-1.2.2.pom">
+            <sha256 value="03a992fba4fcfbbcf77a460981181630046e5bae09673a48193c6e0f761271ea" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.auto.service" name="auto-service-aggregator" version="1.0.1">
          <artifact name="auto-service-aggregator-1.0.1.pom">
             <sha256 value="0481460db59903362b26fabd3bdcd5ec200750f9391bbb6502fe3c7dc2df3e4c" origin="Generated by Gradle"/>
@@ -216,6 +224,14 @@
             <sha256 value="ec151f815bb34bf5db5f8664882c78cc4a5a1eeada10a403f4d132938d0fd98c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.errorprone" name="error_prone_annotation" version="2.26.1">
+         <artifact name="error_prone_annotation-2.26.1.jar">
+            <sha256 value="816c1adf5d3db1dd414089adee73ed7e3fd9270ca57047c3f742109bed3d89cd" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="error_prone_annotation-2.26.1.pom">
+            <sha256 value="1e0435feba7a49468965b806f3848262735953d269816b4386d14929676a4bfe" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.errorprone" name="error_prone_annotations" version="2.24.1">
          <artifact name="error_prone_annotations-2.24.1.jar">
             <sha256 value="19fe2f7155d20ea093168527999da98108103ee546d1e8b726bc4b27c31a3c30" origin="Generated by Gradle"/>
@@ -224,6 +240,14 @@
             <sha256 value="756d0b3c3906599d973140eece266e0de8f4f192af14b19006af149fe90ef8d5" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.errorprone" name="error_prone_annotations" version="2.26.1">
+         <artifact name="error_prone_annotations-2.26.1.jar">
+            <sha256 value="de25f2d9a2156529bd765f51d8efdfc0dfa7301e04efb9cc75b7f10cf5d0e0fb" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="error_prone_annotations-2.26.1.pom">
+            <sha256 value="aea7e991e2dfdcb47f5fbd508587535f7802bcb9e2fc2d4ebb50be41b684da9f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.errorprone" name="error_prone_annotations" version="2.3.4">
          <artifact name="error_prone_annotations-2.3.4.jar">
             <sha256 value="baf7d6ea97ce606c53e11b6854ba5f2ce7ef5c24dddf0afa18d1260bd25b002c" origin="Generated by Gradle"/>
@@ -248,6 +272,14 @@
             <sha256 value="37a6fe84e2f17224f967c7a6f4b4daa75d25c21903f82063906900c88bb391ea" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.errorprone" name="error_prone_check_api" version="2.26.1">
+         <artifact name="error_prone_check_api-2.26.1.jar">
+            <sha256 value="f7890f7c1f9ba9087d679eaa6e1e9fca7800fa4d6d581e452a6729de142a6130" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="error_prone_check_api-2.26.1.pom">
+            <sha256 value="ad380883ad9b7c2c246ea10ebb1dfc0df02f90ea13213a07a609334b98ef3be2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.errorprone" name="error_prone_core" version="2.24.1">
          <artifact name="error_prone_core-2.24.1.jar">
             <sha256 value="692d72fcca648328bec2be14688493c8c97a78f10012736d0c22e8f95b978679" origin="Generated by Gradle"/>
@@ -256,11 +288,24 @@
             <sha256 value="967d85acd1a9cbf619afbf642fc617057403b694b4fb81725effe954bcfb06c4" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.errorprone" name="error_prone_core" version="2.26.1">
+         <artifact name="error_prone_core-2.26.1.jar">
+            <sha256 value="6b1d00a395a0551e0f0a61ec3c8ff42f2149c8304c480a764955f700870fcfae" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="error_prone_core-2.26.1.pom">
+            <sha256 value="57b165616ea96e2fa211fbafa8c680d10835e9ebb39b3c5ef98d13df30ba1f5a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.errorprone" name="error_prone_parent" version="2.24.1">
          <artifact name="error_prone_parent-2.24.1.pom">
             <sha256 value="cb9f3d580502ece5e12429d7f7ac75fe47ab85d6adf75cddf86fa5a24aefa48f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.errorprone" name="error_prone_parent" version="2.26.1">
+         <artifact name="error_prone_parent-2.26.1.pom">
+            <sha256 value="4a6ad00d31b0a5adcd9a4f605065d5b445fae4a04cbf827e5d1ac1077e2f814d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.errorprone" name="error_prone_parent" version="2.3.4">
          <artifact name="error_prone_parent-2.3.4.pom">
             <sha256 value="40495b437a60d2398f0fdfc054b89d9c394a82347a274a0721c2e950a4302186" origin="Generated by Gradle"/>
@@ -279,6 +324,14 @@
             <sha256 value="6ac8a09a680022c055b17eee6a61556db6e28955070fe45b2d17d5481682edcd" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.errorprone" name="error_prone_type_annotations" version="2.26.1">
+         <artifact name="error_prone_type_annotations-2.26.1.jar">
+            <sha256 value="31907edd46a1f5b7801762b84a2c56d6425ba425acc5d6f8c696d6fac81de9bd" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="error_prone_type_annotations-2.26.1.pom">
+            <sha256 value="c1b0ffe0828d0b606aabbd230e1ff09d8eab62ae4165de0c30b271d3874d79fa" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.errorprone" name="javac" version="9+181-r4173-1">
          <artifact name="javac-9+181-r4173-1.jar">
             <sha256 value="1d8d347a0e1579f3fc86ac04d1974e489afc66357f0009ac9804a7ac30912ed6" origin="Generated by Gradle"/>
@@ -1575,6 +1628,14 @@
             <sha256 value="ba641a6c82bed22adad822263bdeb49d2d7f884d4d420da15c03c424c6a38c1f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.pcollections" name="pcollections" version="4.0.1">
+         <artifact name="pcollections-4.0.1.jar">
+            <sha256 value="1f82766d7c3221930854033bebff5073ea46b43f27326074bbe15d148c18bfb3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="pcollections-4.0.1.module">
+            <sha256 value="9ebda7c0c9db1134d341dff7c8ad0bc5953286fbf0b998aeca297a1ee6e809f0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.reflections" name="reflections" version="0.10.2">
          <artifact name="reflections-0.10.2.jar">
             <sha256 value="938a2d08fe54050d7610b944d8ddc3a09355710d9e6be0aac838dbc04e9a2825" origin="Generated by Gradle"/>