Merge branch 'breaking'

build.gradle

@@ -1,3 +1,5 @@
+import org.ajoberstar.grgit.Grgit
+
 buildscript {
     repositories {
         mavenLocal()
@@ -22,7 +24,7 @@ buildscript {
 
 plugins {
     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'
@@ -41,19 +43,18 @@ def revision = ""
 def buildNumber = ""
 def date = ""
 ext {
-    try {
-        git = org.ajoberstar.grgit.Grgit.open(file(".git"))
-        date = git.head().date.format("yy.MM.dd")
-        revision = "-${git.head().abbreviatedId}"
-        index = -1960;  // Offset to match CI
-        parents = git.head().parentIds;
+    git = Grgit.open(dir: '.git')
+    date = git.head().getDate().format("yy.MM.dd")
+    revision = "-${git.head().abbreviatedId}"
+    parents = git.head().parentIds;
+    if (project.hasProperty('buildnumber')) {
+        buildNumber = "$buildnumber"
+    } else {
+        index = -2109;  // Offset to match CI
         for (; parents != null && !parents.isEmpty(); index++) {
-            commit = git.getResolve().toCommit(parents.get(0));
-            parents = commit.getParentIds()
+            parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
         }
         buildNumber = "${index}"
-    } catch (Throwable ignore) {
-        revision = "-unknown"
     }
 }
 
@@ -62,7 +63,7 @@ if ( project.hasProperty("lzNoVersion") ) { // gradle build -PlzNoVersion
 } else {
     version = String.format("%s.%s", rootVersion, buildNumber)
 }
-description = """FastAsyncWorldEdit"""
+description = rootProject.name
 
 subprojects {
     apply plugin: 'java'
@@ -71,8 +72,6 @@ subprojects {
     // Enable this requires putting license header files in many, many FAWE files
     //apply plugin: 'net.minecrell.licenser'
 
-    ext.internalVersion = version
-
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8