Skip to content

Commit 2d4cec0

Browse files
committed
Improve changelog generation
Picks relevant commits Skips merge commits [skip ci]
1 parent c586224 commit 2d4cec0

1 file changed

Lines changed: 12 additions & 3 deletions

File tree

build.gradle

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,19 @@ task generateChangelog {
146146
, "--date=format:%d %b %Y"
147147
, "--pretty=%s - **%an** (%ad)"
148148
, "${lastTag}..HEAD"
149-
]))
149+
].plus(
150+
/*
151+
Collect relevant directories only, them being:
152+
* ./src/main/java
153+
* ./src/main/resources
154+
*/
155+
sourceSets.main.java.srcDirs
156+
.plus(sourceSets.main.resources.srcDirs)
157+
.collect { [ "--", it ] }
158+
).flatten()))
150159

151160
if (changelog) {
152-
changelog = "Changes since ${lastTag}:\n${("\n" + changelog).replaceAll("\n", "\n ")}"
161+
changelog = "Changes since ${lastTag}:\n${("\n" + changelog).replaceAll("\n", "\n* ")}"
153162
}
154163

155164
def f = new File("build/tmp/changelog.md")
@@ -225,6 +234,7 @@ task deployCurseForge {
225234
def log = new File("build/tmp/changelog.md")
226235
.getText("UTF-8")
227236
.replaceAll("\n", " \n")
237+
.replaceAll("\n\\*", "\n")
228238

229239
def root = it {
230240
changelog log
@@ -265,4 +275,3 @@ task deployCurseForge {
265275
}
266276
}
267277
}
268-

0 commit comments

Comments
 (0)