Added Dex generation feature

Author: cemalgnlts

.DS_Store

@@ -20,29 +20,22 @@ Open and compile the project with [AndroidIDE](https://github.com/AndroidIDEOffi
 ### Install with shell commands
 
 It can be imported into DroidScript with this example:
-
+Start the terminal in the project folder: `~/AndroidStudioProjects/JavaCompiler`
 ```sh
 cd app/build/outputs/apk/debug
 rm -r temp
+mkdir temp
 unzip app-debug.apk -d temp
 cd temp
 zip JavaCompiler.jar classes*.dex
-rm classes.dex
 cp -r assets/* .
-cp -r lib/* .
-rm -r lib
-rm -r assets
-rm -r res
-rm AndroidManifest.xml
-rm resources.arsc
-rm -r META-INF
-zip -r ../JavaCompiler.ppk *.
-
-cd ..
-export PATH=$PATH:~/Library/Android/sdk/platform-tools/
+zip JavaCompiler.ppk JavaCompiler* android.jar
 adb push JavaCompiler.ppk /sdcard/Android/data/com.smartphoneremote.androidscriptfree/files/DroidScript/Plugins/JavaCompiler.ppk
+echo COMPLETED
 ```
 
+Now (re)open DroidScript and wait for the "plugin loaded" message.
+
 ### Install manually
 
 * Unzip the APK.

.idea/.gitignore

@@ -30,14 +30,15 @@ android {
 
     compileOptions {
         coreLibraryDesugaringEnabled true
-        
+
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 
 dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.0.4'
-    
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    implementation files('libs/dx-1.16.jar')
+    implementation files('libs/nb-javac-17.0.0.4-android.jar')
 }

.idea/AndroidProjectSystem.xml

@@ -4,6 +4,7 @@
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
+# Prevent R8 from leaving Data object members always null
 
 # If your project uses WebView with JS, uncomment the following
 # and specify the fully qualified class name to the JavaScript interface

.idea/appInsightsSettings.xml

@@ -166,6 +166,10 @@ <h3>Methods</h3>
 			<a href="#pop_dsc_008" data-transition="pop" data-rel="popup">SetOutputFolder</a>(
 			<a href="#pop_str_ptd" data-transition="pop" data-rel="popup">path</a> )
 		</div>
+		<div class="samp">
+			<a href="#pop_dsc_009" data-transition="pop" data-rel="popup">GenerateDexFile</a>(
+			<a href="#pop_str_ptd" data-transition="pop" data-rel="popup">jarPath</a>) → <b>String</b>
+		</div>
 
 	</div>
 
@@ -181,6 +185,7 @@ <h3>Methods</h3>
 	<div data-role="popup" id="pop_dsc_006" class="ui-content"><b>jac.GetDiagnosticMessages</b><br>Log records generated during compilation.</div>
 	<div data-role="popup" id="pop_dsc_007" class="ui-content"><b>jac.SetOptions</b><br>Compilation flags.</div>
 	<div data-role="popup" id="pop_dsc_008" class="ui-content"><b>jac.SetOutputFolder</b><br>Output folder for adding packages created during compilation.</div>
+	<div data-role="popup" id="pop_dsc_009" class="ui-content"><b>jac.GenerateDexFile</b><br>It converts the given jar file to dex file and adds classes.dex file to the output folder.</div>
 </div>
 </body>
 

.idea/compiler.xml

@@ -1,16 +1,14 @@
-
-//Add CreateJavaCompiler method to global app object.
-app.CreateJavaCompiler = function( options ) {
-	return new CreateJavaCompiler( options );
-}
-
-//Plugin wrapper object.
-function CreateJavaCompiler( options )
-{
+
+//Add CreateJavaCompiler method to global app object.
+app.CreateJavaCompiler = options => new CreateJavaCompiler( options );
+
+//Plugin wrapper object.
+function CreateJavaCompiler( options )
+{
     const plg = _CreatePlugin( "com.candlelight.javacompiler.plugins.user.JavaCompiler", options );
 
     const id = plg.CreateObj("JavaCompiler", options);
-    let inst;
+    let inst;
 
     if( id ) inst = new SObj(id, "jac");
     else throw Error("CreateJavaCompiler: Something going wrong.");
@@ -23,9 +21,10 @@ function CreateJavaCompiler( options )
     inst.AddPlatformJarFile = path => send("addPlatformJarFile", app.RealPath(path));
     inst.AddJarFile = path => send("addJarFile", app.RealPath(path));
     inst.SetOutputFolder = path => send("setOutputFolder", app.RealPath(path));
-    inst.Compile = () => send("compile");// === "true";
+    inst.Compile = () => send("compile") === "true";
     inst.GenerateJarFile = () => send("generateJarFile");
+    inst.GenerateDexFile = (jarPath) => send("generateDexFile", app.RealPath(jarPath));
     inst.GetDiagnosticMessages = () => send("getDiagnosticMessages");
 
-    return inst;
+    return inst;
 }

.idea/deploymentTargetSelector.xml

@@ -1,5 +1,5 @@
 
-package com.candlelight.javawrapper.plugins;
+package com.candlelight.javacompiler.plugins;
 
 import android.app.Activity;
 

.idea/migrations.xml

@@ -0,0 +1,34 @@
+package com.candlelight.javacompiler.plugins.user;
+
+import android.util.Log;
+
+import com.xiaoyv.dx.command.Main;
+
+import java.nio.file.Paths;
+
+public class JarToDex {
+    public String outputPath;
+
+    String startConversion(String jarPath) {
+        String outFile = Paths.get(this.outputPath)
+                .resolve("classes.dex")
+                .toString();
+        Log.e("JavaCompiler", "OKU:" + outFile);
+        String[] args = {
+            "--dex",
+            "--no-strict",
+            "--min-sdk-version=26",
+            "--output=" + outFile,
+            jarPath
+        };
+        Log.e("JavaCompiler", "OKU:" + String.join(",", args));
+
+        try {
+            Main.main(args);
+        } catch (Exception e) {
+            return "Error: " + e.getClass().getSimpleName() + " - " + e.getMessage();
+        }
+
+        return "";
+    }
+}