From e97e480301d85abf943f8c3d12b6ab1fd276616d Mon Sep 17 00:00:00 2001
From: Andy Coates <8012398+big-andy-coates@users.noreply.github.com>
Date: Mon, 22 Jan 2024 12:11:27 +0000
Subject: [PATCH] Latest conventions (#239)
---
.../src/main/kotlin/creek-common-convention.gradle.kts | 10 ++++++++--
.../creek-plugin-publishing-convention.gradle.kts | 4 ++--
.../main/kotlin/creek-publishing-convention.gradle.kts | 4 ++--
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/buildSrc/src/main/kotlin/creek-common-convention.gradle.kts b/buildSrc/src/main/kotlin/creek-common-convention.gradle.kts
index 4fbbddf..7d3527e 100644
--- a/buildSrc/src/main/kotlin/creek-common-convention.gradle.kts
+++ b/buildSrc/src/main/kotlin/creek-common-convention.gradle.kts
@@ -19,7 +19,8 @@
*
*
Apply to all java modules, usually excluding the root project in multi-module sets.
*
- *
Version: 1.8
+ *
Versions:
+ * - 1.10: Add ability to exclude containerised tests
* - 1.9: Add `allDeps` task.
* - 1.8: Tweak test config to reduce build speed.
* - 1.7: Switch to setting Java version via toolchain
@@ -70,7 +71,12 @@ tasks.withType {
}
tasks.test {
- useJUnitPlatform()
+ useJUnitPlatform() {
+ if (project.hasProperty("excludeContainerised")) {
+ excludeTags("ContainerisedTest")
+ }
+ }
+
setForkEvery(5)
maxParallelForks = Runtime.getRuntime().availableProcessors()
testLogging {
diff --git a/buildSrc/src/main/kotlin/creek-plugin-publishing-convention.gradle.kts b/buildSrc/src/main/kotlin/creek-plugin-publishing-convention.gradle.kts
index 8196620..b3d048f 100644
--- a/buildSrc/src/main/kotlin/creek-plugin-publishing-convention.gradle.kts
+++ b/buildSrc/src/main/kotlin/creek-plugin-publishing-convention.gradle.kts
@@ -95,9 +95,9 @@ publishing {
name.set("${project.group}:${artifactId}")
if (prependRootName) {
- description.set("${rootProject.name.capitalize()} ${project.name} library".replace("-", " "))
+ description.set("${rootProject.name} ${project.name} library".replace("-", " "))
} else {
- description.set("${project.name.capitalize()} library".replace("-", " "))
+ description.set("${project.name} library".replace("-", " "))
}
url.set("https://www.creekservice.org")
diff --git a/buildSrc/src/main/kotlin/creek-publishing-convention.gradle.kts b/buildSrc/src/main/kotlin/creek-publishing-convention.gradle.kts
index f7c5fb4..ebb7f27 100644
--- a/buildSrc/src/main/kotlin/creek-publishing-convention.gradle.kts
+++ b/buildSrc/src/main/kotlin/creek-publishing-convention.gradle.kts
@@ -78,9 +78,9 @@ publishing {
name.set("${project.group}:${artifactId}")
if (prependRootName) {
- description.set("${rootProject.name.capitalize()} ${project.name} library".replace("-", " "))
+ description.set("${rootProject.name} ${project.name} library".replace("-", " "))
} else {
- description.set("${project.name.capitalize()} library".replace("-", " "))
+ description.set("${project.name} library".replace("-", " "))
}
url.set("https://www.creekservice.org")