diff options
| author | Menny Even Danan <menny@evendanan.net> | 2016-02-14 02:57:09 +0000 |
|---|---|---|
| committer | Menny Even Danan <menny@evendanan.net> | 2016-02-14 02:57:09 +0000 |
| commit | b6721ca607d54f1499aa6bc7cbf907f9eca82cba (patch) | |
| tree | ad4eed8e27bb5ed558259de6a15c501a26f8194c /buildSrc | |
| parent | f3184eac09caf3bb6e76e679633d8e46a217e171 (diff) | |
| download | AnySoftKeyboard-b6721ca607d54f1499aa6bc7cbf907f9eca82cba.tar.gz AnySoftKeyboard-b6721ca607d54f1499aa6bc7cbf907f9eca82cba.tar.bz2 | |
too much stuff here, it is no longer 1.6, it is 1.7
Diffstat (limited to 'buildSrc')
| -rw-r--r-- | buildSrc/src/main/groovy/versionbuilder/VersionBuilder.groovy | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/buildSrc/src/main/groovy/versionbuilder/VersionBuilder.groovy b/buildSrc/src/main/groovy/versionbuilder/VersionBuilder.groovy index ce8130aca..8fcdfb25f 100644 --- a/buildSrc/src/main/groovy/versionbuilder/VersionBuilder.groovy +++ b/buildSrc/src/main/groovy/versionbuilder/VersionBuilder.groovy @@ -1,15 +1,22 @@ package versionbuilder -class VersionBuilder { - static final int GIT_COMMIT_COUNT_NORMALIZE = 2320; - static final int GIT_COMMIT_COUNT_MINOR_NORMALIZE = 140+50+38; +public class VersionBuilder { + static final int GIT_COMMIT_COUNT_NORMALIZE = 2320 + static final int GIT_COMMIT_COUNT_MINOR_NORMALIZE = 140+50+38+167 - static def buildGitVersionNumber() { - return Integer.parseInt('git rev-list --count HEAD'.execute().text.trim()) - GIT_COMMIT_COUNT_NORMALIZE; + public static def buildGitVersionNumber() { + try { + return Integer.parseInt('git rev-list --count HEAD'.execute().text.trim()) - GIT_COMMIT_COUNT_NORMALIZE + } catch (Exception e) { + println("Failed to get version from git data. Error: "+e.message); + return 1 + } } - static def buildGitVersionName() { - return String.format("%d.%d.%d", 1, 6, buildGitVersionNumber() - GIT_COMMIT_COUNT_MINOR_NORMALIZE); + public static def buildGitVersionName() { + int gitVersion = buildGitVersionNumber() + if (gitVersion < GIT_COMMIT_COUNT_MINOR_NORMALIZE) gitVersion = GIT_COMMIT_COUNT_MINOR_NORMALIZE + 1 + return String.format("%d.%d.%d", 1, 7, gitVersion - GIT_COMMIT_COUNT_MINOR_NORMALIZE) } }
\ No newline at end of file |