diff options
Diffstat (limited to 'buildscripts')
| -rw-r--r-- | buildscripts/checkstyle.xml | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/buildscripts/checkstyle.xml b/buildscripts/checkstyle.xml index b136c208..bfdc314f 100644 --- a/buildscripts/checkstyle.xml +++ b/buildscripts/checkstyle.xml @@ -157,14 +157,15 @@ <message key="ws.notPreceded" value="GenericWhitespace ''{0}'' is not preceded with whitespace."/> </module> - <module name="Indentation"> - <property name="basicOffset" value="2"/> - <property name="braceAdjustment" value="0"/> - <property name="caseIndent" value="2"/> - <property name="throwsIndent" value="4"/> - <property name="lineWrappingIndentation" value="4"/> - <property name="arrayInitIndent" value="2"/> - </module> + <!-- <!-\- Checkstyle indentation rules conflict with google-java-format: -\-> --> + <!-- <module name="Indentation"> --> + <!-- <property name="basicOffset" value="2"/> --> + <!-- <property name="braceAdjustment" value="0"/> --> + <!-- <property name="caseIndent" value="2"/> --> + <!-- <property name="throwsIndent" value="4"/> --> + <!-- <property name="lineWrappingIndentation" value="4"/> --> + <!-- <property name="arrayInitIndent" value="2"/> --> + <!-- </module> --> <module name="AbbreviationAsWordInName"> <property name="ignoreFinal" value="false"/> <property name="allowedAbbreviationLength" value="1"/> |