Merge 1.16 into 1.18

embeddedt · embeddedt · commit f1e2b21d8fbf · 2023-08-03T12:21:01.000-04:00
diff --git a/build.gradle b/build.gradle
@@ -41,7 +41,7 @@ allprojects {
     }
     def baseVersion = details.lastTag.substring(0, plusIndex)
     def dirtyMarker = grgit.status().clean ? "" : ".dirty"
-    def commitHashMarker = details.commitDistance > 0 ? ("." + details.gitHash) : ""
+    def commitHashMarker = details.commitDistance > 0 ? ("." + details.gitHash.substring(0, Math.min(4, details.gitHash.length()))) : ""
     def preMarker = (details.commitDistance > 0 || !details.isCleanTag) ? ("-beta." + details.commitDistance) : ""
     if(preMarker.length() > 0) {
         // bump to next patch release

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ allprojects {`
`41`	`41`	`}`
`42`	`42`	`def baseVersion = details.lastTag.substring(0, plusIndex)`
`43`	`43`	`def dirtyMarker = grgit.status().clean ? "" : ".dirty"`
`44`		`- def commitHashMarker = details.commitDistance > 0 ? ("." + details.gitHash) : ""`
	`44`	`+ def commitHashMarker = details.commitDistance > 0 ? ("." + details.gitHash.substring(0, Math.min(4, details.gitHash.length()))) : ""`
`45`	`45`	`def preMarker = (details.commitDistance > 0 \|\| !details.isCleanTag) ? ("-beta." + details.commitDistance) : ""`
`46`	`46`	`if(preMarker.length() > 0) {`
`47`	`47`	`// bump to next patch release`