git based versioning (#71)

Author: mostroverkhov

.travis.yml

@@ -14,15 +14,11 @@
 # limitations under the License.
 #
 ---
+install:
+- true
 language: java
 jdk:
-- oraclejdk8
-addons:
-  apt:
-    packages:
-    - oracle-java8-installer
-dist: trusty
-sudo: false
+- openjdk8
 script: ci/buildViaTravis.sh
 cache:
   directories:

build.gradle

@@ -16,16 +16,21 @@
 
 plugins {
     id 'com.gradle.build-scan'
+    id 'com.palantir.git-version'
     id 'io.spring.dependency-management' apply false
     id 'com.jfrog.bintray' apply false
     id 'com.jfrog.artifactory' apply false
     id 'org.jetbrains.kotlin.jvm' apply false
 }
 
+def versionSuffix = versionSuffix()
+
 allprojects {
     dependencyLocking {
         lockAllConfigurations()
     }
+    project.version += versionSuffix
+    println "version: ${project.version}"
 }
 
 subprojects {
@@ -81,3 +86,23 @@ buildScan {
     termsOfServiceUrl = 'https://gradle.com/terms-of-service'
     termsOfServiceAgree = 'yes'
 }
+
+def versionSuffix() {
+    def versionSuffix = ''
+    def branchName = project.findProperty('branch');
+    if (branchName == null) {
+        def details = versionDetails()
+        if (details != null) {
+            branchName = details.branchName
+        }
+    }
+
+    if (branchName != null) {
+        if (branchName == 'master') {
+            versionSuffix = '-SNAPSHOT'
+        } else {
+            versionSuffix = "-${branchName.replace("/", "-")}-SNAPSHOT"
+        }
+    }
+    return versionSuffix
+}

ci/buildViaTravis.sh

@@ -3,14 +3,14 @@
 
 if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
   echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"
-  ./gradlew build
+  ./gradlew -Pbranch="${TRAVIS_BRANCH}" build
 elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then
   echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'
-  ./gradlew -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" build artifactoryPublish --stacktrace
+  ./gradlew -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -Pbranch="${TRAVIS_BRANCH}" build artifactoryPublish --stacktrace
 elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
   echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH']  Tag ['$TRAVIS_TAG']'
-  ./gradlew -Pversion="$TRAVIS_TAG" -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" build bintrayUpload --stacktrace
+  ./gradlew -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" build bintrayUpload --stacktrace
 else
   echo -e 'WARN: Should not be here => Branch ['$TRAVIS_BRANCH']  Tag ['$TRAVIS_TAG']  Pull Request ['$TRAVIS_PULL_REQUEST']'
-  ./gradlew build
+  ./gradlew -Pbranch="${TRAVIS_BRANCH}" build
 fi

gradle.properties

@@ -15,13 +15,14 @@
 #
 
 group=io.rsocket.kotlin
-version=0.9.7-SNAPSHOT
+version=0.9.7
 
 buildScanPluginVersion=2.4.1
 dependencyManagementPluginVersion=1.0.8.RELEASE
 bintrayPluginVersion=1.8.4
 artifactoryPluginVersion=4.9.8
 kotlinPluginVersion=1.3.50
+gitPluginVersion=0.12.0-rc2
 
 nettyBufferVersion=4.1.37.Final
 jsr305Version=3.0.2

settings.gradle

@@ -21,6 +21,7 @@ pluginManagement {
         id 'com.jfrog.bintray' version "${bintrayPluginVersion}"
         id 'com.jfrog.artifactory' version "${artifactoryPluginVersion}"
         id 'org.jetbrains.kotlin.jvm' version "${kotlinPluginVersion}"
+        id "com.palantir.git-version" version "${gitPluginVersion}"
     }
 }