diff options
| author | casswarry0 <casswarry0@gmail.com> | 2023-01-17 17:14:53 -0700 |
|---|---|---|
| committer | casswarry0 <casswarry0@gmail.com> | 2023-01-17 17:14:53 -0700 |
| commit | 7338b8730949ed027b3f8b31d7dca20687ebbb8b (patch) | |
| tree | c2d171e6121818ab511460a786f69aab97a2a628 /gradle | |
| parent | cdecd3fa4427a382c0b09f8ad9d69ec14388960a (diff) | |
| parent | 85501f9cf4918d5eee345f83aed7a31eecb26b8d (diff) | |
| download | trackermap-server-7338b8730949ed027b3f8b31d7dca20687ebbb8b.tar.gz trackermap-server-7338b8730949ed027b3f8b31d7dca20687ebbb8b.tar.bz2 trackermap-server-7338b8730949ed027b3f8b31d7dca20687ebbb8b.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'gradle')
| -rw-r--r-- | gradle/checkstyle.xml | 8 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.jar | bin | 58695 -> 59821 bytes | |||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/gradle/checkstyle.xml b/gradle/checkstyle.xml index 9d30e53d6..a6a6f0ff7 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 --> @@ -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.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex f3d88b1c2..41d9927a4 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8cf6eb5ad..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-6.8.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists |