From a5bbfaf9600ffe05e6fe5dc26e5fd34665cf3f75 Mon Sep 17 00:00:00 2001 From: Kah Goh Date: Wed, 1 Oct 2025 21:03:18 +0800 Subject: [PATCH] Update to Guava 33.5.0 This redoes 09bf4daffea4 while also updating the imports to fix the compile errors in the CI. --- build.gradle | 2 +- src/main/java/com/exercism/report/Report.java | 4 ++-- src/main/java/com/exercism/report/TestDetails.java | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 9f0dc54..7e82db0 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ dependencies { implementation "com.google.auto.value:auto-value-annotations:$autoValueVersion" annotationProcessor "com.google.auto.value:auto-value:$autoValueVersion" - implementation 'com.google.guava:guava:33.4.0-jre' + implementation 'com.google.guava:guava:33.5.0-jre' implementation "com.fasterxml.jackson.core:jackson-core:$jacksonVersion" implementation "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jacksonVersion" diff --git a/src/main/java/com/exercism/report/Report.java b/src/main/java/com/exercism/report/Report.java index 7398fa3..9a8e5e1 100644 --- a/src/main/java/com/exercism/report/Report.java +++ b/src/main/java/com/exercism/report/Report.java @@ -4,9 +4,9 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; -import java.util.List; +import org.jspecify.annotations.Nullable; -import javax.annotation.Nullable; +import java.util.List; @AutoValue @JsonDeserialize(builder = AutoValue_Report.Builder.class) diff --git a/src/main/java/com/exercism/report/TestDetails.java b/src/main/java/com/exercism/report/TestDetails.java index 5b165a9..6ad1ede 100644 --- a/src/main/java/com/exercism/report/TestDetails.java +++ b/src/main/java/com/exercism/report/TestDetails.java @@ -1,10 +1,9 @@ package com.exercism.report; -import javax.annotation.Nullable; - import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.google.auto.value.AutoValue; +import org.jspecify.annotations.Nullable; import java.util.Optional;