Nicer versioning and match CI build number

This commit is contained in:
dordsor21 2019-01-02 13:01:37 +00:00
parent 29868bdd29
commit 00a5d5ff64

View File

@ -32,14 +32,15 @@ ext {
date = git.head().getDate().format("yy.MM.dd") date = git.head().getDate().format("yy.MM.dd")
revision = "-${git.head().abbreviatedId}" revision = "-${git.head().abbreviatedId}"
parents = git.head().parentIds; parents = git.head().parentIds;
index = 0; // Offset to match CI index = -2048; // Offset to match CI
for (; parents != null && !parents.isEmpty(); index++) { for (; parents != null && !parents.isEmpty(); index++) {
parents = git.getResolve().toCommit(parents.get(0)).getParentIds() parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
} }
buildNumber = "-${index}" buildNumber = "${index}"
} }
version = String.format("%s.%s%s%s", rootVersion, date, revision, buildNumber) // version = String.format("%s.%s%s%s", rootVersion, date, revision, buildNumber)
version = String.format("%s.%s", rootVersion, buildNumber)
description = rootProject.name description = rootProject.name
if (project.hasProperty("lzNoVersion")) { // gradle build -PlzNoVersion if (project.hasProperty("lzNoVersion")) { // gradle build -PlzNoVersion