Reverted gradle changes as changing client to JAR breaks android AAR dependency.

Layoric · Layoric · commit abaebef636c1 · 2015-05-03T15:59:35.000+10:00
Also, manual task of copying classes.jar breaks POM generation, specifically &lt;packaging&gt; tag disappears...
diff --git a/src/AndroidClient/android/android.iml b/src/AndroidClient/android/android.iml
@@ -85,8 +85,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/poms" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
-      <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
diff --git a/src/AndroidClient/android/build.gradle b/src/AndroidClient/android/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
-version = "1.0.1"
+version = "1.0.6"
 
 android {
     compileSdkVersion 21
diff --git a/src/AndroidClient/client/build.gradle b/src/AndroidClient/client/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
-version = "1.0.5"
+version = "1.0.6"
 group = "net.servicestack"                                        // Maven Group ID for the artifact
 String packageId = "client"
 
@@ -58,7 +58,7 @@ install {
         // This generates POM.xml with proper parameters
         pom {
             project {
-                packaging 'jar'
+                packaging 'aar'
 
                 // Add your description here
                 name 'ServiceStack.Client'
@@ -123,7 +123,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('build/libs/' + packageId + '-' + version + '.jar'), name: packageId, type: 'jar'
 }
 
 task findConventions << {
diff --git a/src/AndroidClient/client/client.iml b/src/AndroidClient/client/client.iml
@@ -62,6 +62,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/docs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -81,7 +82,9 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/poms" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
