Merge pull request #23 from novoda/22/use_arg_version

22/Use version property if available
novoda · Mar 26, 2015 · a69f98a · a69f98a
2 parents 608c57a + ae1eaf0
commit a69f98a
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.novoda:bintray-release:0.2.7'
+        classpath 'com.novoda:bintray-release:0.2.8'
     }
 }
 ```
@@ -36,11 +36,12 @@ publish {
     userOrg = 'novoda'
     groupId = 'com.novoda'
     artifactId = 'bintray-release'
-    version = '0.2.7'
-    description = 'Oh hi, this is a nice description for a project right?'
+    version = '0.2.8'
+    description = 'Oh hi, this is a nice description for a project, right?'
     website = 'https://github.com/novoda/bintray-release'
 }
 ```
+(note, since 0.2.8, publish.version can also be supplied on the command line. [See here](https://github.com/novoda/bintray-release/pull/23))
 
 Finally, use the task `bintrayUpload` to publish (make sure you build the project first!):
 

diff --git a/build.gradle b/build.gradle
@@ -1,3 +1,3 @@
 allprojects {
-    version = "0.2.7"
+    version = "0.2.8"
 }
diff --git a/core/build.gradle b/core/build.gradle
@@ -30,6 +30,6 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.novoda:bintray-release:0.2.6'
+        classpath 'com.novoda:bintray-release:0.2.7'
     }
 }
diff --git a/core/src/main/groovy/com/novoda/gradle/release/BintrayConfiguration.groovy b/core/src/main/groovy/com/novoda/gradle/release/BintrayConfiguration.groovy
@@ -32,7 +32,7 @@ class BintrayConfiguration {
 
                 licenses = extension.licences
                 version {
-                    name = extension.version
+                    name = getString(project, 'version', extension.version)
                 }
             }
         }

diff --git a/core/src/main/groovy/com/novoda/gradle/release/ReleasePlugin.groovy b/core/src/main/groovy/com/novoda/gradle/release/ReleasePlugin.groovy
@@ -19,12 +19,13 @@ class ReleasePlugin implements Plugin<Project> {
 
     void attachArtifacts(Project project) {
         Artifacts artifacts = project.plugins.hasPlugin('com.android.library') ? new AndroidArtifacts() : new JavaArtifacts()
+        String projectVersion = getString(project, 'version', project.publish.version)
         project.publishing {
             publications {
                 maven(MavenPublication) {
                     groupId project.publish.groupId
                     artifactId project.publish.artifactId
-                    version project.publish.version
+                    version projectVersion
 
                     artifacts.all(project).each {
                         delegate.artifact it
@@ -42,4 +43,8 @@ class ReleasePlugin implements Plugin<Project> {
         }
     }
 
+    private String getString(Project project, String propertyName, String defaultValue) {
+        project.hasProperty(propertyName) ? project.getProperty(propertyName) : defaultValue
+    }
+
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-2.0-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-2.3-all.zip