From b2dc113a7f0b2b0cc21e0015591fe205f8b83a8d Mon Sep 17 00:00:00 2001
From: Tim van der Lippe <tvanderlippe@google.com>
Date: Thu, 27 Jan 2022 11:08:49 +0000
Subject: [PATCH] Fix compilation for JDK 8

This also fixes #2554, by using `.withNoParameters()` instead.
---
 build.gradle                                               | 6 ++++--
 settings.gradle.kts                                        | 7 ++++++-
 .../bugpatterns/MockitoAnyIncorrectPrimitiveType.java      | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4c37b6e3e7..052977e8a6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -52,8 +52,10 @@ allprojects { proj ->
         mavenCentral()
         google()
     }
-    plugins.withId('java') {
-        proj.apply from: "$rootDir/gradle/errorprone.gradle"
+    if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) {
+        plugins.withId('java') {
+            proj.apply from: "$rootDir/gradle/errorprone.gradle"
+        }
     }
     tasks.withType(JavaCompile) {
         //I don't believe those warnings add value given modern IDEs
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f5a786dfdc..5aad31c670 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -14,11 +14,16 @@ include("inline",
     "junitJupiterInlineMockMakerExtensionTest",
     "module-test",
     "memory-test",
-    "errorprone",
     "junitJupiterParallelTest",
     "osgi-test",
     "bom")
 
+if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) {
+    include("errorprone")
+} else {
+    logger.info("Not including errorprone, which requires minimum JDK 11+")
+}
+
 if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17) && (System.getenv("ANDROID_SDK_ROOT") != null || File(".local.properties").exists())) {
     include("androidTest")
 } else {
diff --git a/subprojects/errorprone/src/main/java/org/mockito/errorprone/bugpatterns/MockitoAnyIncorrectPrimitiveType.java b/subprojects/errorprone/src/main/java/org/mockito/errorprone/bugpatterns/MockitoAnyIncorrectPrimitiveType.java
index 48b7ee11e1..b73610b45d 100644
--- a/subprojects/errorprone/src/main/java/org/mockito/errorprone/bugpatterns/MockitoAnyIncorrectPrimitiveType.java
+++ b/subprojects/errorprone/src/main/java/org/mockito/errorprone/bugpatterns/MockitoAnyIncorrectPrimitiveType.java
@@ -49,7 +49,7 @@ public class MockitoAnyIncorrectPrimitiveType extends AbstractMockitoAnyForPrimi
   };
 
   private static final Matcher<ExpressionTree> METHOD_MATCHER =
-      staticMethod().onClassAny(CLASS_NAMES).withNameMatching(METHOD_NAME_PATTERN).withParameters();
+      staticMethod().onClassAny(CLASS_NAMES).withNameMatching(METHOD_NAME_PATTERN).withNoParameters();
 
   @Override
   protected Matcher<? super MethodInvocationTree> matcher() {