diff --git a/.travis.yml b/.travis.yml index c7b1709..f3d4e0e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,9 @@ script: - echo "Travis branch is $TRAVIS_BRANCH" - echo "Travis branch is in pull request? $TRAVIS_PULL_REQUEST" - echo "Travis tag $TRAVIS_TAG" + - echo -e "signing.keyId=${signing_keyId}" >> "gradle.properties" + - echo -e "signing.password=${signing_password}" >> "gradle.properties" + - echo -e "signing.secretKeyRingFile=../maven.keystore.gpg" >> "gradle.properties" - gradle clean assemble test uploadArchives --continue install: diff --git a/library/build.gradle b/library/build.gradle index 57fa3b6..07639d0 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -52,13 +52,6 @@ android { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - - // Update the signing information with the secure keys stored in Travis - if (System.getenv('signing_keyId') && System.getenv('signing_password')) { - ext."signing.keyId" = System.getenv('signing_keyId') - ext."signing.password" = System.getenv('signing_password') - ext."signing.secretKeyRingFile" = "./maven.keystore.gpg" - } } } } diff --git a/maven_push.gradle b/maven_push.gradle index 0870bbd..8016d44 100644 --- a/maven_push.gradle +++ b/maven_push.gradle @@ -31,7 +31,20 @@ def getRepositoryPassword() { return System.getenv('sonatype_pass') ?: hasProperty('sonatype_pass') ? sonatype_pass : "" } +String getBranchName() { + return System.getenv('TRAVIS_BRANCH') +} + afterEvaluate { project -> + + println "Is Tag ${isTag()}" + println "Branch ${getBranchName()}" + println "Is Release ${isReleaseBuild()}" + println "Is Travis ${isTravis()}" + println "Has Username ${!getRepositoryUsername().empty}" + println "Has Password ${!getRepositoryPassword().empty}" + println "Determined Version ${version}" + uploadArchives { repositories { mavenDeployer {