Merge 1.16 into 1.18

build.gradle

@@ -166,17 +166,19 @@ tasks.withType(JavaCompile) {
 
 task generateChangelog(type: se.bjurr.gitchangelog.plugin.gradle.GitChangelogTask) {
     def details = versionDetails();
+    def theVersionRef
     if(details.commitDistance > 0) {
-        fromRef = details.lastTag;
+        theVersionRef = details.lastTag;
     } else {
         def secondLastTagCmd = "git describe --abbrev=0 " + details.lastTag + "^"
         def secondLastTag = secondLastTagCmd.execute().text.trim()
-        fromRef = secondLastTag;
+        theVersionRef = secondLastTag;
     }
 
+    fromRef = theVersionRef
+
     file = new File("CHANGELOG.md");
-    def otherTemplateContent = new File('gradle/changelog.mustache').getText('UTF-8');
-    templateContent = "## Changes since " + fromRef + "\n" + otherTemplateContent;
+    templateContent = new File('gradle/changelog.mustache').getText('UTF-8').replace("[[modernFixVersionRef]]", theVersionRef);
     toCommit = "HEAD";
 }
 

gradle/changelog.mustache

@@ -1,3 +1,7 @@
+Depending on the size of this release, there may be a human-readable changelog available on [the wiki page](https://github.com/embeddedt/ModernFix/wiki/Changelog).
+
+## Changes since [[modernFixVersionRef]]
+
 {{#commits}}
 {{#ifMatches messageTitle "^(?!Merge).*"}}
   * [{{{messageTitle}}}](https://github.com/embeddedt/ModernFix/commit/{{hashFull}}) - {{{authorName}}}

scripts/branchlist.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-git ls-remote --heads origin | awk '{print $2}' | sed 's:.*/::' | sort -V | grep -E '^1\.[0-9]*(\.[0-9]*)?$'
+git ls-remote --heads origin | awk '{print $2}' | grep -E '^refs/heads/1\.' | sed 's:.*/::' | sort -V | grep -E '^1\.[0-9]*(\.[0-9]*)?$'