From fa18abe3384dd9b4976d487a357314a9772bacf1 Mon Sep 17 00:00:00 2001 From: James Sutton Date: Wed, 16 Sep 2015 09:32:54 +0100 Subject: [PATCH] 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 --- .../org.eclipse.paho.android.service/build.gradle | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/org.eclipse.paho.android.service/org.eclipse.paho.android.service/build.gradle b/org.eclipse.paho.android.service/org.eclipse.paho.android.service/build.gradle index f8d79100..89bad686 100755 --- a/org.eclipse.paho.android.service/org.eclipse.paho.android.service/build.gradle +++ b/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" + } } } }