From 1b52e8c3bd1505f10eae63538377fc602eae4bec Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Sun, 26 Sep 2021 19:10:36 -0700 Subject: [PATCH] Update errorprone --- build-logic/src/main/kotlin/Versions.kt | 2 +- .../src/main/kotlin/cloud.base-conventions.gradle.kts | 6 ++++-- .../java/cloud/commandframework/ParserRegistryTest.java | 1 + .../commandframework/fabric/internal/CloudStringReader.java | 3 ++- .../cloud/commandframework/services/PipelineException.java | 2 +- gradle/libs.versions.yml | 3 +-- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/build-logic/src/main/kotlin/Versions.kt b/build-logic/src/main/kotlin/Versions.kt index e9c2e05c..b7ea9127 100644 --- a/build-logic/src/main/kotlin/Versions.kt +++ b/build-logic/src/main/kotlin/Versions.kt @@ -1,7 +1,7 @@ object Versions { const val checkerQual = "3.9.1" const val geantyref = "1.3.11" - const val errorprone = "2.5.1" + const val errorprone = "2.9.0" // INTEGRATION DEPENDENCIES const val guice = "4.2.3" diff --git a/build-logic/src/main/kotlin/cloud.base-conventions.gradle.kts b/build-logic/src/main/kotlin/cloud.base-conventions.gradle.kts index fe0a81c3..18b46d6d 100644 --- a/build-logic/src/main/kotlin/cloud.base-conventions.gradle.kts +++ b/build-logic/src/main/kotlin/cloud.base-conventions.gradle.kts @@ -32,7 +32,8 @@ tasks { "ImmutableEnumChecker", "StringSplitter", "EqualsGetClass", - "CatchAndPrintStackTrace" + "CatchAndPrintStackTrace", + "InlineMeSuggester", ) } options.compilerArgs.addAll(listOf("-Xlint:-processing", "-Werror")) @@ -89,5 +90,6 @@ dependencies { compileOnlyApi("org.checkerframework", "checker-qual", Versions.checkerQual) testImplementation("org.junit.jupiter", "junit-jupiter-engine", Versions.jupiterEngine) errorprone("com.google.errorprone", "error_prone_core", Versions.errorprone) - compileOnlyApi("com.google.errorprone", "error_prone_annotations", Versions.errorprone) + // Silences compiler warnings from guava using errorprone + compileOnly("com.google.errorprone", "error_prone_annotations", Versions.errorprone) } diff --git a/cloud-core/src/test/java/cloud/commandframework/ParserRegistryTest.java b/cloud-core/src/test/java/cloud/commandframework/ParserRegistryTest.java index 548d6bba..058d6228 100644 --- a/cloud-core/src/test/java/cloud/commandframework/ParserRegistryTest.java +++ b/cloud-core/src/test/java/cloud/commandframework/ParserRegistryTest.java @@ -43,6 +43,7 @@ public class ParserRegistryTest { public static final int RANGE_MIN = 10; public static final int RANGE_MAX = 100; + @SuppressWarnings("ReturnValueIgnored") @Test void testParserRegistry() { final ParserRegistry parserRegistry = new StandardParserRegistry<>(); diff --git a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/internal/CloudStringReader.java b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/internal/CloudStringReader.java index 87c6004b..a07ed85b 100644 --- a/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/internal/CloudStringReader.java +++ b/cloud-minecraft/cloud-fabric/src/main/java/cloud/commandframework/fabric/internal/CloudStringReader.java @@ -28,7 +28,8 @@ import com.mojang.brigadier.StringReader; /** * An extension to the Brigadier StringReader that also implements Queue (via mixin). * - * @see cloud.commandframework.fabric.mixin.CloudStringReaderMixin for the {@link java.util.Queue} implementation + *

See {@link cloud.commandframework.fabric.mixin.CloudStringReaderMixin} for the + * {@link java.util.Queue} implementation.

*/ public final class CloudStringReader extends StringReader { diff --git a/cloud-services/src/main/java/cloud/commandframework/services/PipelineException.java b/cloud-services/src/main/java/cloud/commandframework/services/PipelineException.java index 204f7a00..44e1c757 100644 --- a/cloud-services/src/main/java/cloud/commandframework/services/PipelineException.java +++ b/cloud-services/src/main/java/cloud/commandframework/services/PipelineException.java @@ -28,7 +28,7 @@ import org.checkerframework.checker.nullness.qual.NonNull; /** * Wrapper for exceptions thrown during pipeline execution. * - * @see #getCause() Use {@link #getCause()} to get the wrapped exception + * @see #getCause() Use getCause to get the wrapped exception */ public final class PipelineException extends RuntimeException { diff --git a/gradle/libs.versions.yml b/gradle/libs.versions.yml index 929ebcd0..814d9ca1 100644 --- a/gradle/libs.versions.yml +++ b/gradle/libs.versions.yml @@ -5,7 +5,6 @@ metadata: plugins: com.github.johnrengelman.shadow: 7.0.0 - net.ltgt.errorprone: 2.0.1 com.github.ben-manes.versions: 0.36.0 versions: @@ -15,7 +14,7 @@ versions: checkstyle: 8.39 indra: 2.0.6 gradleTestLogger: 3.0.0 - gradleErrorprone: 2.0.1 + gradleErrorprone: 2.0.2 licenser: 0.6.1 dependencies: