Merge branch 'release/1.0.2'

README.md

@@ -79,6 +79,11 @@ Use the gradle task 'printVersions' to print out all relevant version informatio
 
 In Android projects use the gradle task 'printApkNames' to print out all file names for each flavor to the gradle console.
 
+### Gradle tasks
+- clean build 
+- publishToMavenLocal
+- bintrayUpload -PbintrayUser=XXX -PbintrayApiKey=XXX
+
 ## License
 
 Copyright (c) 2017 appcom interactive GmbH

build.gradle

@@ -74,6 +74,7 @@ bintray {
     key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
     configurations = ['archives']
     publications = ['Publication']
+    publish = true
     pkg {
         repo = 'Maven'
         name = projectName

src/main/kotlin/eu/appcom/gradle/git/Versioning.kt

@@ -23,7 +23,11 @@ object Versioning {
         if (branch == "master" || branch.contains("release/") || branch.contains("hotfix/")) {
             if (branch.contains("release/")) {
                 val tag = branch.split("/")[1]
-                return "$tag-rc_${getCommitCountOnBranch()}"
+                return try {
+                    "$tag-rc_${getCommitCountOnBranch()}"
+                } catch (e: Exception) {
+                    "$tag-rc_${getCommitCountOnBranch(getTag())}"
+                }
             }
             return getTag()
         } else {
@@ -36,5 +40,6 @@ object Versioning {
         return "git describe --tags $revList".get()
     }
 
-    private fun getCommitCountOnBranch(): Int = "git rev-list --count develop..HEAD".getInteger()
+    private fun getCommitCountOnBranch(since: String = "develop"): Int =
+            "git rev-list --count --no-merges $since..HEAD".getInteger()
 }