refactor: extract input-api into library (#1821)

jadx-core/build.gradle

@@ -3,6 +3,8 @@ plugins {
 }
 
 dependencies {
+	api(project(":jadx-plugins:jadx-input-api"))
+
 	implementation 'com.google.code.gson:gson:2.10.1'
 
 	// TODO: move resources decoding to separate plugin module

jadx-plugins/jadx-input-api/README.md

@@ -0,0 +1,5 @@
+# jadx-input-api
+
+Base API for code input used in jadx.
+
+Contains common data structures to support both java and dex bytecode.

jadx-plugins/jadx-input-api/build.gradle

@@ -0,0 +1,3 @@
+plugins {
+	id 'jadx-library'
+}

jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/impl/CatchData.java

@@ -1,7 +1,8 @@
 package jadx.api.plugins.input.data.impl;
 
 import jadx.api.plugins.input.data.ICatch;
-import jadx.api.plugins.utils.Utils;
+
+import static jadx.api.plugins.input.data.impl.InputUtils.formatOffset;
 
 public class CatchData implements ICatch {
 	private final int[] handlers;
@@ -34,10 +35,10 @@ public class CatchData implements ICatch {
 		StringBuilder sb = new StringBuilder("Catch:");
 		int size = types.length;
 		for (int i = 0; i < size; i++) {
-			sb.append(' ').append(types[i]).append("->").append(Utils.formatOffset(handlers[i]));
+			sb.append(' ').append(types[i]).append("->").append(formatOffset(handlers[i]));
 		}
 		if (allHandler != -1) {
-			sb.append(" all->").append(Utils.formatOffset(allHandler));
+			sb.append(" all->").append(formatOffset(allHandler));
 		}
 		return sb.toString();
 	}

jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/impl/InputUtils.java

@@ -0,0 +1,7 @@
+package jadx.api.plugins.input.data.impl;
+
+public class InputUtils {
+	public static String formatOffset(int offset) {
+		return String.format("0x%04x", offset);
+	}
+}

jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/impl/TryData.java

@@ -2,7 +2,8 @@ package jadx.api.plugins.input.data.impl;
 
 import jadx.api.plugins.input.data.ICatch;
 import jadx.api.plugins.input.data.ITry;
-import jadx.api.plugins.utils.Utils;
+
+import static jadx.api.plugins.input.data.impl.InputUtils.formatOffset;
 
 public class TryData implements ITry {
 
@@ -33,6 +34,6 @@ public class TryData implements ITry {
 
 	@Override
 	public String toString() {
-		return "Try{" + Utils.formatOffset(startOffset) + " - " + Utils.formatOffset(endOffset) + ": " + catchHandler + '}';
+		return "Try{" + formatOffset(startOffset) + " - " + formatOffset(endOffset) + ": " + catchHandler + '}';
 	}
 }

settings.gradle.kts

@@ -4,7 +4,7 @@ include("jadx-core")
 include("jadx-cli")
 include("jadx-gui")
 
-include("jadx-plugins")
+include("jadx-plugins:jadx-input-api")
 include("jadx-plugins:jadx-dex-input")
 include("jadx-plugins:jadx-java-input")
 include("jadx-plugins:jadx-raung-input")