From 27543aa58f41572c7385349b2ff0e1332c0b437a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 28 Jan 2026 19:49:40 +0000
Subject: [PATCH 1/3] Initial plan


From a086dd1a81ff41db9d47bab50816b98a77743cfd Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 28 Jan 2026 20:05:15 +0000
Subject: [PATCH 2/3] Disable AddNullMarkedToClass Error Prone check for Java 8
 compatibility

---
 .../src/main/kotlin/ai.errorprone-conventions.gradle.kts     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/buildSrc/src/main/kotlin/ai.errorprone-conventions.gradle.kts b/buildSrc/src/main/kotlin/ai.errorprone-conventions.gradle.kts
index 2bb535c61a..0d8b920ddd 100644
--- a/buildSrc/src/main/kotlin/ai.errorprone-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/ai.errorprone-conventions.gradle.kts
@@ -83,6 +83,11 @@ tasks {
 
         // Requires adding compile dependency to JSpecify
         disable("AddNullMarkedToPackageInfo")
+
+        // AddNullMarkedToClass also requires JSpecify and causes "unknown enum constant ElementType.MODULE"
+        // warnings when compiling with --release 8, even though we use JDK 21 for compilation.
+        // See: https://github.com/jspecify/jspecify/wiki/version-compatibility
+        disable("AddNullMarkedToClass")
       }
     }
   }

From 18ac515228dd23311279795c2ed5f3f35ab4d623 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 5 Feb 2026 00:14:36 +0000
Subject: [PATCH 3/3] Upgrade Error Prone version from 2.44.0 to 2.46.0

Co-authored-by: xiang17 <9310587+xiang17@users.noreply.github.com>
---
 dependencyManagement/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
index 417076b7de..dc9f9c5163 100644
--- a/dependencyManagement/build.gradle.kts
+++ b/dependencyManagement/build.gradle.kts
@@ -29,7 +29,7 @@ val DEPENDENCY_BOMS = listOf(
 
 val autoServiceVersion = "1.1.1"
 val autoValueVersion = "1.11.1"
-val errorProneVersion = "2.44.0"
+val errorProneVersion = "2.46.0"
 val jmhVersion = "1.37"
 val mockitoVersion = "4.11.0"
 val slf4jVersion = "2.0.17"