Merge pull request #29 from novoda/27/handle_version_2

27/Re-add support for publish.version
novoda · Apr 8, 2015 · 7ca772a · 7ca772a
2 parents 51c0f8f + d1eec71
commit 7ca772a
Showing 1 changed file with 11 additions and 4 deletions.
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,13 +19,12 @@ 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 projectVersion
+                    version getProjectProperty(project, 'version', project.publish.version)
 
                     artifacts.all(project).each {
                         delegate.artifact it
@@ -43,8 +42,16 @@ class ReleasePlugin implements Plugin<Project> {
         }
     }
 
-    private String getString(Project project, String propertyName, String defaultValue) {
-        project.hasProperty(propertyName) ? project.getProperty(propertyName) : defaultValue
+    private String getProjectProperty(Project project, String propertyName, String defaultValue) {
+        if (isPropertySet(project, propertyName)) {
+            return project.getProperty(propertyName)
+        } else {
+            return defaultValue
+        }
+    }
+
+    private boolean isPropertySet(Project project, String propertyName) {
+        project.hasProperty(propertyName) && project.getProperty(propertyName) != 'unspecified'
     }
 
 }