Merge branch 'dev'

CensoredUsername · Jan 8, 2017 · 4c4abba · 4c4abba
2 parents 0b58928 + b9aa1f3
commit 4c4abba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bintray-template.json b/bintray-template.json
@@ -6,7 +6,7 @@
     },
 
     "version": {
-        "name": "1.0.6+gGITREV"
+        "name": "VERSION"
     },
 
     "files":

diff --git a/make-bintray-json.sh b/make-bintray-json.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-sed -e s/BRANCHNAME/${TRAVIS_BRANCH}/ -e s/GITREV/$(git rev-parse --short HEAD)/ bintray-template.json > bintray.json
+sed -e s/BRANCHNAME/${TRAVIS_BRANCH}/ -e s/VERSION/$(git describe --tags)/ bintray-template.json > bintray.json