From dc11ec15d3b79c6bba4e6a5af34a4bb2cd8ad3f6 Mon Sep 17 00:00:00 2001
From: Baron Roberts <baron@cthing.com>
Date: Tue, 13 Feb 2024 18:15:17 -0800
Subject: [PATCH] Upgrade Gradle and dependencies.

---
 build.gradle.kts                         |  6 ++++++
 gradle/libs.versions.toml                | 22 +++++++++++-----------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 4bcfbfe..1214ce6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -50,6 +50,12 @@ dependencies {
     spotbugsPlugins(libs.spotbugsContrib)
 }
 
+configurations.checkstyle {
+    resolutionStrategy.capabilitiesResolution.withCapability("com.google.collections:google-collections") {
+        select("com.google.guava:guava:0")
+    }
+}
+
 checkstyle {
     toolVersion = libs.versions.checkstyle.get()
     isIgnoreFailures = false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 44d6bd6..c2717e9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,24 +1,24 @@
 [versions]
 java = "17"
-checkstyle = "10.12.5"
+checkstyle = "10.13.0"
 jacoco = "0.8.11"
-junit = "5.10.1"
-spotbugs = "4.8.2"
+junit = "5.10.2"
+spotbugs = "4.8.3"
 
 [plugins]
-spotbugs = { id = "com.github.spotbugs", version = "6.0.2" }
-versions = { id = "com.github.ben-manes.versions", version = "0.50.0" }
+spotbugs = { id = "com.github.spotbugs", version = "6.0.7" }
+versions = { id = "com.github.ben-manes.versions", version = "0.51.0" }
 
 [libraries]
-assertJ = "org.assertj:assertj-core:3.24.2"
+assertJ = "org.assertj:assertj-core:3.25.3"
 cthingAnnots = "org.cthing:cthing-annotations:1.0.0"
-equalsVerifier = "nl.jqno.equalsverifier:equalsverifier:3.15.4"
-jacksonDatabind = "com.fasterxml.jackson.core:jackson-databind:2.16.0"
+equalsVerifier = "nl.jqno.equalsverifier:equalsverifier:3.15.6"
+jacksonDatabind = "com.fasterxml.jackson.core:jackson-databind:2.16.1"
 jsr305 = "com.google.code.findbugs:jsr305:3.0.2"
 junitApi = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
 junitEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
-junitLauncher = "org.junit.platform:junit-platform-launcher:1.10.1"
+junitLauncher = "org.junit.platform:junit-platform-launcher:1.10.2"
 junitParams = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" }
-mockito = "org.mockito:mockito-core:5.8.0"
-spotbugsContrib = "com.mebigfatguy.sb-contrib:sb-contrib:7.6.3"
+mockito = "org.mockito:mockito-core:5.10.0"
+spotbugsContrib = "com.mebigfatguy.sb-contrib:sb-contrib:7.6.4"
 versionParser = "org.cthing:versionparser:4.2.1"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1af9e09..a80b22c 100644
--- 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.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME