Fix build number not showing in jar

Dieser Commit ist enthalten in:
dordsor21 2019-04-09 16:03:39 +01:00
Ursprung 093542c337
Commit e21614caf8

Datei anzeigen

@ -1,3 +1,5 @@
import org.ajoberstar.grgit.Grgit
buildscript { buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
@ -22,7 +24,7 @@ buildscript {
plugins { plugins {
id 'net.minecrell.licenser' version '0.4.1' apply false id 'net.minecrell.licenser' version '0.4.1' apply false
id "org.ajoberstar.grgit" version "2.3.0" id "org.ajoberstar.grgit" version "3.1.1"
} }
apply plugin: 'java' apply plugin: 'java'
@ -41,20 +43,15 @@ def revision = ""
def buildNumber = "" def buildNumber = ""
def date = "" def date = ""
ext { ext {
try { git = Grgit.open(dir: '.git')
git = org.ajoberstar.grgit.Grgit.open(file(".git")) date = git.head().getDate().format("yy.MM.dd")
date = git.head().date.format("yy.MM.dd")
revision = "-${git.head().abbreviatedId}" revision = "-${git.head().abbreviatedId}"
index = -1960; // Offset to match CI
parents = git.head().parentIds; parents = git.head().parentIds;
index = -2111; // Offset to match CI
for (; parents != null && !parents.isEmpty(); index++) { for (; parents != null && !parents.isEmpty(); index++) {
commit = git.getResolve().toCommit(parents.get(0)); parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
parents = commit.getParentIds()
} }
buildNumber = "${index}" buildNumber = "${index}"
} catch (Throwable ignore) {
revision = "-unknown"
}
} }
if ( project.hasProperty("lzNoVersion") ) { // gradle build -PlzNoVersion if ( project.hasProperty("lzNoVersion") ) { // gradle build -PlzNoVersion