Skip to content

Commit a43bcd8

Browse files
committed
enable spotless
1 parent de921ad commit a43bcd8

File tree

4 files changed

+26
-0
lines changed

4 files changed

+26
-0
lines changed

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ plugins {
2525
id 'org.hibernate.orm.database-service' apply false
2626
id 'biz.aQute.bnd' version '7.0.0' apply false
2727

28+
id 'com.diffplug.spotless' version '6.25.0'
2829
id 'org.checkerframework' version '0.6.40'
2930
id 'org.hibernate.orm.build.jdks'
3031

gradle/java-module.gradle

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ apply plugin: 'org.hibernate.orm.build.java-module'
3333

3434
apply plugin: 'org.checkerframework'
3535
apply plugin: 'de.thetaphi.forbiddenapis'
36+
apply plugin: 'com.diffplug.spotless'
3637

3738
apply plugin: "jacoco"
3839
apply plugin: 'checkstyle'
@@ -194,6 +195,7 @@ tasks.withType( JavaCompile ) {
194195
]
195196
}
196197

198+
tasks.compileJava.dependsOn spotlessApply
197199

198200
task compile(dependsOn: [compileJava, processResources, compileTestJava, processTestResources] )
199201

@@ -466,6 +468,18 @@ task nonFatalCheckstyle(type:Checkstyle) {
466468
configFile = rootProject.file( 'shared/config/checkstyle/checkstyle-non-fatal.xml' )
467469
}
468470

471+
spotless {
472+
//Don't fail during the check: rather than enforcing guidelines, we use this plugin to fix mistakes automatically.
473+
enforceCheck false
474+
java {
475+
licenseHeaderFile rootProject.file('spotless.license.java')
476+
removeUnusedImports()
477+
trimTrailingWhitespace()
478+
endWithNewline()
479+
}
480+
}
481+
482+
469483
class CompilerStubsArgumentProvider implements CommandLineArgumentProvider {
470484

471485
@InputDirectory

hibernate-core/hibernate-core.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,3 +282,8 @@ tasks.sourcesJar.dependsOn ':hibernate-core:generateGraphParser'
282282
tasks.sourcesJar.dependsOn ':hibernate-core:generateHqlParser'
283283
tasks.sourcesJar.dependsOn ':hibernate-core:generateSqlScriptParser'
284284
tasks.sourcesJar.dependsOn ':hibernate-core:generateOrderingParser'
285+
286+
tasks.spotlessJava.dependsOn ':hibernate-core:generateGraphParser'
287+
tasks.spotlessJava.dependsOn ':hibernate-core:generateHqlParser'
288+
tasks.spotlessJava.dependsOn ':hibernate-core:generateSqlScriptParser'
289+
tasks.spotlessJava.dependsOn ':hibernate-core:generateOrderingParser'

spotless.license.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/*
2+
* Hibernate, Relational Persistence for Idiomatic Java
3+
*
4+
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
5+
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
6+
*/

0 commit comments

Comments
 (0)