Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-12-26 17:18:43 +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

14
build.gradle
View File

@ -32,11 +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 = -2039; // Offset to match CI if (project.hasProperty('buildnumber')) {
for (; parents != null && !parents.isEmpty(); index++) { buildNumber = "$buildnumber"
parents = git.getResolve().toCommit(parents.get(0)).getParentIds() } else {
index = -2042; // Offset to match CI
for (; parents != null && !parents.isEmpty(); index++) {
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)
@ -72,7 +76,7 @@ subprojects {
testAnnotationProcessor("org.projectlombok:lombok:1.18.4") testAnnotationProcessor("org.projectlombok:lombok:1.18.4")
testImplementation "junit:junit:4.12" testImplementation "junit:junit:4.12"
} }
repositories { repositories {
mavenCentral() mavenCentral()
maven { url "http://maven.sk89q.com/repo/" } maven { url "http://maven.sk89q.com/repo/" }