auto-deploy with circle

bpatters · Sep 1, 2016 · 259b74e · 259b74e
1 parent b1e87b0
commit 259b74e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,15 +3,19 @@ import java.text.SimpleDateFormat
 plugins {
     id "com.jfrog.bintray" version "1.4"
 }
-
-def releaseVersion = project.properties.containsKey("releaseVersion") ?: "1.0.0-SNAPSHOT"
-def bintrayUser = project.properties.containsKey("bintrayUser") ?: ""
-def bintrayApiKey = project.properties.containsKey("bintrayApiKey") ?: ""
+String bintrayUser = project["bintrayUser"]
+String bintrayApiKey = project["bintrayApiKey"]
 
 allprojects {
     description "This provides type introspection and generation of GraphQL from Pojos."
     group 'com.bretpatterson'
 
+    def releaseVersion = project.properties.containsKey("releaseVersion") ? project["releaseVersion"]: "1.0.0-SNAPSHOT"
+
+    bintrayUser = project["bintrayUser"]
+    bintrayApiKey = project["bintrayApiKey"]
+    println("User="+bintrayUser+" api="+bintrayApiKey)
+
     apply plugin: 'java'
     apply plugin: 'jacoco'
     apply plugin: 'maven'
@@ -125,8 +129,8 @@ allprojects {
     }
 
     bintray {
-        user = bintrayUser ?: project["bintray.user"]
-        key = bintrayApiKey ?: project["bintray.key"]
+        user = bintrayUser
+        key = bintrayApiKey
         publications = ['schemagenGraphQL']
         publish = true
         pkg {

diff --git a/schemagen-graphql-examples/build.gradle b/schemagen-graphql-examples/build.gradle
@@ -53,8 +53,8 @@ publishing {
 }
 
 bintray {
-    user = System.env.BINTRAY_USER ?: project["bintray.user"]
-    key = System.env.BINTRAY_API_KEY ?: project["bintray.key"]
+    user = bintrayUser
+    key = bintrayApiKey
     publications = ['schemagenGraphQLExamples']
     publish = true
     pkg {

diff --git a/schemagen-graphql-guava/build.gradle b/schemagen-graphql-guava/build.gradle
@@ -50,8 +50,8 @@ publishing {
 }
 
 bintray {
-    user = System.env.BINTRAY_USER ?: project["bintray.user"]
-    key = System.env.BINTRAY_API_KEY ?: project["bintray.key"]
+    user = bintrayUser
+    key = bintrayApiKey
     publications = ['schemagenGraphQLGuava']
     publish = true
     pkg {

diff --git a/schemagen-graphql-joda/build.gradle b/schemagen-graphql-joda/build.gradle
@@ -51,8 +51,6 @@ publishing {
 }
 
 bintray {
-    user = System.env.BINTRAY_USER ?: project["bintray.user"]
-    key = System.env.BINTRAY_API_KEY ?: project["bintray.key"]
     publications = ['schemagenGraphQLJoda']
     publish = true
     pkg {

diff --git a/schemagen-graphql-spring/build.gradle b/schemagen-graphql-spring/build.gradle
@@ -57,8 +57,6 @@ publishing {
 }
 
 bintray {
-    user = System.env.BINTRAY_USER ?: project["bintray.user"]
-    key = System.env.BINTRAY_API_KEY ?: project["bintray.key"]
     publications = ['schemagenGraphQLSpring']
     publish = true
     pkg {