Skip to content

Commit d8ec757

Browse files
marcphilippmarcphilipp
committed
Apply Spotless formatting to Gradle script plugins
1 parent dae525d commit d8ec757

8 files changed

+64
-65
lines changed

‎gradle/plugins/code-generator/build.gradle.kts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
plugins {
2-
`kotlin-dsl`
2+
`kotlin-dsl`
33
}
44

55
repositories {
6-
gradlePluginPortal()
6+
gradlePluginPortal()
77
}
88

99
dependencies {
10-
implementation("junitbuild.base:code-generator-model")
11-
implementation(projects.common)
12-
implementation(libs.jackson.dataformat.yaml)
13-
implementation(libs.jackson.module.kotlin)
14-
implementation(libs.jte)
10+
implementation("junitbuild.base:code-generator-model")
11+
implementation(projects.common)
12+
implementation(libs.jackson.dataformat.yaml)
13+
implementation(libs.jackson.module.kotlin)
14+
implementation(libs.jte)
1515
}

‎gradle/plugins/code-generator/src/main/kotlin/junitbuild.code-generator.gradle.kts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import junitbuild.generator.GenerateJreRelatedSourceCode
22

33
plugins {
4-
java
4+
java
55
}
66

77
val templates by sourceSets.registering
88
dependencies {
9-
add(templates.get().compileOnlyConfigurationName, dependencyFromLibs("jte"))
10-
add(templates.get().compileOnlyConfigurationName, "junitbuild.base:code-generator-model")
9+
add(templates.get().compileOnlyConfigurationName, dependencyFromLibs("jte"))
10+
add(templates.get().compileOnlyConfigurationName, "junitbuild.base:code-generator-model")
1111
}
1212

1313
val license: License by rootProject.extra
@@ -16,20 +16,20 @@ val generateCode by tasks.registering
1616

1717
sourceSets.named { it != templates.name }.configureEach {
1818

19-
val sourceSetName = name
20-
val sourceSetTargetDir = rootTargetDir.map { it.dir(sourceSetName) }
19+
val sourceSetName = name
20+
val sourceSetTargetDir = rootTargetDir.map { it.dir(sourceSetName) }
2121

22-
val task = tasks.register(getTaskName("generateJreRelated", "SourceCode"), GenerateJreRelatedSourceCode::class) {
23-
templateDir.convention(layout.dir(templates.map {
24-
it.resources.srcDirs.single().resolve(sourceSetName)
25-
}))
26-
targetDir.convention(sourceSetTargetDir)
27-
licenseHeaderFile.convention(license.headerFile)
28-
}
22+
val task = tasks.register(getTaskName("generateJreRelated", "SourceCode"), GenerateJreRelatedSourceCode::class) {
23+
templateDir.convention(layout.dir(templates.map {
24+
it.resources.srcDirs.single().resolve(sourceSetName)
25+
}))
26+
targetDir.convention(sourceSetTargetDir)
27+
licenseHeaderFile.convention(license.headerFile)
28+
}
2929

30-
java.srcDir(files(sourceSetTargetDir).builtBy(task))
30+
java.srcDir(files(sourceSetTargetDir).builtBy(task))
3131

32-
generateCode {
33-
dependsOn(task)
34-
}
32+
generateCode {
33+
dependsOn(task)
34+
}
3535
}

‎gradle/plugins/common/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -162,15 +162,15 @@ val allMainClasses by tasks.registering {
162162
}
163163

164164
val prepareModuleSourceDir by tasks.registering(Sync::class) {
165-
from(moduleSourceDir)
166-
from(sourceSets.named { it.startsWith("main") }.map { it.allJava })
167-
into(combinedModuleSourceDir.map { it.dir(javaModuleName) })
168-
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
165+
from(moduleSourceDir)
166+
from(sourceSets.named { it.startsWith("main") }.map { it.allJava })
167+
into(combinedModuleSourceDir.map { it.dir(javaModuleName) })
168+
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
169169
}
170170

171171
val compileModule by tasks.registering(JavaCompile::class) {
172172
dependsOn(allMainClasses)
173-
enabled = project in modularProjects
173+
enabled = project in modularProjects
174174
source = fileTree(combinedModuleSourceDir).builtBy(prepareModuleSourceDir)
175175
destinationDirectory = moduleOutputDir
176176
sourceCompatibility = "9"
@@ -184,22 +184,22 @@ val compileModule by tasks.registering(JavaCompile::class) {
184184
"--module-version", "${project.version}",
185185
))
186186

187-
val moduleOptions = objects.newInstance(ModuleCompileOptions::class)
188-
extensions.add("moduleOptions", moduleOptions)
189-
moduleOptions.modulePath.from(configurations.compileClasspath)
187+
val moduleOptions = objects.newInstance(ModuleCompileOptions::class)
188+
extensions.add("moduleOptions", moduleOptions)
189+
moduleOptions.modulePath.from(configurations.compileClasspath)
190190

191191
options.compilerArgumentProviders.add(objects.newInstance(ModulePathArgumentProvider::class, project, combinedModuleSourceDir, modularProjects).apply {
192-
modulePath.from(moduleOptions.modulePath)
193-
})
192+
modulePath.from(moduleOptions.modulePath)
193+
})
194194
options.compilerArgumentProviders.addAll(modularProjects.map { objects.newInstance(PatchModuleArgumentProvider::class, project, it) })
195195

196196
modularity.inferModulePath = false
197197

198-
doFirst {
199-
options.allCompilerArgs.forEach {
200-
logger.info(it)
201-
}
202-
}
198+
doFirst {
199+
options.allCompilerArgs.forEach {
200+
logger.info(it)
201+
}
202+
}
203203
}
204204

205205
tasks.withType<Jar>().configureEach {
@@ -315,16 +315,16 @@ checkstyle {
315315

316316
tasks {
317317
checkstyleMain {
318-
config = resources.text.fromFile(checkstyle.configDirectory.file("checkstyleMain.xml"))
318+
config = resources.text.fromFile(checkstyle.configDirectory.file("checkstyleMain.xml"))
319319
}
320320
checkstyleTest {
321-
config = resources.text.fromFile(checkstyle.configDirectory.file("checkstyleTest.xml"))
321+
config = resources.text.fromFile(checkstyle.configDirectory.file("checkstyleTest.xml"))
322322
}
323323
}
324324

325325
pluginManager.withPlugin("java-test-fixtures") {
326326
tasks.named<Checkstyle>("checkstyleTestFixtures") {
327-
config = resources.text.fromFile(checkstyle.configDirectory.file("checkstyleTest.xml"))
327+
config = resources.text.fromFile(checkstyle.configDirectory.file("checkstyleTest.xml"))
328328
}
329329
tasks.named<JavaCompile>("compileTestFixturesJava") {
330330
options.release = extension.testJavaVersion.majorVersion.toInt()

‎gradle/plugins/common/src/main/kotlin/junitbuild.java-multi-release-sources.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ listOf(9, 17).forEach { javaVersion ->
3030
}
3131

3232
named<Checkstyle>("checkstyle${sourceSet.name.capitalized()}").configure {
33-
config = resources.text.fromFile(checkstyle.configDirectory.file("checkstyleMain.xml"))
33+
config = resources.text.fromFile(checkstyle.configDirectory.file("checkstyleMain.xml"))
3434
}
3535

3636
if (project in mavenizedProjects) {

‎gradle/plugins/common/src/main/kotlin/junitbuild.java-toolchain-conventions.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ project.pluginManager.withPlugin("java") {
99
val javaLanguageVersion = buildParameters.javaToolchain.version.map { JavaLanguageVersion.of(it) }.getOrElse(defaultLanguageVersion)
1010
val jvmImplementation = buildParameters.javaToolchain.implementation.map {
1111
when(it) {
12-
"j9" -> JvmImplementation.J9
13-
else -> throw InvalidUserDataException("Unsupported JDK implementation: $it")
14-
}
12+
"j9" -> JvmImplementation.J9
13+
else -> throw InvalidUserDataException("Unsupported JDK implementation: $it")
14+
}
1515
}.getOrElse(JvmImplementation.VENDOR_SPECIFIC)
1616

1717
val extension = the<JavaPluginExtension>()
1818
val javaToolchainService = the<JavaToolchainService>()
1919

2020
extension.toolchain {
21-
languageVersion = javaLanguageVersion
22-
implementation = jvmImplementation
23-
}
21+
languageVersion = javaLanguageVersion
22+
implementation = jvmImplementation
23+
}
2424

2525
pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {
2626
configure<KotlinJvmProjectExtension> {

‎gradle/plugins/common/src/main/kotlin/junitbuild.jmh-conventions.gradle.kts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
plugins {
2-
id("me.champeau.jmh")
2+
id("me.champeau.jmh")
33
}
44

55
jmh {
6-
jmhVersion = requiredVersionFromLibs("jmh")
6+
jmhVersion = requiredVersionFromLibs("jmh")
77
}
88

99
dependencies {
10-
jmh(dependencyFromLibs("jmh-core"))
11-
jmhAnnotationProcessor(dependencyFromLibs("jmh-generator-annprocess"))
10+
jmh(dependencyFromLibs("jmh-core"))
11+
jmhAnnotationProcessor(dependencyFromLibs("jmh-generator-annprocess"))
1212
}
1313

1414
tasks.jmhJar {
15-
notCompatibleWithConfigurationCache("https://github.com/melix/jmh-gradle-plugin/issues/229")
15+
notCompatibleWithConfigurationCache("https://github.com/melix/jmh-gradle-plugin/issues/229")
1616
}
1717

1818
pluginManager.withPlugin("checkstyle") {
19-
tasks.named<Checkstyle>("checkstyleJmh").configure {
20-
// use same style rules as defined for tests
21-
config = resources.text.fromFile(project.the<CheckstyleExtension>().configDirectory.file("checkstyleTest.xml"))
22-
}
19+
tasks.named<Checkstyle>("checkstyleJmh").configure {
20+
// use same style rules as defined for tests
21+
config = resources.text.fromFile(project.the<CheckstyleExtension>().configDirectory.file("checkstyleTest.xml"))
22+
}
2323
}

‎gradle/plugins/common/src/main/kotlin/junitbuild.shadow-conventions.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ tasks {
7171
classpath -= sourceSets.main.get().output
7272
classpath += files(shadowJar.map { it.archiveFile })
7373
}
74-
named<JavaCompile>("compileModule") {
75-
the<ModuleCompileOptions>().modulePath.from(shadowedClasspath.get())
76-
}
74+
named<JavaCompile>("compileModule") {
75+
the<ModuleCompileOptions>().modulePath.from(shadowedClasspath.get())
76+
}
7777
}

‎gradle/plugins/common/src/main/kotlin/junitbuild.spotless-conventions.gradle.kts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,23 @@ val license: License by rootProject.extra
77
spotless {
88

99
format("misc") {
10-
target("*.gradle.kts", "buildSrc/**/*.gradle.kts", "*.gitignore")
11-
targetExclude("buildSrc/build/**")
10+
target("*.gradle.kts", "gradle/plugins/**/*.gradle.kts", "*.gitignore")
11+
targetExclude("gradle/plugins/**/build/**")
1212
indentWithTabs()
1313
trimTrailingWhitespace()
1414
endWithNewline()
1515
}
1616

1717
format("documentation") {
1818
target("*.adoc", "*.md", "src/**/*.adoc", "src/**/*.md")
19-
targetExclude("**/build", "**/target")
2019
trimTrailingWhitespace()
2120
endWithNewline()
2221
}
2322

2423
pluginManager.withPlugin("java") {
2524

26-
val configDir = rootProject.layout.projectDirectory.dir("gradle/config/eclipse")
27-
val importOrderConfigFile = configDir.file("junit-eclipse.importorder")
25+
val configDir = rootProject.layout.projectDirectory.dir("gradle/config/eclipse")
26+
val importOrderConfigFile = configDir.file("junit-eclipse.importorder")
2827
val javaFormatterConfigFile = configDir.file("junit-eclipse-formatter-settings.xml")
2928

3029
java {

0 commit comments

Comments
 (0)