Adds all java resources to APK even those in META-INF

src/main/java/com/simpligility/maven/plugins/android/AndroidSdk.java

@@ -189,8 +189,18 @@ public String getDxJarPath()
     {
         return getPathForBuildTool( BuildToolInfo.PathId.DX_JAR );
     }
-
-     /**
+
+    /**
+     * @return the path to the dx.jar
+     */
+    public String getD8JarPath()
+    {
+        final File pathToDexJar = new File( getPathForBuildTool( BuildToolInfo.PathId.DX_JAR ) );
+        final File pathToD8Jar = new File( pathToDexJar.getParent(), "d8.jar" );
+        return pathToD8Jar.getAbsolutePath();
+    }
+
+    /**
      * Get the path for proguard.jar
      * @return
      */

src/main/java/com/simpligility/maven/plugins/android/configuration/D8.java

@@ -0,0 +1,75 @@
+package com.simpligility.maven.plugins.android.configuration;
+
+import com.simpligility.maven.plugins.android.phase08preparepackage.DexMechanism;
+
+/**
+ * Configuration for the D8 execution. This class is only the definition of the parameters that are
+ * shadowed in
+ * {@link com.simpligility.maven.plugins.android.phase08preparepackage.D8Mojo} and used there.
+ *
+ * @author William Ferguson - [email protected]
+ */
+public class D8
+{
+    /**
+     * Mirror of {@link com.simpligility.maven.plugins.android.phase08preparepackage.D8Mojo#dexJvmArguments}
+     */
+    private String[] jvmArguments;
+    /**
+     * Mirror of {@link com.simpligility.maven.plugins.android.phase08preparepackage.D8Mojo#dexIntermediate}
+     */
+    private Boolean intermediate;
+    /**
+     * Mirror of {@link com.simpligility.maven.plugins.android.phase08preparepackage.D8Mojo#dexMainDexList}
+     */
+    private String mainDexList;
+
+    private String dexArguments;
+
+    /**
+     * Mirror of {@link com.simpligility.maven.plugins.android.phase08preparepackage.D8Mojo#dexRelease}
+     */
+    private Boolean release;
+
+    /**
+     * Mirror of {@link com.simpligility.maven.plugins.android.phase08preparepackage.D8Mojo#dexMinApi}
+     */
+    private Integer minApi;
+
+    private DexMechanism dexMechanism = DexMechanism.Dex;
+
+    public String[] getJvmArguments()
+    {
+        return jvmArguments;
+    }
+
+    public Boolean isIntermediate()
+    {
+        return intermediate;
+    }
+
+    public String getMainDexList()
+    {
+        return mainDexList;
+    }
+
+    public String getDexArguments()
+    {
+        return dexArguments;
+    }
+
+    public DexMechanism getDexMechanism()
+    {
+        return dexMechanism;
+    }
+
+    public Boolean isRelease()
+    {
+        return release;
+    }
+
+    public Integer getMinApi()
+    {
+        return minApi;
+    }
+}

src/main/java/com/simpligility/maven/plugins/android/configuration/Dex.java

@@ -1,5 +1,7 @@
 package com.simpligility.maven.plugins.android.configuration;
 
+import com.simpligility.maven.plugins.android.phase08preparepackage.DexMechanism;
+
 /**
  * Configuration for the dex  test execution. This class is only the definition of the parameters that are
  * shadowed in
@@ -60,6 +62,7 @@ public class Dex
 
     private String dexArguments;
 
+    private DexMechanism dexMechanism = DexMechanism.Dex;
 
     public String[] getJvmArguments()
     {
@@ -125,4 +128,9 @@ public String getDexArguments()
     {
         return dexArguments;
     }
+
+    public DexMechanism getDexMechanism()
+    {
+        return dexMechanism;
+    }
 }