build: include tags in versioncode count

.gitlab-ci.yml

@@ -36,7 +36,7 @@ version:
   stage: "test"
   script:
     - "export VERSION_NAME=$(git describe --abbrev=0 --tags HEAD)"
-    - "export VERSION_CODE=$(git rev-list --count $VERSION_NAME)"
+    - "export VERSION_CODE=$(git rev-list --count $VERSION_NAME --tags)"
     - "echo \"{\\\"name\\\":\\\"$VERSION_NAME\\\",\\\"code\\\":$VERSION_CODE}\" > version.json"
   artifacts:
     paths:

gradle/convention/src/main/kotlin/AndroidApplicationConvention.kt

@@ -27,7 +27,7 @@ class AndroidApplicationConvention : Plugin<Project> {
           val commit = git("rev-parse", "HEAD")
           val name = git("describe", "--always", "--tags", "HEAD")
 
-          versionCode = git("rev-list", "--count", "HEAD")?.toIntOrNull()
+          versionCode = git("rev-list", "--count", "HEAD", "--tags")?.toIntOrNull()
           versionName = git("describe", "--always", "--tags", "HEAD")
 
           val fancyVersionName = if (commit == null || name == null) name