Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-12-27 17:28:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking

Browse Source
This commit is contained in:
Jesse Boyd 2019-04-23 01:06:52 +10:00
commit 0c0d0104d7
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@ -32,12 +32,16 @@ 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 = -2039; // Offset to match CI if (project.hasProperty('buildnumber')) {
buildNumber = "$buildnumber"
} else {
index = -2042; // 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) version = String.format("%s.%s", rootVersion, buildNumber)