Update Errorprone and nullaway

mlopatkin · Nov 10, 2024 · 09085a0 · 09085a0
1 parent c48a8ee
commit 09085a0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/base/src/main/java/name/mlopatkin/andlogview/utils/MyFutures.java b/base/src/main/java/name/mlopatkin/andlogview/utils/MyFutures.java
@@ -173,7 +173,7 @@ public static Function<Throwable, Void> exceptionHandler(Runnable consumer) {
      * @return the function that adapts the consumer to Void returning type
      */
     public static <T> BiFunction<T, @Nullable Throwable, Void> consumingHandler(
-            BiConsumer<? super @Nullable T, @Nullable ? super Throwable> consumer) {
+            BiConsumer<? super @Nullable T, ? super @Nullable Throwable> consumer) {
         return (r, th) -> {
             consumer.accept(r, th);
             return null;
@@ -189,7 +189,7 @@ public static Function<Throwable, Void> exceptionHandler(Runnable consumer) {
      * @return the function that adapts the consumers to Void returning type
      */
     public static <T> BiFunction<T, @Nullable Throwable, Void> consumingHandler(
-            Consumer<? super T> valueConsumer, Consumer<@Nullable ? super Throwable> errorConsumer) {
+            Consumer<? super T> valueConsumer, Consumer<? super Throwable> errorConsumer) {
         return (r, th) -> {
             if (th != null) {
                 errorConsumer.accept(th);

diff --git a/device/src/main/java/name/mlopatkin/andlogview/device/CommandImpl.java b/device/src/main/java/name/mlopatkin/andlogview/device/CommandImpl.java
@@ -25,7 +25,6 @@
 import com.android.ddmlib.MultiLineReceiver;
 
 import org.apache.log4j.Logger;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.io.IOException;
@@ -137,7 +136,7 @@ private String formatCommandLine() {
         return String.join(" ", commandLine);
     }
 
-    private <@NonNull T extends ForStderr> T getRedirectWithDefault(@Nullable T redirect, T defRedirect) {
+    private <T extends ForStderr> T getRedirectWithDefault(@Nullable T redirect, T defRedirect) {
         if (redirect != null) {
             return redirect;
         }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -12,11 +12,11 @@ sourceJavaVersion = "16"
 runtimeJdkVersion = "8"  # JDK version used at runtime, determines available APIs
 
 [libraries]
-build-errorprone-core = "com.google.errorprone:error_prone_core:2.22.0"
+build-errorprone-core = "com.google.errorprone:error_prone_core:2.35.1"
 build-errorprone-plugin = { module = "net.ltgt.gradle:gradle-errorprone-plugin", version.ref = "errorpronePlugin" }
 build-jabel = "com.github.bsideup.jabel:jabel-javac-plugin:1.0.0"
 build-javapoet = "com.squareup:javapoet:1.13.0"
-build-nullaway = "com.uber.nullaway:nullaway:0.10.14"
+build-nullaway = "com.uber.nullaway:nullaway:0.12.1"
 checkerframeworkAnnotations = "org.checkerframework:checker-qual:3.38.0"
 dagger-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger" }
 dagger-runtime = { module = "com.google.dagger:dagger", version.ref = "dagger" }

diff --git a/search/src/main/java/name/mlopatkin/andlogview/search/text/SearchRequestParser.java b/search/src/main/java/name/mlopatkin/andlogview/search/text/SearchRequestParser.java
@@ -21,8 +21,6 @@
 import com.google.common.base.CharMatcher;
 import com.google.common.base.Preconditions;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-
 /**
  * This class parses a single query and determines whether it is a plain text search or regex. Then it extracts query
  * value and asks delegate to create a searcher.
@@ -35,7 +33,7 @@
  *
  * @param <T> the type of the searcher to build
  */
-public class SearchRequestParser<@NonNull T> {
+public class SearchRequestParser<T> {
     /**
      * Delegate that actually creates a searcher.
      *

diff --git a/src/name/mlopatkin/andlogview/ui/logtable/Column.java b/src/name/mlopatkin/andlogview/ui/logtable/Column.java
@@ -138,6 +138,7 @@ public String getStrValue(int rowIndex, LogRecord record) {
         return String.valueOf(getValue(rowIndex, record));
     }
 
+    @SuppressWarnings("EnumOrdinal")
     private int getIndex() {
         return ordinal();
     }