fix release

OlegDokuka · OlegDokuka · commit 59b5f132da70 · 2018-10-13T19:29:15.000+03:00
diff --git a/bintray.gradle b/bintray.gradle
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-if (project.hasProperty('bintrayUser') && project.hasProperty('bintrayKey') &&
-        project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePassword')) {
+if (project.hasProperty('bintrayUser') && project.hasProperty('bintrayKey')) {
 
     subprojects {
         plugins.withId('com.jfrog.bintray') {
@@ -48,8 +47,8 @@ if (project.hasProperty('bintrayUser') && project.hasProperty('bintrayKey') &&
                         }
 
                         mavenCentralSync {
-                            user = project.property('sonatypeUsername')
-                            password = project.property('sonatypePassword')
+                            user = project.properties.getOrDefault('sonatypeUsername', '')
+                            password = project.properties.getOrDefault('sonatypePassword', '')
                         }
                     }
                 }
diff --git a/build.gradle b/build.gradle
@@ -1,15 +1,15 @@
 plugins {
     id 'java-library'
     id 'com.google.protobuf' version '0.8.5' apply false
-    id 'com.gradle.build-scan' version '1.15.1'
+    id 'com.gradle.build-scan' version '1.16'
     id 'com.google.osdetector' version '1.4.0'
     id 'com.github.sherter.google-java-format' version '0.7.1' apply false
     id 'com.github.johnrengelman.shadow' version '2.0.1' apply false
     id 'com.jfrog.artifactory' version '4.7.3'
     id 'com.jfrog.bintray' version '1.8.4'
     id 'io.spring.dependency-management' version '1.0.6.RELEASE' apply false
-    id 'me.champeau.gradle.jmh' version '0.4.5' apply false
-    id 'io.morethan.jmhreport' version '0.7.0' apply false
+    id 'me.champeau.gradle.jmh' version '0.4.7' apply false
+    id 'io.morethan.jmhreport' version '0.9.0' apply false
 }
 
 apply from: 'artifactory.gradle'
diff --git a/docs/index.md b/docs/index.md
@@ -88,7 +88,7 @@ protobuf {
     }
     plugins {
         rsocketRpc {
-            artifact = 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.0'
+            artifact = 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.5'
         }
     }
     generateProtoTasks {
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
 group=io.rsocket.rpc
-version=0.2.4
+version=0.2.5

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,7 @@`
`14`	`14`	`* limitations under the License.`
`15`	`15`	`*/`
`16`	`16`
`17`		`-if (project.hasProperty('bintrayUser') && project.hasProperty('bintrayKey') &&`
`18`		`- project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePassword')) {`
	`17`	`+if (project.hasProperty('bintrayUser') && project.hasProperty('bintrayKey')) {`
`19`	`18`
`20`	`19`	`subprojects {`
`21`	`20`	`plugins.withId('com.jfrog.bintray') {`
`@@ -48,8 +47,8 @@ if (project.hasProperty('bintrayUser') && project.hasProperty('bintrayKey') &&`
`48`	`47`	`}`
`49`	`48`
`50`	`49`	`mavenCentralSync {`
`51`		`- user = project.property('sonatypeUsername')`
`52`		`- password = project.property('sonatypePassword')`
	`50`	`+ user = project.properties.getOrDefault('sonatypeUsername', '')`
	`51`	`+ password = project.properties.getOrDefault('sonatypePassword', '')`
`53`	`52`	`}`
`54`	`53`	`}`
`55`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ protobuf {`
`88`	`88`	`}`
`89`	`89`	`plugins {`
`90`	`90`	`rsocketRpc {`
`91`		`- artifact = 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.0'`
	`91`	`+ artifact = 'io.rsocket.rpc:rsocket-rpc-protobuf:0.2.5'`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`	`generateProtoTasks {`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`group=io.rsocket.rpc`
`2`		`-version=0.2.4`
	`2`	`+version=0.2.5`