Skip to content

Commit f06f061

Browse files
committed
Migrate build to shared convention plugins setup
1 parent ef30e33 commit f06f061

File tree

12 files changed

+14
-218
lines changed

12 files changed

+14
-218
lines changed

.github/workflows/ci-build.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ jobs:
1212
steps:
1313
- name: git clone
1414
uses: actions/checkout@v5
15+
- name: git clone gradlex-build-conventions
16+
uses: actions/checkout@v5
17+
with:
18+
repository: gradlex-org/plugin-publish-conventions
19+
path: build/plugin-publish-conventions
20+
ref: new-convention-plugins
1521
- name: Set up JDK 17
1622
uses: actions/setup-java@v5
1723
with:

build.gradle.kts

Lines changed: 4 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,5 @@
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")
28-
}
29-
testSamplesImplementation("org.apache.commons:commons-lang3:3.19.0") {
30-
because("CVE-2025-48924")
31-
}
32-
}
33-
343
pluginPublishConventions {
354
id("${project.group}.${project.name}")
365
implementationClass("org.gradlex.buildparameters.BuildParametersPlugin")
@@ -51,17 +20,8 @@ pluginPublishConventions {
5120
}
5221
}
5322

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-
}
23+
// === the following custom configuration should be removed once tests are migrated to Java
24+
apply(plugin = "groovy")
6725

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

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.

0 commit comments

Comments
 (0)