Merge branch 'ssidea-to-gradle'

Author: Layoric

.gitignore

@@ -25,6 +25,8 @@ proguard/
 # Log Files
 *.log
 src/ServiceStackIDEA/.idea/workspace.xml
+src/ServiceStackIDEA/lib/sdk/
+src/ServiceStackIDEA/lib/idea-sdk.zip
 linux.gtk.x86/
 linux.gtk.x86_64/
 macosx.cocoa.x86/

src/AndroidClient/android/build.gradle

@@ -22,8 +22,10 @@ android {
     }
 }
 
-Properties properties = new Properties()
-properties.load(project.file('./local.properties').newDataInputStream())
+Properties properties = System.properties;
+if(properties.getProperty("bintray.user", null) == null) {
+    properties.load(project.file('./local.properties').newDataInputStream())
+}
 
 def siteUrl = 'https://github.com/ServiceStack/ServiceStack.Java'      // Homepage URL of the library
 def gitUrl = 'https://github.com/ServiceStack/ServiceStack.Java.git'   // Git repository URL

src/AndroidClient/client/build.gradle

@@ -25,12 +25,14 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.google.code.gson:gson:2.3.1'
 }
 
-Properties properties = new Properties()
-properties.load(project.file('./local.properties').newDataInputStream())
+Properties properties = System.properties;
+if(properties.getProperty("bintray.user", null) == null) {
+    properties.load(project.file('./local.properties').newDataInputStream())
+}
+
 
 def siteUrl = 'https://github.com/ServiceStack/ServiceStack.Java'      // Homepage URL of the library
 def gitUrl = 'https://github.com/ServiceStack/ServiceStack.Java.git'   // Git repository URL
@@ -122,7 +124,7 @@ task clearJar(type: Delete) {
 artifacts {
     archives javadocJar
     archives sourcesJar
-    archives file: new File('build/libs/' + packageId + '-' + version + '.jar'), name: packageId, type: 'jar'
+    archives file: new File(project.projectDir,'build/libs/' + packageId + '-' + version + '.jar'), name: packageId, type: 'jar'
 }
 
 task findConventions << {