Skip to content

Commit

Permalink
build: Update to Gradle Wrapper 8.10.2 / Develocity Plugin 3.18.1 / P…
Browse files Browse the repository at this point in the history
…lugin Dependencies / Dependencies (#100425)

* build: Remove unused detekt.yml

* build: Update to Gradle Wrapper 8.10.2

* build: Update plugin dependencies

* build: Update dependencies
- org.eclipse.jgit:org.eclipse.jgit
- org.slf4j:slf4j-api
- com.intershop.gradle.test:test-gradle-plugin
- commons-io:commons-io

* build: Migrate to Develocity Plugin 3.18.1

* build: Migrate to explicit non-deprecated Gradle test suite configuration
  • Loading branch information
DevDavido authored Oct 9, 2024
1 parent 33bfae3 commit ea48422
Show file tree
Hide file tree
Showing 9 changed files with 69 additions and 760 deletions.
77 changes: 47 additions & 30 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ import org.asciidoctor.gradle.jvm.AsciidoctorTask
plugins {
// project plugins
`java-gradle-plugin`
`jvm-test-suite`
groovy
kotlin("jvm") version "1.9.21"
kotlin("jvm") version "1.9.25"

// test coverage
jacoco
Expand All @@ -34,13 +35,13 @@ plugins {
signing

// plugin for documentation
id("org.asciidoctor.jvm.convert") version "3.3.2"
id("org.asciidoctor.jvm.convert") version "4.0.3"

// documentation
id("org.jetbrains.dokka") version "1.9.10"
id("org.jetbrains.dokka") version "1.9.20"

// plugin for publishing to Gradle Portal
id("com.gradle.plugin-publish") version "1.2.1"
id("com.gradle.plugin-publish") version "1.3.0"
}

// release configuration
Expand Down Expand Up @@ -86,13 +87,34 @@ if (project.version.toString().endsWith("-SNAPSHOT")) {
status = "snapshot"
}

tasks {
withType<Test>().configureEach {
maxParallelForks = 1
systemProperty("intershop.gradle.versions", "8.5")
useJUnitPlatform()
testing {
suites {
val test by getting(JvmTestSuite::class) {
useSpock()

dependencies {
runtimeOnly("org.apache.httpcomponents:httpclient:4.5.14")
runtimeOnly("org.slf4j:slf4j-api:2.0.16")

implementation(gradleTestKit())
implementation("com.intershop.gradle.test:test-gradle-plugin:5.1.0")
implementation("commons-io:commons-io:2.17.0")
}

targets {
all {
testTask.configure {
maxParallelForks = 1
// Gradle versions for test
systemProperty("intershop.gradle.versions", "8.5,8.10.2")
}
}
}
}
}
}

tasks {
register<Copy>("copyAsciiDoc") {
includeEmptyDirs = false

Expand Down Expand Up @@ -124,18 +146,21 @@ tasks {
setBackends(listOf("html5", "docbook"))
}

options = mapOf("doctype" to "article",
"ruby" to "erubis")
attributes = mapOf(
"latestRevision" to project.version,
"toc" to "left",
"toclevels" to "2",
"source-highlighter" to "coderay",
"icons" to "font",
"setanchors" to "true",
"idprefix" to "asciidoc",
"idseparator" to "-",
"docinfo1" to "true")
setOptions(mapOf(
"doctype" to "article",
"ruby" to "erubis"
))
setAttributes(mapOf(
"latestRevision" to project.version,
"toc" to "left",
"toclevels" to "2",
"source-highlighter" to "coderay",
"icons" to "font",
"setanchors" to "true",
"idprefix" to "asciidoc",
"idseparator" to "-",
"docinfo1" to "true"
))
}

withType<JacocoReport> {
Expand Down Expand Up @@ -242,16 +267,8 @@ dependencies {
implementation(gradleKotlinDsl())

//jgit
implementation("org.eclipse.jgit:org.eclipse.jgit:6.8.0.202311291450-r") {
implementation("org.eclipse.jgit:org.eclipse.jgit:6.10.0.202406032230-r") {
exclude(group = "org.apache.httpcomponents", module = "httpclient")
exclude(group = "org.slf4j", module = "slf4j-api")
}

testRuntimeOnly("org.apache.httpcomponents:httpclient:4.5.14")
testRuntimeOnly("org.slf4j:slf4j-api:2.0.9")

testImplementation("com.intershop.gradle.test:test-gradle-plugin:5.0.1")
testImplementation(gradleTestKit())

testImplementation("commons-io:commons-io:2.15.1")
}
Loading

0 comments on commit ea48422

Please sign in to comment.