From fa70f0c4ad8e98bdf361ccc2764d0554b75bae5b Mon Sep 17 00:00:00 2001 From: Dan Fox Date: Thu, 5 Dec 2019 22:01:55 +0000 Subject: [PATCH 1/2] PreferJavaTimeOverload:OFF --- .../baseline/extensions/BaselineErrorProneExtension.java | 3 ++- .../com/palantir/baseline/plugins/BaselineErrorProne.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/extensions/BaselineErrorProneExtension.java b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/extensions/BaselineErrorProneExtension.java index ff608606c..bea74932f 100644 --- a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/extensions/BaselineErrorProneExtension.java +++ b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/extensions/BaselineErrorProneExtension.java @@ -50,7 +50,8 @@ public class BaselineErrorProneExtension { // Built-in checks "ArrayEquals", "MissingOverride", - "UnnecessaryParentheses"); + "UnnecessaryParentheses", + "PreferJavaTimeOverload"); private final ListProperty patchChecks; diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineErrorProne.java b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineErrorProne.java index 8a16eb3ae..65244614a 100644 --- a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineErrorProne.java +++ b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineErrorProne.java @@ -192,6 +192,7 @@ private static void configureErrorProneOptions( errorProneOptions.setExcludedPaths(String.format( "%s%s(build|src%sgenerated.*)%s.*", Pattern.quote(projectPath), separator, separator, separator)); errorProneOptions.check("UnusedVariable", CheckSeverity.OFF); + errorProneOptions.check("PreferJavaTimeOverload", CheckSeverity.OFF); // https://github.com/google/error-prone/issues/1435, https://github.com/google/error-prone/issues/1437 errorProneOptions.check("EqualsHashCode", CheckSeverity.ERROR); errorProneOptions.check("EqualsIncompatibleType", CheckSeverity.ERROR); errorProneOptions.check("StreamResourceLeak", CheckSeverity.ERROR); @@ -200,13 +201,13 @@ private static void configureErrorProneOptions( errorProneOptions.check("URLEqualsHashCode", CheckSeverity.ERROR); if (jdkVersion.compareTo(JavaVersion.toVersion("12.0.1")) >= 0) { - // Errorprone isn't officially compatible with Java12, but in practise everything + // As of version 2.3.4, Errorprone isn't officially compatible with Java12, but in practise everything // works apart from this one check: https://github.com/google/error-prone/issues/1106 errorProneOptions.check("Finally", CheckSeverity.OFF); } if (jdkVersion.compareTo(JavaVersion.toVersion("13.0.0")) >= 0) { - // Errorprone isn't officially compatible with Java13 either + // Errorprone 2.3.4 isn't officially compatible with Java13 either // https://github.com/google/error-prone/issues/1106 errorProneOptions.check("TypeParameterUnusedInFormals", CheckSeverity.OFF); errorProneOptions.check("PreferCollectionConstructors", CheckSeverity.OFF); From c45d2879b2d183a5d692f962585a4554e7422976 Mon Sep 17 00:00:00 2001 From: Dan Fox Date: Thu, 5 Dec 2019 22:01:55 +0000 Subject: [PATCH 2/2] Add generated changelog entries --- changelog/@unreleased/pr-1094.v2.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 changelog/@unreleased/pr-1094.v2.yml diff --git a/changelog/@unreleased/pr-1094.v2.yml b/changelog/@unreleased/pr-1094.v2.yml new file mode 100644 index 000000000..c959b98a4 --- /dev/null +++ b/changelog/@unreleased/pr-1094.v2.yml @@ -0,0 +1,6 @@ +type: fix +fix: + description: The `PreferJavaTimeOverload` error-prone check is turned off as it + produces noisy false positives relating to custom AssertJ utilities. + links: + - https://github.com/palantir/gradle-baseline/pull/1094