From c935f73d35bf337286a04849ce040d5ee535b301 Mon Sep 17 00:00:00 2001
From: rgladwell <ricardo.gladwell@gmail.com>
Date: Tue, 24 May 2011 12:17:25 +0100
Subject: [PATCH 1/2] Remove jar goal from process-classes phase.

---
 .../android/phase04processclasses/UnpackMojo.java  | 14 ++++++--------
 src/main/resources/META-INF/plexus/components.xml  |  2 --
 2 files changed, 6 insertions(+), 10 deletions(-)

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 f2f5cbd85..54faddae1 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
@@ -50,16 +50,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");
 		for (Artifact artifact : getRelevantCompileArtifacts()) {
@@ -90,10 +87,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..e80bfb233 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
                     </compile>
                     <process-classes>
-                        org.apache.maven.plugins:maven-jar-plugin:jar,
                         com.jayway.maven.plugins.android.generation2:maven-android-plugin:unpack
                     </process-classes>
                     <process-test-resources>
@@ -131,7 +130,6 @@
                         org.apache.maven.plugins:maven-compiler-plugin:compile
                     </compile>
                     <process-classes>
-                        org.apache.maven.plugins:maven-jar-plugin:jar,
                         com.jayway.maven.plugins.android.generation2:maven-android-plugin:unpack
                     </process-classes>
                     <process-test-resources>

From dfb88fa4bfae5c603eecb1bd517118d24e784279 Mon Sep 17 00:00:00 2001
From: rgladwell <ricardo.gladwell@gmail.com>
Date: Wed, 25 May 2011 16:40:31 +0100
Subject: [PATCH 2/2] Move jar goal to package phase for apk and apklib to
 ensure jar artifacts deployed with APK.

---
 src/main/resources/META-INF/plexus/components.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/resources/META-INF/plexus/components.xml b/src/main/resources/META-INF/plexus/components.xml
index e80bfb233..fc17fc41d 100644
--- a/src/main/resources/META-INF/plexus/components.xml
+++ b/src/main/resources/META-INF/plexus/components.xml
@@ -44,6 +44,7 @@
                         com.jayway.maven.plugins.android.generation2:maven-android-plugin:dex
                     </prepare-package>
                     <package>
+                    	org.apache.maven.plugins:maven-jar-plugin:jar,
                         com.jayway.maven.plugins.android.generation2:maven-android-plugin:apk
                     </package>
                     <install>
@@ -138,6 +139,7 @@
                     <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
                     <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
                     <package>
+                    	org.apache.maven.plugins:maven-jar-plugin:jar,
                         com.jayway.maven.plugins.android.generation2:maven-android-plugin:apklib
                     </package>
                     <install>