From 3b9e412f80e5450b47a4d9b7b5b0175dbe61dc7c Mon Sep 17 00:00:00 2001
From: Kirill Vainer <shadowislord@gmail.com>
Date: Wed, 2 Mar 2016 16:35:45 -0500
Subject: [PATCH] build: fix build errors

---
 build.gradle   |  2 +-
 common.gradle  |  2 +-
 version.gradle | 41 ++++++++++++++++++++++++-----------------
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/build.gradle b/build.gradle
index 02f0fce2c..a4a4259a6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -65,7 +65,7 @@ task libDist(dependsOn: subprojects.build) << {
 }
 
 task createZipDistribution(type:Zip,dependsOn:["dist","libDist"], description:"Package the nightly zip distribution"){
-    archiveName "jME" + releaseInfo.fullVersion + ".zip"
+    archiveName "jME" + jmeFullVersion + ".zip"
     into("/") {
          from {"./dist"}
     }            
diff --git a/common.gradle b/common.gradle
index 7cb39b52b..d275c19f5 100644
--- a/common.gradle
+++ b/common.gradle
@@ -33,7 +33,7 @@ dependencies {
 jar {
     manifest {
         attributes 'Implementation-Title': 'jMonkeyEngine',
-                   'Implementation-Version': releaseInfo.fullVersion
+                   'Implementation-Version': jmeFullVersion
     }
 }
 
diff --git a/version.gradle b/version.gradle
index 155321abd..1c1bde628 100644
--- a/version.gradle
+++ b/version.gradle
@@ -1,35 +1,35 @@
 /*
- Version Info Examples
- =====================
- 
- Nightly Build Snapshot
+Version Info Examples
+=====================
+
+Nightly Build Snapshot
  * git tag:
  * Full Version: 3.1-5124
  * POM Version: 3.1.0-SNAPSHOT
  * NBM Revision: 5124
  * NBM UC Suffix: nightly/3.1/plugins
 
- Nightly Build Snapshot (PBRIsComing branch)
+Nightly Build Snapshot (PBRIsComing branch)
  * git tag:
  * Full Version: 3.1-PBRIsComing-5124
  * POM Version: 3.1.0-PBRIsComing-SNAPSHOT
  * NBM Revision: 5124
  * NBM UC Suffix: PBRIsComing-nightly/3.1/plugins
 
- Alpha1 Release
+Alpha1 Release
  * git tag: v3.1.0-alpha1
  * Full Version: 3.1-alpha1
  * POM Version: 3.1.0-alpha1
  * NBM Revision: 0
  * NBM UC Suffix: stable/3.1/plugins
- 
- Final Release
+
+Final Release
  * git tag: v3.1.0
  * Full Version: 3.1
  * POM Version: 3.1.0
  * NBM Revision: 0
  * NBM UC Suffix: stable/3.1/plugins
- */ 
+ */
 
 import java.text.SimpleDateFormat
 import org.ajoberstar.grgit.*
@@ -39,12 +39,21 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'org.ajoberstar:gradle-git:1.4.1'
+        classpath 'org.ajoberstar:gradle-git:1.2.0'
     }
 }
 
 ext {
-    releaseInfo = null;
+    jmeRevision     = 0
+    jmeNbmRevision  = 0
+    jmeGitHash      = ""
+    jmeGitTag       = ""
+    jmeShortGitHash = ""
+    jmeBuildDate    = new SimpleDateFormat("yyyy-MM-dd").format(new Date())
+    jmeBranchName   = "unknown"
+    jmeFullVersion  = "${jmeVersion}-UNKNOWN"
+    jmePomVersion   = "unknown"
+    jmeNbmUcSuffix  = "unknown"
 }
 
 def getReleaseInfo(String tag) {
@@ -113,7 +122,7 @@ task configureVersionInfo {
         jmeShortGitHash = head.abbreviatedId
         jmeBranchName = grgit.branch.current.name
         jmeGitTag = grgit.tag.list().find { it.commit == head }
-        
+
         if (jmeGitTag != null) {
             jmeGitTag = jmeGitTag.name
         } else {
@@ -133,7 +142,7 @@ task configureVersionInfo {
             if (System.env.TRAVIS_BRANCH != null) {
                 jmeBranchName = System.env.TRAVIS_BRANCH
             }
-            if (System.env.TRAVIS_PULL_REQUEST != null && 
+            if (System.env.TRAVIS_PULL_REQUEST != null &&
                 System.env.TRAVIS_PULL_REQUEST != "false") {
                 jmeBranchName += "-pr-" + System.env.TRAVIS_PULL_REQUEST
             }
@@ -149,7 +158,7 @@ task configureVersionInfo {
             jmePomVersion  += "-SNAPSHOT"
             jmeNbmRevision = jmeRevision
         }
-            
+
         logger.warn("Full Version: ${jmeFullVersion}")
         logger.warn("POM Version: ${jmePomVersion}")
         logger.warn("NBM Revision: ${jmeNbmRevision}")
@@ -158,7 +167,5 @@ task configureVersionInfo {
         // Failed to get repo info
         logger.warn("Failed to get repository info: " + ex.message + ". " + \
                     "Only partial build info will be generated.")
-
-        releaseInfo = new ReleaseInfo(jmeVersion);
     }
-}
+}
\ No newline at end of file