Skip to content

Error-prone is enabled in idea for uniformity with CLI compilation #2405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bulldozer-bot merged 3 commits into from
Sep 22, 2022
Merged

Error-prone is enabled in idea for uniformity with CLI compilation #2405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
178f978
Error-prone is enabled in idea for uniformity with CLI compilation
Sep 22, 2022
f6623e8
Add generated changelog entries
svc-changelog Sep 22, 2022
a52e2d2
buildAndFail
Sep 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions changelog/@unreleased/pr-2405.v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 1 addition & 2 deletions gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineErrorProne.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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");
}
Expand Down
8 changes: 5 additions & 3 deletions ...eline-java/src/test/groovy/com/palantir/baseline/BaselineErrorProneIntegrationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
BuildResult result = with('compileJava', '-Didea.active=true').buildAndFail()
result.task(":compileJava").outcome == TaskOutcome.FAILED
result.output.contains("[ArrayEquals] Reference equality used to compare arrays")

}

def 'error-prone can be enabled using property'() {
Expand Down