diff --git a/convention/src/main/kotlin/io/gitlab/jfronny/scripts/SharedProps.kt b/convention/src/main/kotlin/io/gitlab/jfronny/scripts/SharedProps.kt index 2151b1b..826dbcd 100644 --- a/convention/src/main/kotlin/io/gitlab/jfronny/scripts/SharedProps.kt +++ b/convention/src/main/kotlin/io/gitlab/jfronny/scripts/SharedProps.kt @@ -32,6 +32,10 @@ var Project.changelog: String get() = if (extra.has("changelog")) extra["changelog"].toString() else "" set(value) = extra.set("changelog", value) +var Project.changelogHtml: String + get() = if (extra.has("changelogHtml")) extra["changelogHtml"].toString() else "" + set(value) = extra.set("changelogHtml", value) + var Project.flavour: String get() = prop("flavour", "").trim() set(value) { diff --git a/convention/src/main/kotlin/jf.autoversion.gradle.kts b/convention/src/main/kotlin/jf.autoversion.gradle.kts index 127e00b..ab28f29 100644 --- a/convention/src/main/kotlin/jf.autoversion.gradle.kts +++ b/convention/src/main/kotlin/jf.autoversion.gradle.kts @@ -13,7 +13,10 @@ if (File(projectDir, ".git").exists()) { versionS = "0.0.0+notag" val tags: List = git.getTags() if (tags.isNotEmpty()) { - if (tags[0].fullMessage != null) changelog += "${tags[0].fullMessage}\n" + if (tags[0].fullMessage != null) { + changelog += "${tags[0].fullMessage}\n" + changelogHtml += "

${tags[0].fullMessage}

\n" + } versionS = tags[0].name lastRelease = versionS val parsedVersion = SemanticVersion.parse(versionS) @@ -21,14 +24,15 @@ if (File(projectDir, ".git").exists()) { versionS = parsedVersion.unclassifiedToString() if (isRelease) { changelog += "Commits in ${versionType.displayName} $versionS:\n" - changelog += git.log(if (tags.size >= 2) tags[1].peeledId else null, tags[0].peeledId) - .reversed() - .joinToString("\n") { "- ${it.shortMessage}" } + val log = git.log(if (tags.size >= 2) tags[1].peeledId else null, tags[0].peeledId).reversed() + changelog += log.joinToString("\n") { "- ${it.shortMessage}" } + changelogHtml += "" nextRelease = parsedVersion } else { changelog += "Commits after ${versionType.displayName} $versionS:\n" val log = git.log(tags[0].peeledId, git.repository.resolve("HEAD")).reversed() changelog += log.joinToString("\n") { "- ${it.shortMessage}" } + changelogHtml += "" val type = log.stream() .filter { !it.isMerge } .map { it.fullMessage } @@ -39,9 +43,9 @@ if (File(projectDir, ".git").exists()) { } } else { changelog += "Commits after inception:\n" - changelog += git.log().all().call() - .reversed() - .joinToString("\n") { "- ${it.shortMessage}" } + val log = git.log().all().call().reversed() + changelog += log.joinToString("\n") { "- ${it.shortMessage}" } + changelogHtml += "" } } } else changelog = "No changelog"