Skip to content

Commit 8b862de

Browse files
committed
chore: make sure to format convention gradle files
1 parent 0a9e03a commit 8b862de

9 files changed

+58
-57
lines changed

build-logic/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ spotless {
2727
endWithNewline()
2828
}
2929
groovyGradle {
30+
target '*.gradle', 'src/main/groovy/**/*.gradle'
3031
greclipse()
3132
endWithNewline()
3233
}
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
2-
id 'com.diffplug.spotless-changelog'
2+
id 'com.diffplug.spotless-changelog'
33
}
44

55

66
spotlessChangelog {
7-
appendDashSnapshotUnless_dashPrelease=true
8-
}
7+
appendDashSnapshotUnless_dashPrelease=true
8+
}

build-logic/src/main/groovy/buildlogic.java-application-conventions.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
*/
66

77
plugins {
8-
// Apply the common convention plugin for shared build configuration between library and application projects.
9-
id 'buildlogic.java-common-conventions'
8+
// Apply the common convention plugin for shared build configuration between library and application projects.
9+
id 'buildlogic.java-common-conventions'
1010

11-
// Apply the application plugin to add support for building a CLI application in Java.
12-
id 'application'
11+
// Apply the application plugin to add support for building a CLI application in Java.
12+
id 'application'
1313
}

build-logic/src/main/groovy/buildlogic.java-common-conventions.gradle

+19-19
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,36 @@
55
*/
66

77
plugins {
8-
// Apply the java Plugin to add support for Java.
9-
id 'java'
10-
id 'buildlogic.spotless-java-conventions'
8+
// Apply the java Plugin to add support for Java.
9+
id 'java'
10+
id 'buildlogic.spotless-java-conventions'
1111
}
1212

1313
repositories {
14-
// Use Maven Central for resolving dependencies.
15-
mavenCentral()
14+
// Use Maven Central for resolving dependencies.
15+
mavenCentral()
1616
}
1717

1818
dependencies {
19-
constraints {
20-
// Define dependency versions as constraints
21-
implementation 'org.apache.commons:commons-text:1.12.0'
22-
}
19+
constraints {
20+
// Define dependency versions as constraints
21+
implementation 'org.apache.commons:commons-text:1.12.0'
22+
}
2323
}
2424

2525
testing {
26-
suites {
27-
// Configure the built-in test suite
28-
test {
29-
// Use JUnit Jupiter test framework
30-
useJUnitJupiter('5.11.1')
31-
}
32-
}
26+
suites {
27+
// Configure the built-in test suite
28+
test {
29+
// Use JUnit Jupiter test framework
30+
useJUnitJupiter('5.11.1')
31+
}
32+
}
3333
}
3434

3535
// Apply a specific Java toolchain to ease working on different environments.
3636
java {
37-
toolchain {
38-
languageVersion = JavaLanguageVersion.of(21)
39-
}
37+
toolchain {
38+
languageVersion = JavaLanguageVersion.of(21)
39+
}
4040
}

build-logic/src/main/groovy/buildlogic.java-library-conventions.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
*/
66

77
plugins {
8-
// Apply the common convention plugin for shared build configuration between library and application projects.
9-
id 'buildlogic.java-common-conventions'
8+
// Apply the common convention plugin for shared build configuration between library and application projects.
9+
id 'buildlogic.java-common-conventions'
1010

11-
// Apply the java-library plugin for API and implementation separation.
12-
id 'java-library'
11+
// Apply the java-library plugin for API and implementation separation.
12+
id 'java-library'
1313
}
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
2-
id 'com.diffplug.spotless'
2+
id 'com.diffplug.spotless'
33
}
44

55
spotless {
6-
// ratchetFrom 'origin/main'
7-
encoding 'UTF-8'
6+
// ratchetFrom 'origin/main'
7+
encoding 'UTF-8'
88
}
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
plugins {
2-
id 'buildlogic.spotless-common-conventions'
2+
id 'buildlogic.spotless-common-conventions'
33
}
44

55
spotless {
6-
groovyGradle {
7-
greclipse()
8-
endWithNewline()
9-
}
10-
}
6+
groovyGradle {
7+
greclipse()
8+
endWithNewline()
9+
}
10+
}
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
plugins {
2-
id 'buildlogic.spotless-common-conventions'
2+
id 'buildlogic.spotless-common-conventions'
33
}
44

55
spotless {
6-
java {
7-
palantirJavaFormat()
8-
formatAnnotations()
9-
removeUnusedImports()
10-
importOrder('java|javax', 'org', 'com', 'com.diffplug', '', '\\#')
11-
licenseHeaderFile rootProject.file('gradle/spotless.license')
12-
endWithNewline()
13-
}
14-
}
6+
java {
7+
palantirJavaFormat()
8+
formatAnnotations()
9+
removeUnusedImports()
10+
importOrder('java|javax', 'org', 'com', 'com.diffplug', '', '\\#')
11+
licenseHeaderFile rootProject.file('gradle/spotless.license')
12+
endWithNewline()
13+
}
14+
}
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
plugins {
2-
id 'buildlogic.spotless-common-conventions'
2+
id 'buildlogic.spotless-common-conventions'
33
}
44

55
spotless {
6-
freshmark { // freshmark for keeping markdown files up to date
7-
target '*.md'
8-
prettier() // prettier for markdown formatting
9-
endWithNewline()
10-
}
11-
12-
}
6+
freshmark {
7+
// freshmark for keeping markdown files up to date
8+
target '*.md'
9+
prettier() // prettier for markdown formatting
10+
endWithNewline()
11+
}
12+
}

0 commit comments

Comments
 (0)