Bug: 474722 - Migrating Android Service to gradle

Android Service Jar contained another JAR containing the classes.
This was a mistake in the build.gradle build script in the order
in which it was preparing the compiled classes into the artifact.

Signed-off-by: James Sutton <james.sutton@uk.ibm.com>

org.eclipse.paho.android.service/org.eclipse.paho.android.service/build.gradle

@@ -75,8 +75,8 @@ task("renameLibraryJar", type: Copy, dependsOn: "clearLibraryJar") {
     rename('classes.jar', archivesBaseName + '-' + version + '.jar')
 }
 
-task ("generateLibraryJar", type: Jar, dependsOn: "renameLibraryJar") {
-    from('build/libs/' + archivesBaseName + '-' + version + '.jar')
+task ("generateLibraryJar", type: Jar) {
+     from('build/intermediates/classes/release')
 }
 
 publishing {
@@ -99,6 +99,10 @@ publishing {
               password eclipseRepoPassword
             }
           }
+        } else {
+          maven {
+            url "$buildDir/repo"
+          }
         }
     }
 }