Skip to content

Commit

Permalink
update build
Browse files Browse the repository at this point in the history
  • Loading branch information
xvik committed Jan 2, 2015
1 parent a5743d6 commit 3ad2d1d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
4 changes: 0 additions & 4 deletions gradle/config/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
<module name="InnerAssignment"/>
<module name="InnerTypeLast"/>
<module name="InterfaceIsType"/>
<module name="JUnitTestCase"/>
<module name="JavaNCSS"/>
<module name="JavadocStyle"/>
<module name="JavadocType"/>
Expand Down Expand Up @@ -113,9 +112,6 @@
<module name="ParenPad"/>
<module name="RedundantImport"/>
<module name="RedundantModifier"/>
<module name="RedundantThrows">
<property name="suppressLoadErrors" value="true"/>
</module>
<module name="RightCurly"/>
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
Expand Down
9 changes: 5 additions & 4 deletions gradle/quality.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,16 @@ gradle.taskGraph.afterTask { Task task, TaskState state ->
apply plugin: 'pmd'

pmd {
toolVersion = "5.2.2"
toolVersion = "5.2.3"
ignoreFailures = false
ruleSetFiles = files("gradle/config/pmd/pmd.xml")
sourceSets = [sourceSets.main]
}
// pmd 5.2 was split into two jars, have to declare dependencies manually to work properly (waiting gradle support)
dependencies {
pmd(
'net.sourceforge.pmd:pmd-core:5.2.2',
'net.sourceforge.pmd:pmd-java:5.2.2'
'net.sourceforge.pmd:pmd-core:5.2.3',
'net.sourceforge.pmd:pmd-java:5.2.3'
)
}

Expand All @@ -123,8 +123,9 @@ gradle.taskGraph.afterTask { Task task, TaskState state ->

apply plugin: 'checkstyle'

// Note: checkstyle 6.2 requires jdk7 or above. For jdk6 use older version (6.1.1)
checkstyle {
toolVersion = "6.1.1"
toolVersion = "6.2"
ignoreFailures = false
sourceSets = [sourceSets.main]
configFile = file('gradle/config/checkstyle/checkstyle.xml')
Expand Down

0 comments on commit 3ad2d1d

Please sign in to comment.