Upgrade Gradle and dependencies

cthing · Jun 1, 2024 · 1380e39 · 1380e39
1 parent eb3855c
commit 1380e39
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,7 +3,8 @@ import com.github.spotbugs.snom.Effort
 import org.cthing.projectversion.BuildType
 import org.cthing.projectversion.ProjectVersion
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Date
+import java.util.Locale
 
 repositories {
     mavenCentral()

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,22 +1,21 @@
 [versions]
 java = "17"
-# Do not upgrade Checkstyle until https://github.com/checkstyle/checkstyle/issues/14123 is properly fixed
-checkstyle = "10.12.5"
-jackson = "2.16.1"
-jacoco = "0.8.11"
+checkstyle = "10.17.0"
+jackson = "2.17.1"
+jacoco = "0.8.12"
 junit = "5.10.2"
-spotbugs = "4.8.3"
+spotbugs = "4.8.5"
 
 [plugins]
 cthingVersioning = { id = "org.cthing.cthing-versioning", version = "1.0.0" }
-dependencyAnalysis = { id = "com.autonomousapps.dependency-analysis", version = "1.30.0" }
-spotbugs = { id = "com.github.spotbugs", version = "6.0.7" }
+dependencyAnalysis = { id = "com.autonomousapps.dependency-analysis", version = "1.32.0" }
+spotbugs = { id = "com.github.spotbugs", version = "6.0.15" }
 versions = { id = "com.github.ben-manes.versions", version = "0.51.0" }
 
 [libraries]
-assertJ = "org.assertj:assertj-core:3.25.3"
+assertJ = "org.assertj:assertj-core:3.26.0"
 cthingAnnots = "org.cthing:cthing-annotations:1.0.0"
-equalsVerifier = "nl.jqno.equalsverifier:equalsverifier:3.15.6"
+equalsVerifier = "nl.jqno.equalsverifier:equalsverifier:3.16.1"
 jacksonAnnots = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson" }
 jacksonCore = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jackson" }
 jacksonDatabind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
@@ -25,6 +24,6 @@ junitApi = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "juni
 junitEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
 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.10.0"
+mockito = "org.mockito:mockito-core:5.12.0"
 spotbugsContrib = "com.mebigfatguy.sb-contrib:sb-contrib:7.6.4"
-versionParser = "org.cthing:versionparser:4.2.1"
+versionParser = "org.cthing:versionparser:4.3.0"
diff --git 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.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/src/test/java/org/cthing/molinillo/ResolverTest.java b/src/test/java/org/cthing/molinillo/ResolverTest.java
@@ -75,7 +75,7 @@ public List<DynamicTest> resolveTestFactory() {
                                 assertThat(result).isEqualTo(testCase.getResult());
                             } else {
                                 final Throwable throwable =
-                                        catchThrowableOfType(() -> testCase.resolve(indexClass), ResolverError.class);
+                                        catchThrowableOfType(ResolverError.class, () -> testCase.resolve(indexClass));
                                 if (throwable instanceof final CircularDependencyError error) {
                                     final List<Payload<TestDependency, TestSpecification>> payloads = error.getPayloads();
                                     final Set<String> deps =
@@ -105,7 +105,7 @@ public void testConflictSource() {
         final TestDependency dep = new TestDependency("missing", "3.0");
         final Resolver<TestDependency, TestSpecification> resolver = new Resolver<>(testIndex, new DebugUI());
         final VersionConflictError versionConflictError =
-                catchThrowableOfType(() -> resolver.resolve(Set.of(dep)), VersionConflictError.class);
+                catchThrowableOfType(VersionConflictError.class, () -> resolver.resolve(Set.of(dep)));
         assertThat(versionConflictError.getMessage()).isEqualTo("""
                              Unable to satisfy the following requirements:
 
@@ -125,8 +125,8 @@ public void testConflictsWithTrees() {
                         .filter(tc -> "yields conflicts if a child dependency is not resolved".equals(tc.getName()))
                         .findFirst()
                         .orElseThrow();
-        final VersionConflictError versionConflictError = catchThrowableOfType(() -> testCase.resolve(TestIndex.class),
-                                                                               VersionConflictError.class);
+        final VersionConflictError versionConflictError = catchThrowableOfType(VersionConflictError.class,
+                                                                               () -> testCase.resolve(TestIndex.class));
         assertThat(versionConflictError.getMessage()).isEqualTo("""
                              Unable to satisfy the following requirements: