Fixes build for shipping to bintray

Author: Josh Deffibaugh

.gitignore

@@ -7,3 +7,4 @@
 .DS_Store
 /build
 /captures
+values.gradle

.idea/inspectionProfiles/Project_Default.xml

@@ -69,12 +69,12 @@ dependencies {
 }
 
 uploadArchives {
-    dependsOn = [':android-sdk:clean', ':android-sdk:releaseJavadoc']
+    dependsOn = [':android-sdk:clean', ':android-sdk:releaseJavadocJar']
     shouldRunAfter = [':event-handler:uploadArchives', ':user-experiment-record:uploadArchives']
     repositories {
         mavenDeployer {
             repository(url: "https://api.bintray.com/maven/optimizely/optimizely/optimizely-sdk-android") {
-                authentication(userName: project.property('bintrayUser'), password: project.property('bintrayApiKey'))
+                authentication(userName: bintray_user, password: bintray_api_key)
             }
             pom.artifactId = "android-sdk"
         }

android-sdk/build.gradle

@@ -17,6 +17,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    if (file('values.gradle').exists()) {
+        apply from: 'values.gradle'
+    } else {
+        rootProject.ext.bintray_user = ''
+        rootProject.ext.bintray_api_key = ''
+    }
     repositories {
         jcenter()
     }

build.gradle

@@ -66,12 +66,12 @@ dependencies {
 }
 
 uploadArchives {
-    dependsOn = [':event-handler:clean', ':event-handler:releaseJavadoc']
+    dependsOn = [':event-handler:clean', ':event-handler:releaseJavadocJar']
     shouldRunAfter = [':shared:uploadArchives']
     repositories {
         mavenDeployer {
             repository(url: "https://api.bintray.com/maven/optimizely/optimizely/optimizely-sdk-android-event-handler") {
-                authentication(userName: project.property('bintrayUser'), password: project.property('bintrayApiKey'))
+                authentication(userName: bintray_user, password: bintray_api_key)
             }
             pom.artifactId = "android-sdk-event-handler"
         }

event-handler/build.gradle

@@ -68,11 +68,11 @@ dependencies {
 }
 
 uploadArchives {
-    dependsOn = [':shared:clean', 'shared:releaseJavadoc']
+    dependsOn = [':shared:clean', ':shared:releaseJavadocJar']
     repositories {
         mavenDeployer {
             repository(url: "https://api.bintray.com/maven/optimizely/optimizely/optimizely-sdk-android-shared") {
-                authentication(userName: project.property('bintrayUser'), password: project.property('bintrayApiKey'))
+                authentication(userName: bintray_user, password: bintray_api_key)
             }
             pom.artifactId = "android-sdk-shared"
         }

gradle.properties

@@ -66,12 +66,12 @@ dependencies {
 }
 
 uploadArchives {
-    dependsOn = [':user-experiment-record:clean', ':user-experiment-record:releaseJavadoc']
+    dependsOn = [':user-experiment-record:clean', ':user-experiment-record:releaseJavadocJar']
     shouldRunAfter = [':shared:uploadArchives']
     repositories {
         mavenDeployer {
             repository(url: "https://api.bintray.com/maven/optimizely/optimizely/optimizely-sdk-android-user-experiment-record") {
-                authentication(userName: project.property('bintrayUser'), password: project.property('bintrayApiKey'))
+                authentication(userName: bintray_user, password: bintray_api_key)
             }
             pom.artifactId = "android-sdk-user-experiment-record"
         }