Skip to content

Commit fa9ee6d

Browse files
committed
Migrate build to shared convention plugins setup
1 parent ce7c2fa commit fa9ee6d

File tree

75 files changed

+17
-244
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+17
-244
lines changed

build.gradle.kts

Lines changed: 10 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,12 @@
1-
plugins {
2-
id("groovy")
3-
id("gradlexbuild.build-parameters")
4-
id("gradlexbuild.documentation-conventions")
5-
id("org.gradlex.internal.plugin-publish-conventions") version "0.6"
6-
}
7-
8-
group = "org.gradlex"
91
version = "1.4.5"
102

11-
java {
12-
toolchain.languageVersion = JavaLanguageVersion.of(17)
13-
}
14-
15-
tasks.withType<JavaCompile>().configureEach {
16-
options.release = 8
17-
}
18-
19-
dependencies.constraints {
20-
checkstyle("com.google.guava:guava:33.5.0-jre") {
21-
because("CVE-2023-2976, CVE-2020-8908")
22-
}
23-
checkstyle("commons-beanutils:commons-beanutils:1.11.0") {
24-
because("CVE-2025-48734")
25-
}
26-
testSamplesImplementation("commons-io:commons-io:2.20.0") {
27-
because("CVE-2024-47554, CVE-2021-29425")
3+
publishingConventions {
4+
pluginPortal("${project.group}.${project.name}") {
5+
implementationClass("org.gradlex.buildparameters.BuildParametersPlugin")
6+
displayName("Build Parameters Gradle Plugin")
7+
description("Compile-safe access to parameters supplied to a Gradle build.")
8+
tags("gradlex", "parameters", "build parameters")
289
}
29-
testSamplesImplementation("org.apache.commons:commons-lang3:3.19.0") {
30-
because("CVE-2025-48924")
31-
}
32-
}
33-
34-
pluginPublishConventions {
35-
id("${project.group}.${project.name}")
36-
implementationClass("org.gradlex.buildparameters.BuildParametersPlugin")
37-
displayName("Build Parameters Gradle Plugin")
38-
description("Compile-safe access to parameters supplied to a Gradle build.")
39-
tags("gradlex", "parameters", "build parameters")
4010
gitHub("https://github.com/gradlex-org/build-parameters")
4111
website("https://gradlex.org/build-parameters")
4212
developer {
@@ -51,17 +21,8 @@ pluginPublishConventions {
5121
}
5222
}
5323

54-
testing.suites.named<JvmTestSuite>("test") {
55-
useJUnitJupiter()
56-
dependencies {
57-
implementation("org.spockframework:spock-core:2.3-groovy-4.0")
58-
}
59-
targets.all {
60-
testTask { maxParallelForks = 4 }
61-
}
62-
}
63-
64-
tasks.publishPlugins {
65-
dependsOn(tasks.check)
66-
}
24+
// === the following custom configuration should be removed once tests are migrated to Java
25+
apply(plugin = "groovy")
6726

27+
dependencies { testImplementation("org.spockframework:spock-core:2.3-groovy-4.0") } //
28+
// ====================================================================================

gradle/checkstyle/checkstyle.xml

Lines changed: 0 additions & 23 deletions
This file was deleted.

gradle/checkstyle/header.txt

Lines changed: 0 additions & 15 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
toolchainVersion=17

gradle/plugins/build-parameters/build.gradle.kts

Lines changed: 0 additions & 39 deletions
This file was deleted.

gradle/plugins/documentation-conventions/build.gradle.kts

Lines changed: 0 additions & 7 deletions
This file was deleted.

gradle/plugins/documentation-conventions/src/main/kotlin/gradlexbuild.asciidoctor-conventions.gradle.kts

Lines changed: 0 additions & 30 deletions
This file was deleted.

gradle/plugins/documentation-conventions/src/main/kotlin/gradlexbuild.documentation-conventions.gradle.kts

Lines changed: 0 additions & 4 deletions
This file was deleted.

gradle/plugins/documentation-conventions/src/main/kotlin/gradlexbuild.exemplar-conventions.gradle.kts

Lines changed: 0 additions & 24 deletions
This file was deleted.

gradle/plugins/settings.gradle.kts

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)