diff options
| author | aurimas <aurimas@chromium.org> | 2014-10-20 15:22:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-20 22:23:27 +0000 |
| commit | d1b316d5d0d00ce62b4d13dd7cda0e8930e55e09 (patch) | |
| tree | 4ec781a37bfc949f17043d81b90bea8e49f5afd0 /tools/android/checkstyle | |
| parent | 263e86f88ffc1c8587a5d3141fbc5d6f0ca8519b (diff) | |
| download | chromium_src-d1b316d5d0d00ce62b4d13dd7cda0e8930e55e09.zip chromium_src-d1b316d5d0d00ce62b4d13dd7cda0e8930e55e09.tar.gz chromium_src-d1b316d5d0d00ce62b4d13dd7cda0e8930e55e09.tar.bz2 | |
Roll to Checkstyle 5.9 and enable Indentation check.
Release notes for Checkstyle 5.9
http://checkstyle.sourceforge.net/releasenotes.html
The most important part is all the fixes for Indentation check that allows
us to finally enable it for presubmit.
Also adding OWNERS file to checkstyle directory.
BUG=318404
TBR=yfriedman@chromium.org
Review URL: https://codereview.chromium.org/661153003
Cr-Commit-Position: refs/heads/master@{#300353}
Diffstat (limited to 'tools/android/checkstyle')
| -rw-r--r-- | tools/android/checkstyle/OWNERS | 2 | ||||
| -rw-r--r-- | tools/android/checkstyle/checkstyle.py | 2 | ||||
| -rw-r--r-- | tools/android/checkstyle/chromium-style-5.0.xml | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/tools/android/checkstyle/OWNERS b/tools/android/checkstyle/OWNERS new file mode 100644 index 0000000..577bf98 --- /dev/null +++ b/tools/android/checkstyle/OWNERS @@ -0,0 +1,2 @@ +aurimas@chromium.org +newt@chromium.org diff --git a/tools/android/checkstyle/checkstyle.py b/tools/android/checkstyle/checkstyle.py index 6b54c77..c8ad04f 100644 --- a/tools/android/checkstyle/checkstyle.py +++ b/tools/android/checkstyle/checkstyle.py @@ -13,7 +13,7 @@ CHROMIUM_SRC = os.path.normpath( os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, os.pardir)) CHECKSTYLE_ROOT = os.path.join(CHROMIUM_SRC, 'third_party', 'checkstyle', - 'checkstyle-5.8-all.jar') + 'checkstyle-5.9-all.jar') def RunCheckstyle(input_api, output_api, style_file): diff --git a/tools/android/checkstyle/chromium-style-5.0.xml b/tools/android/checkstyle/chromium-style-5.0.xml index 7f6b7ee..17b44b4 100644 --- a/tools/android/checkstyle/chromium-style-5.0.xml +++ b/tools/android/checkstyle/chromium-style-5.0.xml @@ -158,11 +158,11 @@ <property name="option" value="top"/> <property name="separated" value="true"/> </module> - <!-- TODO(aurimas): make indentation an error once https://github.com/checkstyle/checkstyle/issues/255 is fixed. --> <module name="Indentation"> - <property name="severity" value="info"/> + <property name="severity" value="error"/> <property name="basicOffset" value="4"/> <property name="throwsIndent" value="8"/> + <property name="lineWrappingIndentation" value="8"/> </module> </module> <module name="FileTabCharacter"> |