From e7f37e17a8c82c1601e6347fc0f55d040399e75a Mon Sep 17 00:00:00 2001 From: Christopher Roy Bratusek Date: Sat, 20 Apr 2019 21:07:49 +0200 Subject: [PATCH] build.gradle: properly calculate gitVersionBase if latest tag is not a release tag --- play-services-core/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle index fd19739f..cc80ee73 100644 --- a/play-services-core/build.gradle +++ b/play-services-core/build.gradle @@ -50,7 +50,7 @@ def execResult(...args) { def gmsVersion = "13.2.80" def gmsVersionCode = Integer.parseInt(gmsVersion.replaceAll('\\.', '')) -def gitVersionBase = execResult('git', 'describe', '--tags', '--abbrev=0').substring(1) +def gitVersionBase = execResult('git', 'describe', '--tags', '--abbrev=0', '--match=v[0-9]*').substring(1) def gitCommitCount = Integer.parseInt(execResult('git', 'rev-list', '--count', "v$gitVersionBase..HEAD")) def gitCommitId = execResult('git', 'show-ref', '--abbrev=7', '--head', 'HEAD').split(' ')[0] def gitDirty = execResult('git', 'status', '--porcelain').size() > 0