am 85a1731f: Merge "Read bintray credentials from bintray.properties"

* commit '85a1731f32032690e528a6ca1084aa148200569b':
  Read bintray credentials from bintray.properties

4 files changed, 24 insertions, 14 deletions

diff --git a/.gitignore b/.gitignore
index dd8caa2..3d0ebbd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,9 @@ build
 # Android Studio junk
 .idea/
 *.iml
-local.properties
+
+# Don't check in properties
+*.properties
 
 .DS_Store
 
diff --git a/build.gradle b/build.gradle
index 2c84ae5..5f3c73e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,12 @@
 // If building from command line and you don't have the file local.properties that specifies
 // sdk.dir for the Android SDK path, you can run
 // $ ANDROID_HOME=/path/to/android-sdk gradle build
+
 // Gradle >= 2.1 required
 buildscript {
+    ext.bintrayFile = project.rootProject.file('bintray.properties')
+    ext.bintrayEnabled = bintrayFile.exists()
+
     repositories {
         jcenter()
     }
@@ -10,14 +14,13 @@ buildscript {
         classpath 'com.android.tools.build:gradle:1.0.1'
         classpath 'com.github.dcendents:android-maven-plugin:1.2'
         classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
-        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.0.3'
+        if (bintrayEnabled) {
+            classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.0.3'
+            classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.1'
+        }
     }
 }
 
-plugins {
-    id 'com.jfrog.bintray' version '1.1'
-}
-
 apply from: 'properties.gradle'
 group = ddGroup
 version = ddVersion
@@ -87,5 +90,9 @@ artifacts {
 }
 
 apply from: 'maven.gradle'
-apply from: 'jcenter.gradle'
-apply from: 'artifactory.gradle'
+
+if (bintrayEnabled) {
+    apply plugin: 'com.jfrog.bintray'
+    apply from: 'jcenter.gradle'
+    apply from: 'artifactory.gradle'
+}
diff --git a/properties.gradle b/properties.gradle
index ac434eb..918fa8c 100644
--- a/properties.gradle
+++ b/properties.gradle
@@ -1,8 +1,9 @@
-Properties properties = new Properties()
-properties.load(project.rootProject.file('local.properties').newDataInputStream())
-
-ext.bintray_user = properties.getProperty('bintray.user')
-ext.bintray_key  = properties.getProperty('bintray.key')
+if (bintrayEnabled) {
+    Properties properties = new Properties()
+    properties.load(bintrayFile.newDataInputStream())
+    ext.bintray_user = properties.getProperty('bintray.user')
+    ext.bintray_key  = properties.getProperty('bintray.key')
+}
 
 ext.ddArtifactId  = 'droiddriver'
 ext.ddGroup       = 'io.appium'
diff --git a/releasing_to_jcenter.md b/releasing_to_jcenter.md
index d8321db..eaeb815 100644
--- a/releasing_to_jcenter.md
+++ b/releasing_to_jcenter.md
@@ -1,6 +1,6 @@
 # Releasing to JCenter
 
-Add the following credentials to `local.properties` Your API key can be [found here](https://bintray.com/user/edit/tab/apikey).
+Add the following credentials to `bintray.properties` Your API key can be [found here](https://bintray.com/user/edit/tab/apikey).
 
 ```
 bintray.user=USERNAME