From 0285d4bfda942471496faac96833322d6b6d5760 Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Fri, 14 Aug 2015 14:36:18 +0200 Subject: [PATCH] Change usage of gitref in versioning As git ref hash can't be used to order versions it should be only used to denote differences between them. By using plus sign instead of hyphen many version compression scripts and similar will stop confusing custom build versions. It is also then compatible with SemVer version 2 ordering rules as for point 10 and 11. It also was moved at the end so it is more obvious that it a metadata. http://semver.org --- build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 534615fb7..e688714dd 100644 --- a/build.gradle +++ b/build.gradle @@ -45,12 +45,13 @@ def getGitRef() { if (System.getenv("BUILD_NUMBER") != null) version += ".${System.getenv("BUILD_NUMBER")}" -else - version += "-" + getGitRef() if (config.oc.subversion != null && config.oc.subversion != "") version += "-${config.oc.subversion}" +if (System.getenv("BUILD_NUMBER") == null) + version += "+" + getGitRef() + ext.simpleVersion = version version = "MC${config.minecraft.version}-${project.version}"