Merge pull request graphql-java#1066 from graphql-java/improve-dev-build-version

andimarek · web-flow · commit 83b32d139295 · 2018-06-04T14:42:34.000+10:00
add the git hash to the development build version
diff --git a/build.gradle b/build.gradle
@@ -10,13 +10,22 @@ apply plugin: 'maven-publish'
 apply plugin: 'antlr'
 apply plugin: 'osgi'
 
+def getDevelopmentVersion() {
+    def output = new StringBuilder()
+    def error = new StringBuilder()
+    def gitShortHash = 'git rev-parse --short HEAD'.execute()
+    gitShortHash.consumeProcessOutput(output, error)
+    gitShortHash.waitForOrKill(500)
+    new SimpleDateFormat('yyyy-MM-dd\'T\'HH-mm-ss').format(new Date()) + "#" + output.toString().trim()
+}
+
+
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 def reactiveStreamsVersion = '1.0.2'
 def slf4jVersion = '1.7.25'
 def releaseVersion = System.properties.RELEASE_VERSION
-version = releaseVersion ? releaseVersion : new SimpleDateFormat('yyyy-MM-dd\'T\'HH-mm-ss').format(new Date())
-def versionToPublish = version
+version = releaseVersion ? releaseVersion : getDevelopmentVersion()
 group = 'com.graphql-java'
 
 
