diff options
| author | Yuriy Piskarev <yuriy.piskarev@gmail.com> | 2023-08-24 14:16:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-24 14:16:17 +0300 |
| commit | ae406c7b49a72de24d81fd74386d9638342c90ee (patch) | |
| tree | 6fbcf557375b98e926c78af9c757e62c79d72a1b /gradle | |
| parent | 56ff656c908b19feb2fa3dcffa48cc3bcdfe9b3b (diff) | |
| parent | 9aeedc90da24848ff97227d6f281eb4d1e1506ef (diff) | |
| download | trackermap-server-ae406c7b49a72de24d81fd74386d9638342c90ee.tar.gz trackermap-server-ae406c7b49a72de24d81fd74386d9638342c90ee.tar.bz2 trackermap-server-ae406c7b49a72de24d81fd74386d9638342c90ee.zip | |
Merge branch 'traccar:master' into master
Diffstat (limited to 'gradle')
| -rw-r--r-- | gradle/checkstyle.xml | 10 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/gradle/checkstyle.xml b/gradle/checkstyle.xml index 9d30e53d6..bb89450d6 100644 --- a/gradle/checkstyle.xml +++ b/gradle/checkstyle.xml @@ -79,7 +79,9 @@ <!--<module name="MethodLength"> <property name="max" value="200"/> </module>--> - <module name="ParameterNumber"/> + <module name="ParameterNumber"> + <property name="tokens" value="METHOD_DEF"/> + </module> <!-- Checks for whitespace --> <!-- See http://checkstyle.sf.net/config_whitespace.html --> @@ -112,7 +114,7 @@ <module name="EmptyStatement"/> <module name="EqualsHashCode"/> <module name="IllegalInstantiation"/> - <module name="InnerAssignment"/> + <!--<module name="InnerAssignment"/>--> <module name="MissingSwitchDefault"/> <module name="SimplifyBooleanExpression"/> <module name="SimplifyBooleanReturn"/> @@ -122,7 +124,9 @@ <module name="FinalClass"/> <module name="HideUtilityClassConstructor"/> <module name="InterfaceIsType"/> - <module name="VisibilityModifier"/> + <module name="VisibilityModifier"> + <property name="protectedAllowed" value="true"/> + </module> <!-- Miscellaneous other checks. --> <!-- See http://checkstyle.sf.net/config_misc.html --> diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 00e33edef..ae04661ee 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists |