Merge pull request simpligility#779 from lyubomyr-shaydariv/unpack.unpackOutputDirectory

Added unpackOutputDirectory and includeNonClassFiles to the unpack goal

Author: william-ferguson-au

src/main/java/com/simpligility/maven/plugins/android/standalonemojos/UnpackMojo.java

@@ -74,6 +74,12 @@ public class UnpackMojo extends AbstractAndroidMojo
     @ConfigPojo( prefix = "unpack" )
     private Unpack unpack;
 
+    @Parameter( defaultValue = "${project.build.directory}/android-classes", readonly = true )
+    private File unpackOutputDirectory;
+
+    @Parameter( defaultValue = "false", readonly = true )
+    private boolean includeNonClassFiles;
+
     public void execute() throws MojoExecutionException, MojoFailureException
     {
 
@@ -89,7 +95,7 @@ public void execute() throws MojoExecutionException, MojoFailureException
 
     private File unpackClasses() throws MojoExecutionException
     {
-        File outputDirectory = new File( targetDirectory, "android-classes" );
+        File outputDirectory = unpackOutputDirectory;
         if ( lazyLibraryUnpack && outputDirectory.exists() )
         {
             getLog().info( "skip library unpacking due to lazyLibraryUnpack policy" );
@@ -141,7 +147,10 @@ public boolean include( JarEntry jarEntry )
 
         try
         {
-            FileUtils.copyDirectory( projectOutputDirectory, outputDirectory );
+            if ( !projectOutputDirectory.equals( outputDirectory ) )
+            {
+                FileUtils.copyDirectory( projectOutputDirectory, outputDirectory );
+            }
         }
         catch ( IOException e )
         {
@@ -160,6 +169,11 @@ boolean isIncluded( JarEntry jarEntry )
             return true;
         }
 
+        if ( includeNonClassFiles && !entName.startsWith( "META-INF/" ) )
+        {
+            return true;
+        }
+
         return this.unpackMetaInf != null && this.unpackMetaInf.isIncluded( entName );
     }