Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Always include errorprone dependency, even if we're not checking. This ensures consistent use patterns across JVMs.

This commit is contained in:
Dawid Weiss 2021-03-11 22:27:25 +01:00
parent e784721e69
commit 8bbcc39583
1 changed files with 125 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gradle/validation/error-prone.gradle
View File

@ -15,10 +15,9 @@
* limitations under the License. * limitations under the License.
*/ */
// LUCENE-9650: Errorprone on master/gradle no longer works with JDK-16 def includeErrorProne = rootProject.runtimeJavaVersion <= JavaVersion.VERSION_15;
if (rootProject.runtimeJavaVersion > JavaVersion.VERSION_15) { if (!includeErrorProne) {
logger.warn("WARNING: errorprone disabled (won't work with JDK ${rootProject.runtimeJavaVersion})") logger.warn("WARNING: errorprone disabled (won't work with JDK ${rootProject.runtimeJavaVersion})")
return
} }
allprojects { prj -> allprojects { prj ->
@ -29,6 +28,8 @@ allprojects { prj ->
errorprone("com.google.errorprone:error_prone_core") errorprone("com.google.errorprone:error_prone_core")
} }
// LUCENE-9650: Errorprone on master/gradle no longer works with JDK-16
if (includeErrorProne) {
tasks.withType(JavaCompile) { task -> tasks.withType(JavaCompile) { task ->
options.errorprone.disableWarningsInGeneratedCode = true options.errorprone.disableWarningsInGeneratedCode = true
options.errorprone.errorproneArgs = [ options.errorprone.errorproneArgs = [
@ -153,3 +154,4 @@ allprojects { prj ->
} }
} }
} }
}