From d467eb2f039d017b5f91b9a19ef3386575c29a7e Mon Sep 17 00:00:00 2001 From: Thomas Broyer Date: Sat, 30 May 2020 21:32:07 +0200 Subject: [PATCH] Add support for -XepDisableAllWarnings --- README.md | 1 + .../kotlin/net/ltgt/gradle/errorprone/ErrorProneOptions.kt | 2 ++ .../kotlin/net/ltgt/gradle/errorprone/ErrorProneOptionsTest.kt | 3 +++ .../net/ltgt/gradle/errorprone/GroovyDslIntegrationTest.kt | 1 + 4 files changed, 7 insertions(+) diff --git a/README.md b/README.md index aee2c07..1431b5d 100644 --- a/README.md +++ b/README.md @@ -322,6 +322,7 @@ you cannot use `<<` or `+=` to add to lists for instance._ | :------- | :---------- | `enabled` | (`isEnabled` with Kotlin DSL) Allows disabling Error Prone altogether for the task. Defaults to `true`. | `disableAllChecks` | Disable all Error Prone checks. This will be the first argument, so checks can then be re-enabled on a case-by-case basis. Defaults to `false`. +| `disableAllWarnings` | (since ErrorProne 2.4.0) Defaults to `false`. | `allErrorsAsWarnings` | Defaults to `false`. | `allDisabledChecksAsWarnings` | Enables all Error Prone checks, checks that are disabled by default are enabled as warnings. Defaults to `false`. | `disableWarningsInGeneratedCode` | Disables warnings in classes annotated with `javax.annotation.processing.Generated` or `@javax.annotation.Generated`. Defaults to `false`. diff --git a/src/main/kotlin/net/ltgt/gradle/errorprone/ErrorProneOptions.kt b/src/main/kotlin/net/ltgt/gradle/errorprone/ErrorProneOptions.kt index db32610..a7aec78 100644 --- a/src/main/kotlin/net/ltgt/gradle/errorprone/ErrorProneOptions.kt +++ b/src/main/kotlin/net/ltgt/gradle/errorprone/ErrorProneOptions.kt @@ -19,6 +19,7 @@ open class ErrorProneOptions constructor( @get:Input val isEnabled = objectFactory.property().convention(false) @get:Input val disableAllChecks = objectFactory.property().convention(false) + @get:Input val disableAllWarnings = objectFactory.property().convention(false) @get:Input val allErrorsAsWarnings = objectFactory.property().convention(false) @get:Input val allDisabledChecksAsWarnings = objectFactory.property().convention(false) @get:Input val disableWarningsInGeneratedCode = objectFactory.property().convention(false) @@ -70,6 +71,7 @@ open class ErrorProneOptions constructor( return ( sequenceOf( booleanOption("-XepDisableAllChecks", disableAllChecks), + booleanOption("-XepDisableAllWarnings", disableAllWarnings), booleanOption("-XepAllErrorsAsWarnings", allErrorsAsWarnings), booleanOption("-XepAllDisabledChecksAsWarnings", allDisabledChecksAsWarnings), booleanOption("-XepDisableWarningsInGeneratedCode", disableWarningsInGeneratedCode), diff --git a/src/test/kotlin/net/ltgt/gradle/errorprone/ErrorProneOptionsTest.kt b/src/test/kotlin/net/ltgt/gradle/errorprone/ErrorProneOptionsTest.kt index 9f52a8b..79a4ed1 100644 --- a/src/test/kotlin/net/ltgt/gradle/errorprone/ErrorProneOptionsTest.kt +++ b/src/test/kotlin/net/ltgt/gradle/errorprone/ErrorProneOptionsTest.kt @@ -54,6 +54,7 @@ class ErrorProneOptionsTest { @Test fun `generates correct error prone options`() { doTestOptions { disableAllChecks.set(true) } + doTestOptions { disableAllWarnings.set(true) } doTestOptions { allErrorsAsWarnings.set(true) } doTestOptions { allDisabledChecksAsWarnings.set(true) } doTestOptions { disableWarningsInGeneratedCode.set(true) } @@ -76,6 +77,7 @@ class ErrorProneOptionsTest { doTestOptions { disableAllChecks.set(true) + disableAllWarnings.set(true) allErrorsAsWarnings.set(true) allDisabledChecksAsWarnings.set(true) disableWarningsInGeneratedCode.set(true) @@ -224,6 +226,7 @@ class ErrorProneOptionsTest { parsedOptions: com.google.errorprone.ErrorProneOptions ) { assertThat(parsedOptions.isDisableAllChecks).isEqualTo(options.disableAllChecks.get()) + assertThat(parsedOptions.isDisableAllWarnings).isEqualTo(options.disableAllWarnings.get()) assertThat(parsedOptions.isDropErrorsToWarnings).isEqualTo(options.allErrorsAsWarnings.get()) assertThat(parsedOptions.isEnableAllChecksAsWarnings).isEqualTo(options.allDisabledChecksAsWarnings.get()) assertThat(parsedOptions.disableWarningsInGeneratedCode()).isEqualTo(options.disableWarningsInGeneratedCode.get()) diff --git a/src/test/kotlin/net/ltgt/gradle/errorprone/GroovyDslIntegrationTest.kt b/src/test/kotlin/net/ltgt/gradle/errorprone/GroovyDslIntegrationTest.kt index dc44cdc..efe1a45 100644 --- a/src/test/kotlin/net/ltgt/gradle/errorprone/GroovyDslIntegrationTest.kt +++ b/src/test/kotlin/net/ltgt/gradle/errorprone/GroovyDslIntegrationTest.kt @@ -57,6 +57,7 @@ class GroovyDslIntegrationTest : AbstractPluginIntegrationTest() { // configure with the default values, we only want to check the DSL, not the effects enabled = true disableAllChecks = false + disableAllWarnings = false allErrorsAsWarnings = false allDisabledChecksAsWarnings = false disableWarningsInGeneratedCode = false