Not forcing sign, if there is no keyId

xxjy · Oct 12, 2013 · d276be6 · d276be6
1 parent 8a6557a
commit d276be6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -38,7 +38,6 @@ before_install:
   # verify files exist in right paths
   - find $ANDROID_HOME/build-tools
   - file $ANDROID_HOME/build-tools/18.0.1/aapt
-  - echo "nexusUsername=dummy" >> gradle.properties
-  - echo "nexusPassword=dummy" >> gradle.properties
   - echo "nexusUsername=dummy" >> library/gradle.properties
   - echo "nexusPassword=dummy" >> library/gradle.properties
+
diff --git a/maven_push.gradle b/maven_push.gradle
@@ -16,22 +16,18 @@ if (isReleaseBuild()) {
     sonatypeRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
 }
 
-if (!signing.hasProperty('password')) {
+if (ext.hasProperty('signing.keyId') && !ext.hasProperty('signing.password')) {
     if (System.console())
-        allprojects {
-            ext.set('signing.password', System.console().readPassword("\n\$ Type in GPG key password: "))
-        }
+        ext.set('signing.password', System.console().readPassword("\n\$ Type in GPG key password: "))
     else
-        allprojects { ext.set('signing.password', 'dummy') }
+        ext.set('signing.password', 'dummy')
 }
 
-if (!project.ext.hasProperty('nexusPassword')) {
+if (!ext.hasProperty('nexusPassword')) {
     if (System.console())
-        allprojects {
-            project.ext.set('nexusPassword', new String(System.console().readPassword("\n\$ Type in password for Sonatype nexus account ${nexusUsername}: ")))
-        }
+        project.ext.set('nexusPassword', new String(System.console().readPassword("\n\$ Type in password for Sonatype nexus account ${nexusUsername}: ")))
     else
-        allprojects { project.ext.set('nexusPassword', 'dummy') }
+    	project.ext.set('nexusPassword', 'dummy')
 }
 
 afterEvaluate { project ->