mirror of
https://codeberg.org/Mercury-IM/Smack
synced 2024-11-26 00:02:06 +01:00
checkstyle: Use $config_loc for Java 11
Also move configuration files into "${rootProject}/config/checkstyle" to follow convention over configuration. See https://github.com/gradle/gradle/issues/8286#issuecomment-458145619
This commit is contained in:
parent
947244b704
commit
cd0cb95ce1
6 changed files with 2 additions and 3 deletions
|
@ -399,7 +399,6 @@ subprojects {
|
||||||
apply plugin: 'org.kordamp.gradle.clirr'
|
apply plugin: 'org.kordamp.gradle.clirr'
|
||||||
|
|
||||||
checkstyle {
|
checkstyle {
|
||||||
configFile = new File(rootConfigDir, 'checkstyle.xml')
|
|
||||||
toolVersion = '8.10'
|
toolVersion = '8.10'
|
||||||
}
|
}
|
||||||
task sourcesJar(type: Jar, dependsOn: classes) {
|
task sourcesJar(type: Jar, dependsOn: classes) {
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
|
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
|
||||||
<module name="Checker">
|
<module name="Checker">
|
||||||
<module name="SuppressionFilter">
|
<module name="SuppressionFilter">
|
||||||
<property name="file" value="config/suppressions.xml"/>
|
<property name="file" value="${config_loc}/suppressions.xml"/>
|
||||||
</module>
|
</module>
|
||||||
<module name="SuppressWithPlainTextCommentFilter">
|
<module name="SuppressWithPlainTextCommentFilter">
|
||||||
<property name="offCommentFormat" value="CHECKSTYLE\:OFF\:(\w+)"/>
|
<property name="offCommentFormat" value="CHECKSTYLE\:OFF\:(\w+)"/>
|
||||||
|
@ -12,7 +12,7 @@
|
||||||
<property name="checkFormat" value="$1"/>
|
<property name="checkFormat" value="$1"/>
|
||||||
</module>
|
</module>
|
||||||
<module name="Header">
|
<module name="Header">
|
||||||
<property name="headerFile" value="config/${checkstyleLicenseHeader}.txt"/>
|
<property name="headerFile" value="${config_loc}/${checkstyleLicenseHeader}.txt"/>
|
||||||
<property name="ignoreLines" value="3"/>
|
<property name="ignoreLines" value="3"/>
|
||||||
<property name="fileExtensions" value="java"/>
|
<property name="fileExtensions" value="java"/>
|
||||||
</module>
|
</module>
|
Loading…
Reference in a new issue