Skip to content

Commit 54987db

Browse files
committed
Add Checkstyle and Codenarc versions to Gradle version catalog
Improve the 'clean' tasks Closes gh-80
1 parent 4b7ddea commit 54987db

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,15 @@ dependencies {
3232

3333
def cleanTask = project.tasks.findByName('clean')
3434
if (cleanTask == null) {
35-
task clean(type: Delete) {
36-
delete(buildDir)
35+
def buildDir = project.layout.buildDirectory
36+
tasks.register('clean', Delete) {
37+
it.delete(buildDir)
3738
}
3839
}
3940
else {
41+
def docsDir = project.layout.buildDirectory.dir('docs')
4042
cleanTask.doLast {
41-
ant.delete(dir: 'build/docs')
43+
((Delete) it).delete(docsDir)
4244
}
4345
}
4446

buildSrc/settings.gradle

Whitespace-only changes.

buildSrc/src/main/groovy/grace.build.common.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ configure([javadoc]) {
7777
}
7878

7979
checkstyle {
80-
toolVersion = "10.26.1"
80+
toolVersion = libs.versions.checkstyle.get()
8181
configDirectory.set(rootProject.file("config/checkstyle"))
8282
}
8383

8484
codenarc {
85-
toolVersion = '3.6.0'
85+
toolVersion = libs.versions.codenarc.get()
8686
config = resources.text.fromFile(rootProject.file("config/codenarc/codenarc.groovy"))
8787
}
8888

gradle/libs.versions.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
[versions]
22
caffeine = "3.1.8"
3+
checkstyle = "10.26.1"
4+
codenarc = "3.6.0"
35
commons-validator = "1.9.0"
46
eclipse-expressly = "5.0.0"
57
grace-gradle = "2024.0.0-M1"

0 commit comments

Comments
 (0)