diff --git a/buildSrc/src/main/kotlin/creek-coverage-convention.gradle.kts b/buildSrc/src/main/kotlin/creek-coverage-convention.gradle.kts index a5fa456..5acbaba 100644 --- a/buildSrc/src/main/kotlin/creek-coverage-convention.gradle.kts +++ b/buildSrc/src/main/kotlin/creek-coverage-convention.gradle.kts @@ -17,9 +17,9 @@ /** * Standard coverage configuration of Creek projects, utilising Jacoco and Coveralls.io * - *

Version: 1.2 - * - *

Apply to root project only + *

Versions: + * - 1.3: remove deprecated use of $buildDir + * - 1.2: Apply to root project only */ plugins { @@ -64,7 +64,7 @@ val coverage = tasks.register("coverage") { coveralls { sourceDirs = allprojects.flatMap{it.sourceSets.main.get().allSource.srcDirs}.map{it.toString()} - jacocoReportPath = "$buildDir/reports/jacoco/coverage/coverage.xml" + jacocoReportPath = layout.buildDirectory.file("reports/jacoco/coverage/coverage.xml") } tasks.coveralls { 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 b3d048f..3d2e6e6 100644 --- a/buildSrc/src/main/kotlin/creek-plugin-publishing-convention.gradle.kts +++ b/buildSrc/src/main/kotlin/creek-plugin-publishing-convention.gradle.kts @@ -17,7 +17,8 @@ /** * Configuration for Creek Gradle plugin publishing. * - *

Version: 1.5 + *

Versions: + * - 1.6: Correct automatic module name * - 1.5: Switch to using `gradlePlugin`, as required by Gradle 8.0 * - 1.4: Fix website URL to avoid redirect * - 1.3: Switch to setting 'system' from issue-management @@ -66,9 +67,9 @@ tasks.javadoc { tasks.jar { manifest { if (prependRootName) { - attributes("Automatic-Module-Name" to "${rootProject.name}-${project.name}") + attributes("Automatic-Module-Name" to "${rootProject.name}-${project.name}".replace("-", ".")) } else { - attributes("Automatic-Module-Name" to project.name) + attributes("Automatic-Module-Name" to project.name.replace("-", ".")) } } }