Merge branch 'release/2.9.0.82' into 'master'

2.9.0.82 release See merge request ProtonVPN/android/android-app-new!576
ProtonVPN · Nov 11, 2021 · 242f10c · 242f10c
2 parents 7ac2b99 + ea36bdc
commit 242f10c
Show file tree

Hide file tree

Showing 7 changed files with 193 additions and 179 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -426,11 +426,16 @@ class Helpers {
                 exec("git rev-parse --abbrev-ref HEAD").trim() == "master"
         // On master or public repo just use last tag for version name
         if (!onMaster && exec("git rev-parse --verify origin/development", false) != null) {
-            def branchPoint = exec("git merge-base origin/development HEAD").trim()
-            // add #commits from tag to branch point with development to dev
-            dev += exec("git rev-list --count ${tag}..${branchPoint}").trim().toInteger()
-            // add #commits from branch point to HEAD to release
-            release += exec("git rev-list --count origin/development..HEAD").trim().toInteger()
+            // Tag is on development
+            if (exec("git merge-base --is-ancestor ${tag} origin/development", false) != null) {
+                def branchPoint = exec("git merge-base origin/development HEAD").trim()
+                // add #commits from tag to branch point with development to dev
+                dev += exec("git rev-list --count ${tag}..${branchPoint}").trim().toInteger()
+                // add #commits from branch point to HEAD to release
+                release += exec("git rev-list --count origin/development..HEAD").trim().toInteger()
+            } else { // Tag is on current branch
+                release += exec("git rev-list --count ${tag}..HEAD").trim().toInteger()
+            }
         }
         return "${major}.${minor}.${dev}.${release}"
     }