Louvorg/ReaderforSelfoss
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #256 from aminecmi/fdroid/build

Browse Source 
Fixes #254 and #255.
This commit is contained in:
Amine Bou 2018-12-02 13:22:37 +01:00 committed by GitHub
commit f0d4b63a97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/build.gradle
View File

@ -2,7 +2,15 @@ buildscript {
} }
def gitVersion() { def gitVersion() {
def process = 'git describe --contains HEAD'.execute() def process
def maybeTagOfCurrentCommit = 'git describe --contains HEAD'.execute()
if (maybeTagOfCurrentCommit.text.isEmpty()) {
println "No tag on current commit. Will take the latest one."
process = "git for-each-ref refs/tags --sort=-authordate --format='%(refname:short)' --count=1".execute()
} else {
println "Tag found on current commit"
process = 'git describe --contains HEAD'.execute()
}
return process.text.replaceAll("'", "").substring(1).replaceAll("\\.", "").trim() return process.text.replaceAll("'", "").substring(1).replaceAll("\\.", "").trim()
} }