Merge remote-tracking branch 'origin/master'

Author: bennyhuo

AutoDisposable/build.gradle

@@ -37,12 +37,14 @@ artifacts {
 
 apply plugin: 'com.novoda.bintray-release'
 
+version '1.0'
+
 publish {
     userOrg = project.userName
     groupId = project.groupId
     repoName = project.repoName
     artifactId = 'coroutines-android-autodisposable'
-    publishVersion = "1.0"//project.publishVersion
+    publishVersion = version//project.publishVersion
     desc = project.desc//描述，不重要
     website = project.website
     bintrayUser = project.userName

MainScope/build.gradle

@@ -47,7 +47,7 @@ publish {
     groupId = project.groupId
     repoName = project.repoName
     artifactId = 'coroutines-android-mainscope'
-    publishVersion = project.publishVersion
+    publishVersion = project.releaseVersion
     desc = project.desc//描述，不重要
     website = project.website
     bintrayUser = project.userName

build.gradle

@@ -39,7 +39,7 @@ ext {
     apiKey = props.getProperty("bintray.key")
     repoName = "bennyhuo"
     groupId = project.group
-    publishVersion = project.version
+    releaseVersion = project.version
     desc = ""
     website = 'https://github.com/enbandari/kotlin-coroutines-android'
     dryRun = "false"