Skip to content

Commit 80c804a

Browse files
committed
migrate gradle fragment files to pre-compiled plugin scripts
1 parent 2f5385c commit 80c804a

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

local-build-plugins/src/main/groovy/local.code-quality.gradle

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ tasks.register( "formatChecks" ) {
3535
}
3636

3737

38-
tasks.register('enforceRules') {
38+
def enforceRulesTask = tasks.register('enforceRules') {
39+
inputs.dir("src/main/java")
3940
doLast {
4041
def illegalImport = ~/^import (sun|java.awt|org.slf4j)/
4142
def missingNewline = ~/^\s*}\s*(else|catch|finally)/
@@ -65,29 +66,29 @@ tasks.register('enforceRules') {
6566
}
6667
if (!line.startsWith("//")) { //ignore commented-out code
6768
if (line =~ equals) {
68-
equalsMinusHashcode ++
69+
equalsMinusHashcode++
6970
}
7071
if (line =~ hashCode) {
71-
equalsMinusHashcode --
72+
equalsMinusHashcode--
7273
}
7374
}
7475
}
75-
if (equalsMinusHashcode>0) {
76+
if (equalsMinusHashcode > 0) {
7677
errors++
7778
logger.error("Equals with missing hash code in ${shortName}")
7879
}
79-
if (equalsMinusHashcode<0) {
80+
if (equalsMinusHashcode < 0) {
8081
errors++
8182
logger.error("Hash code with missing equals in ${shortName}")
8283
}
8384
}
84-
if ( errors>0 ) {
85+
if (errors > 0) {
8586
throw new GradleException("Code rules were violated ($errors problems)")
8687
}
8788
}
8889
}
8990

90-
tasks.check.dependsOn enforceRules
91+
tasks.check.dependsOn enforceRulesTask
9192

9293
spotless {
9394
//Don't fail during the check: rather than enforcing guidelines, we use this plugin to fix mistakes automatically.
@@ -102,6 +103,8 @@ spotless {
102103
}
103104
}
104105

106+
tasks.compileJava.dependsOn tasks.spotlessJavaApply
107+
105108
checkerFramework {
106109
excludeTests = true
107110
checkers = [

local-build-plugins/src/main/groovy/local.java-module.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,6 @@ tasks.withType( JavaCompile ).configureEach {
155155
}
156156
}
157157

158-
tasks.compileJava.dependsOn "spotlessApply"
159-
160-
161158
processTestResources {
162159
duplicatesStrategy DuplicatesStrategy.INCLUDE
163160

0 commit comments

Comments
 (0)