Merge branch 'release/0.9.7'

rsocket · Sep 1, 2019 · 34653b4 · 34653b4
2 parents f247c89 + 0bdd903
commit 34653b4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -23,16 +23,15 @@ It enables following symmetric interaction models:
 
 ```groovy
     dependencies {
-        compile 'io.rsocket.kotlin:rsocket-core:0.9.6'
+        compile 'io.rsocket.kotlin:rsocket-core:0.9.7'
     }
 ```
 ### Transports
-`Netty` based Websockets and TCP transport (`Client` and `Server`)  
+
 `OkHttp` based Websockets transport (`Client` only)
 ```groovy
  dependencies {
-                compile 'io.rsocket.kotlin:rsocket-transport-netty:0.9.6'
-                compile 'io.rsocket.kotlin:rsocket-transport-okhttp:0.9.6'
+        compile 'io.rsocket.kotlin:rsocket-transport-okhttp:0.9.7'
  }
 ```
 ### Usage

diff --git a/build.gradle b/build.gradle
@@ -88,21 +88,26 @@ buildScan {
 }
 
 def versionSuffix() {
-    def versionSuffix = ''
+    def versionSuffix
     def branchName = project.findProperty('branch');
     if (branchName == null) {
         def details = versionDetails()
         if (details != null) {
             branchName = details.branchName
         }
     }
-
+    /*branch*/
     if (branchName != null) {
         if (branchName == 'master') {
+            versionSuffix = ''
+        } else if (branchName == 'develop') {
             versionSuffix = '-SNAPSHOT'
         } else {
             versionSuffix = "-${branchName.replace("/", "-")}-SNAPSHOT"
         }
+    /*tag*/
+    } else {
+        versionSuffix = ''
     }
     return versionSuffix
 }
diff --git a/ci/buildViaTravis.sh b/ci/buildViaTravis.sh
@@ -5,12 +5,9 @@ if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
   echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"
   ./gradlew -Pbranch="${TRAVIS_BRANCH}" build
 elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then
-  echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'
+  echo -e 'Build Branch => Branch ['$TRAVIS_BRANCH']'
   ./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 -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 -Pbranch="${TRAVIS_BRANCH}" build
+  echo -e 'Build Tag => Tag ['$TRAVIS_TAG']'
+  ./gradlew build
 fi