aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Jin <kjin@google.com>2015-03-13 18:17:15 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-13 18:17:15 +0000
commit4cb69667e64512b2da282e0c7255a251370e7117 (patch)
tree1985bf80e35ef13fe14ea5ca2a1769f910fe8272
parent822efa5a07370f251c45768ebfe20fd82d00e5df (diff)
parent10e9cfd437860ad3013262c33d4b452853dfb5f5 (diff)
downloaddroiddriver-4cb69667e64512b2da282e0c7255a251370e7117.tar.gz
am 10e9cfd4: Merge "Enable bintray auth via env"
* commit '10e9cfd437860ad3013262c33d4b452853dfb5f5': Enable bintray auth via env
-rw-r--r--build.gradle5
1 files changed, 3 insertions, 2 deletions
diff --git a/build.gradle b/build.gradle
index 6ba4919..207eaaf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,8 +4,9 @@
// Gradle >= 2.1 required
buildscript {
- ext.bintrayEnabled = project.hasProperty('bintrayUser') &&
- project.hasProperty('bintrayKey')
+ ext.bintrayUser = project.hasProperty('bintrayUser') ? project.bintrayUser : System.getenv('BINTRAY_USER')
+ ext.bintrayKey = project.hasProperty('bintrayKey') ? project.bintrayKey : System.getenv('BINTRAY_KEY')
+ ext.bintrayEnabled = project.bintrayUser && project.bintrayKey
repositories {
jcenter()