From 178f9785d1752e47b2d88f59a39880216e862425 Mon Sep 17 00:00:00 2001 From: Carter Kozak Date: Wed, 21 Sep 2022 20:15:42 -0400 Subject: [PATCH 1/3] Error-prone is enabled in idea for uniformity with CLI compilation error-prone requires several javac options to access compiler innards, which have the side-effect of enabling immutables to function correctly. Given this spooky interaction and our migration toward jdk17 source, it's best to provide uniform behavior. --- .../com/palantir/baseline/plugins/BaselineErrorProne.java | 3 +-- .../baseline/BaselineErrorProneIntegrationTest.groovy | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) 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 ea14e8071..5a3f2f4fa 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 @@ -22,7 +22,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.MoreCollectors; -import com.palantir.baseline.IntellijSupport; import com.palantir.baseline.extensions.BaselineErrorProneExtension; import com.palantir.baseline.tasks.CompileRefasterTask; import java.io.File; @@ -349,7 +348,7 @@ private static boolean isErrorProneRefactoring(Project project) { private static boolean isDisabled(Project project) { Object disable = project.findProperty(DISABLE_PROPERTY); if (disable == null) { - return IntellijSupport.isRunningInIntellij(); + return false; } else { return !disable.equals("false"); } diff --git a/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineErrorProneIntegrationTest.groovy b/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineErrorProneIntegrationTest.groovy index 1aefcec9d..e492178e2 100644 --- a/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineErrorProneIntegrationTest.groovy +++ b/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineErrorProneIntegrationTest.groovy @@ -106,14 +106,16 @@ class BaselineErrorProneIntegrationTest extends AbstractPluginTest { result.task(":compileJava").outcome == TaskOutcome.SUCCESS } - def 'error-prone is disabled in IntelliJ'() { + def 'error-prone is not disabled in IntelliJ'() { when: buildFile << standardBuildFile file('src/main/java/test/Test.java') << invalidJavaFile then: BuildResult result = with('compileJava', '-Didea.active=true').build() - result.task(":compileJava").outcome == TaskOutcome.SUCCESS + result.task(":compileJava").outcome == TaskOutcome.FAILED + result.output.contains("[ArrayEquals] Reference equality used to compare arrays") + } def 'error-prone can be enabled using property'() { From f6623e8456af2f43dd7e2bd4caf7c6c67c4436bd Mon Sep 17 00:00:00 2001 From: svc-changelog Date: Thu, 22 Sep 2022 00:18:26 +0000 Subject: [PATCH 2/3] Add generated changelog entries --- changelog/@unreleased/pr-2405.v2.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/@unreleased/pr-2405.v2.yml diff --git a/changelog/@unreleased/pr-2405.v2.yml b/changelog/@unreleased/pr-2405.v2.yml new file mode 100644 index 000000000..e3ca837eb --- /dev/null +++ b/changelog/@unreleased/pr-2405.v2.yml @@ -0,0 +1,5 @@ +type: improvement +improvement: + description: Error-prone is enabled in idea for uniformity with CLI compilation + links: + - https://github.com/palantir/gradle-baseline/pull/2405 From a52e2d2761e3d5003fe80b2a45e7832e9f95e70b Mon Sep 17 00:00:00 2001 From: Carter Kozak Date: Thu, 22 Sep 2022 09:26:42 -0400 Subject: [PATCH 3/3] buildAndFail --- .../palantir/baseline/BaselineErrorProneIntegrationTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineErrorProneIntegrationTest.groovy b/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineErrorProneIntegrationTest.groovy index e492178e2..b4b3e0639 100644 --- a/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineErrorProneIntegrationTest.groovy +++ b/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineErrorProneIntegrationTest.groovy @@ -112,7 +112,7 @@ class BaselineErrorProneIntegrationTest extends AbstractPluginTest { file('src/main/java/test/Test.java') << invalidJavaFile then: - BuildResult result = with('compileJava', '-Didea.active=true').build() + BuildResult result = with('compileJava', '-Didea.active=true').buildAndFail() result.task(":compileJava").outcome == TaskOutcome.FAILED result.output.contains("[ArrayEquals] Reference equality used to compare arrays")