From 8375f1650f90aff8354300595ac3bac0d301a78b Mon Sep 17 00:00:00 2001
From: Picnic-Bot <sysops@teampicnic.com>
Date: Thu, 3 Aug 2023 11:06:33 +0200
Subject: [PATCH] Upgrade Error Prone 2.20.0 -> 2.21.0 (#737)

See:
- https://github.com/google/error-prone/releases/tag/v2.21.0
- https://github.com/google/error-prone/compare/v2.20.0...v2.21.0
- https://github.com/PicnicSupermarket/error-prone/compare/v2.20.0-picnic-1...v2.21.0-picnic-1
---
 pom.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 351b8a3678..64835a6766 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,8 +200,8 @@
         <version.auto-service>1.1.1</version.auto-service>
         <version.auto-value>1.10.2</version.auto-value>
         <version.error-prone>${version.error-prone-orig}</version.error-prone>
-        <version.error-prone-fork>v${version.error-prone-orig}-picnic-2</version.error-prone-fork>
-        <version.error-prone-orig>2.20.0</version.error-prone-orig>
+        <version.error-prone-fork>v${version.error-prone-orig}-picnic-1</version.error-prone-fork>
+        <version.error-prone-orig>2.21.0</version.error-prone-orig>
         <version.error-prone-slf4j>0.1.18</version.error-prone-slf4j>
         <version.guava-beta-checker>1.0</version.guava-beta-checker>
         <version.jdk>11</version.jdk>
@@ -1734,9 +1734,6 @@
                                     -Xep:Java7ApiChecker:OFF
                                     <!-- We don't target JDK 8. -->
                                     -Xep:Java8ApiChecker:OFF
-                                    <!-- XXX: Triggers an IOOBE. See
-                                    https://github.com/google/error-prone/pull/3976. -->
-                                    -Xep:MemberName:OFF
                                     <!-- We don't target Android. -->
                                     -Xep:StaticOrDefaultInterfaceMethod:OFF
                                     <!-- We generally discourage `var` use. -->
@@ -1749,6 +1746,8 @@
                                     false-positives.
                                     -XepOpt:CheckReturnValue:CheckAllMethods=true -->
                                     -XepOpt:InlineMe:SkipInliningsWithComments=false
+                                    -XepOpt:NamedLikeContextualKeyword:EnableClassNames=true
+                                    -XepOpt:NamedLikeContextualKeyword:EnableMethodNames=true
                                     -XepOpt:NullAway:AnnotatedPackages=tech.picnic
                                     -XepOpt:NullAway:AssertsEnabled=true
                                     -XepOpt:NullAway:CheckOptionalEmptiness=true