From df9d062c978d42a4fd7d9028635baf1ca2602754 Mon Sep 17 00:00:00 2001
From: thc202 <thc202@gmail.com>
Date: Mon, 28 Jun 2021 13:32:10 +0100
Subject: [PATCH] Correct Error Prone setup

Add the required dependency when building the ZAP releases, it also uses
Java 8.

Signed-off-by: thc202 <thc202@gmail.com>
---
 build.gradle.kts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 79f850f36f5..ee2fe6342d4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -35,7 +35,8 @@ allprojects {
     project.plugins.withType(JavaPlugin::class) {
         dependencies {
             "errorprone"("com.google.errorprone:error_prone_core:2.7.1")
-            if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
+            // When building ZAP releases it's also used Java 8.
+            if (JavaVersion.current() == JavaVersion.VERSION_1_8 || System.getenv("ZAP_RELEASE") != null) {
                 "errorproneJavac"("com.google.errorprone:javac:9+181-r4173-1")
             }
         }