summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Herlant <aerostitch@users.noreply.github.com>2019-11-25 16:46:01 -0800
committerGitHub <noreply@github.com>2019-11-25 16:46:01 -0800
commit7feda7533796bb96e88dddba0ff7f5301b8e82b7 (patch)
treeaa04647469e614fb4fead9006bfd0e8bfde8241b
parentf742fffc90e98c25be2cea100ab89f6f157eee9d (diff)
downloadnavit-7feda7533796bb96e88dddba0ff7f5301b8e82b7.tar.gz
fix:ci:Fix checkstyle changes since 8.24 (#946)
* fix:ci:TreeWalker is not allowed as a parent of LineLength since 8.24 * fix:ci:minLineCount has been removed from JavadocMethod in checkstyle 8.25 * Upgrade checkstyle to 8.26 * update:doc:Specify a minimum version needed for checkstyle outside of gradle
-rw-r--r--checkstyle.xml12
-rw-r--r--docs/development/programming_guidelines.rst4
-rw-r--r--navit/android/build.gradle2
3 files changed, 11 insertions, 7 deletions
diff --git a/checkstyle.xml b/checkstyle.xml
index 6c232edce..8a19f6944 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -31,6 +31,12 @@
<property name="eachLine" value="true"/>
</module>
+ <module name="LineLength">
+ <property name="max" value="120"/>
+ <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+ <property name="severity" value="error"/>
+ </module>
+
<module name="TreeWalker">
<module name="OuterTypeFilename"/>
<module name="IllegalTokenText">
@@ -45,11 +51,6 @@
<property name="allowByTailComment" value="true"/>
<property name="allowNonPrintableEscapes" value="true"/>
</module>
- <module name="LineLength">
- <property name="max" value="120"/>
- <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
- <property name="severity" value="error"/>
- </module>
<module name="AvoidStarImport"/>
<module name="OneTopLevelClass"/>
<module name="NoLineWrap"/>
@@ -258,7 +259,6 @@
<property name="allowMissingParamTags" value="true"/>
<property name="allowMissingThrowsTags" value="true"/>
<property name="allowMissingReturnTag" value="true"/>
- <property name="minLineCount" value="2"/>
<property name="allowedAnnotations" value="Override, Test"/>
<property name="allowThrowsTagsForSubclasses" value="true"/>
</module>
diff --git a/docs/development/programming_guidelines.rst b/docs/development/programming_guidelines.rst
index c04f8daab..66dc257a4 100644
--- a/docs/development/programming_guidelines.rst
+++ b/docs/development/programming_guidelines.rst
@@ -206,4 +206,8 @@ For the Java code we follow the Google coding conventions from Google Java Style
This style is enforced by using Checkstyle. Its definition file can be found at the root of the repository:
`checkstyle.xml <https://github.com/navit-gps/navit/blob/trunk/checkstyle.xml>`_
+.. note::
+
+ Checkstyle 8.25 minimum is required if you want to run checkstyle without using gradle.
+
Please add yourself to the list of authors, if you make a significant change.
diff --git a/navit/android/build.gradle b/navit/android/build.gradle
index 55455958a..b18bad109 100644
--- a/navit/android/build.gradle
+++ b/navit/android/build.gradle
@@ -68,7 +68,7 @@ android {
}
checkstyle {
- toolVersion = '8.10'
+ toolVersion = '8.26'
}
}
applicationVariants.all { variant ->