Merge 116ceb7 into f1b0e3c

uber · Jun 21, 2019 · ba43dc2 · ba43dc2
2 parents f1b0e3c + 116ceb7
commit ba43dc2
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/nullaway/src/main/java/com/uber/nullaway/Nullness.java b/nullaway/src/main/java/com/uber/nullaway/Nullness.java
@@ -146,7 +146,10 @@ private static boolean hasNonNullAnnotation(Stream<? extends AnnotationMirror> a
    */
   public static boolean isNullableAnnotation(String annotName) {
     return annotName.endsWith(".Nullable")
-        || annotName.equals("org.checkerframework.checker.nullness.compatqual.NullableDecl");
+        // endsWith and not equals and no `org.`, because gradle's shadow plug in rewrites strings
+        // and will replace `org.checkerframework` with `shadow.checkerframework`. Yes, really...
+        // I assume it's something to handle reflection.
+        || annotName.endsWith(".checkerframework.checker.nullness.compatqual.NullableDecl");
   }
 
   /**