diff --git a/src/main/java/com/jayway/maven/plugins/android/phase04processclasses/UnpackMojo.java b/src/main/java/com/jayway/maven/plugins/android/phase04processclasses/UnpackMojo.java
index 087603c1c..22f6eef7c 100644
--- a/src/main/java/com/jayway/maven/plugins/android/phase04processclasses/UnpackMojo.java
+++ b/src/main/java/com/jayway/maven/plugins/android/phase04processclasses/UnpackMojo.java
@@ -59,16 +59,13 @@ public void execute() throws MojoExecutionException, MojoFailureException {
.createDefaultCommmandExecutor();
executor.setLogger(this.getLog());
- File inputFile = new File(project.getBuild().getDirectory()
- + File.separator + project.getBuild().getFinalName() + ".jar");
-
if (generateApk) {
// Unpack all dependent and main classes
- unpackClasses(inputFile);
+ unpackClasses();
}
}
- private File unpackClasses(File inputFile) throws MojoExecutionException {
+ private File unpackClasses() throws MojoExecutionException {
File outputDirectory = new File(project.getBuild().getDirectory(),
"android-classes");
if (lazyLibraryUnpack && outputDirectory.exists())
@@ -103,10 +100,11 @@ private File unpackClasses(File inputFile) throws MojoExecutionException {
}
try {
- unjar(new JarFile(inputFile), outputDirectory);
+ File sourceDirectory = new File(project.getBuild().getDirectory(), "classes");
+ FileUtils.copyDirectory(sourceDirectory, outputDirectory);
} catch (IOException e) {
- throw new MojoExecutionException("IOException while unjarring "
- + inputFile.getAbsolutePath() + " into "
+ throw new MojoExecutionException("IOException while copying "
+ + sourceDirectory.getAbsolutePath() + " into "
+ outputDirectory.getAbsolutePath(), e);
}
return outputDirectory;
diff --git a/src/main/resources/META-INF/plexus/components.xml b/src/main/resources/META-INF/plexus/components.xml
index 5fe00f295..fc17fc41d 100644
--- a/src/main/resources/META-INF/plexus/components.xml
+++ b/src/main/resources/META-INF/plexus/components.xml
@@ -33,7 +33,6 @@
org.apache.maven.plugins:maven-compiler-plugin:compile
- org.apache.maven.plugins:maven-jar-plugin:jar,
com.jayway.maven.plugins.android.generation2:maven-android-plugin:unpack
@@ -45,6 +44,7 @@
com.jayway.maven.plugins.android.generation2:maven-android-plugin:dex
+ org.apache.maven.plugins:maven-jar-plugin:jar,
com.jayway.maven.plugins.android.generation2:maven-android-plugin:apk
@@ -131,7 +131,6 @@
org.apache.maven.plugins:maven-compiler-plugin:compile
- org.apache.maven.plugins:maven-jar-plugin:jar,
com.jayway.maven.plugins.android.generation2:maven-android-plugin:unpack
@@ -140,6 +139,7 @@
org.apache.maven.plugins:maven-compiler-plugin:testCompile
org.apache.maven.plugins:maven-surefire-plugin:test
+ org.apache.maven.plugins:maven-jar-plugin:jar,
com.jayway.maven.plugins.android.generation2:maven-android-plugin:apklib