diff --git a/jadx-core/build.gradle b/jadx-core/build.gradle index 807d6facb..6138db2ff 100644 --- a/jadx-core/build.gradle +++ b/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 diff --git a/jadx-plugins/jadx-input-api/README.md b/jadx-plugins/jadx-input-api/README.md new file mode 100644 index 000000000..f52cb67b2 --- /dev/null +++ b/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. diff --git a/jadx-plugins/jadx-input-api/build.gradle b/jadx-plugins/jadx-input-api/build.gradle new file mode 100644 index 000000000..c4c8599f4 --- /dev/null +++ b/jadx-plugins/jadx-input-api/build.gradle @@ -0,0 +1,3 @@ +plugins { + id 'jadx-library' +} diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/ICodeLoader.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/ICodeLoader.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/ICodeLoader.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/ICodeLoader.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/JadxCodeInput.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/JadxCodeInput.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/JadxCodeInput.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/JadxCodeInput.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/AccessFlags.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/AccessFlags.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/AccessFlags.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/AccessFlags.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/AccessFlagsScope.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/AccessFlagsScope.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/AccessFlagsScope.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/AccessFlagsScope.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/ICallSite.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/ICallSite.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/ICallSite.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/ICallSite.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/ICatch.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/ICatch.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/ICatch.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/ICatch.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/IClassData.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/IClassData.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/IClassData.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/IClassData.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/ICodeReader.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/ICodeReader.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/ICodeReader.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/ICodeReader.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/IDebugInfo.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/IDebugInfo.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/IDebugInfo.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/IDebugInfo.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/IFieldData.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/IFieldData.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/IFieldData.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/IFieldData.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/IFieldRef.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/IFieldRef.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/IFieldRef.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/IFieldRef.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/ILocalVar.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/ILocalVar.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/ILocalVar.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/ILocalVar.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/IMethodData.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/IMethodData.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/IMethodData.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/IMethodData.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/IMethodHandle.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/IMethodHandle.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/IMethodHandle.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/IMethodHandle.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/IMethodProto.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/IMethodProto.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/IMethodProto.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/IMethodProto.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/IMethodRef.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/IMethodRef.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/IMethodRef.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/IMethodRef.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/IResourceData.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/IResourceData.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/IResourceData.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/IResourceData.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/ISeqConsumer.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/ISeqConsumer.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/ISeqConsumer.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/ISeqConsumer.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/ITry.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/ITry.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/ITry.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/ITry.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/MethodHandleType.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/MethodHandleType.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/MethodHandleType.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/MethodHandleType.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/annotations/AnnotationVisibility.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/annotations/AnnotationVisibility.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/annotations/AnnotationVisibility.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/annotations/AnnotationVisibility.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/annotations/EncodedType.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/annotations/EncodedType.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/annotations/EncodedType.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/annotations/EncodedType.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/annotations/EncodedValue.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/annotations/EncodedValue.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/annotations/EncodedValue.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/annotations/EncodedValue.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/annotations/IAnnotation.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/annotations/IAnnotation.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/annotations/IAnnotation.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/annotations/IAnnotation.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/annotations/JadxAnnotation.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/annotations/JadxAnnotation.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/annotations/JadxAnnotation.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/annotations/JadxAnnotation.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/IJadxAttrType.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/IJadxAttrType.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/IJadxAttrType.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/IJadxAttrType.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/IJadxAttribute.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/IJadxAttribute.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/IJadxAttribute.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/IJadxAttribute.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/JadxAttrType.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/JadxAttrType.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/JadxAttrType.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/JadxAttrType.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/PinnedAttribute.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/PinnedAttribute.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/PinnedAttribute.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/PinnedAttribute.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationDefaultAttr.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationDefaultAttr.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationDefaultAttr.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationDefaultAttr.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationDefaultClassAttr.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationDefaultClassAttr.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationDefaultClassAttr.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationDefaultClassAttr.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationMethodParamsAttr.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationMethodParamsAttr.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationMethodParamsAttr.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationMethodParamsAttr.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationsAttr.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationsAttr.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationsAttr.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/types/AnnotationsAttr.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/types/ExceptionsAttr.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/types/ExceptionsAttr.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/types/ExceptionsAttr.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/types/ExceptionsAttr.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/types/InnerClassesAttr.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/types/InnerClassesAttr.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/types/InnerClassesAttr.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/types/InnerClassesAttr.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/types/InnerClsInfo.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/types/InnerClsInfo.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/types/InnerClsInfo.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/types/InnerClsInfo.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/types/MethodParametersAttr.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/types/MethodParametersAttr.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/types/MethodParametersAttr.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/types/MethodParametersAttr.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/types/SignatureAttr.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/types/SignatureAttr.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/types/SignatureAttr.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/types/SignatureAttr.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/types/SourceFileAttr.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/types/SourceFileAttr.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/attributes/types/SourceFileAttr.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/attributes/types/SourceFileAttr.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/impl/CallSite.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/impl/CallSite.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/impl/CallSite.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/impl/CallSite.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/impl/CatchData.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/impl/CatchData.java similarity index 78% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/impl/CatchData.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/impl/CatchData.java index a88852c3a..dc78d7073 100644 --- a/jadx-core/src/main/java/jadx/api/plugins/input/data/impl/CatchData.java +++ b/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(); } diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/impl/DebugInfo.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/impl/DebugInfo.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/impl/DebugInfo.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/impl/DebugInfo.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/impl/EmptyCodeLoader.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/impl/EmptyCodeLoader.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/impl/EmptyCodeLoader.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/impl/EmptyCodeLoader.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/impl/FieldRefHandle.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/impl/FieldRefHandle.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/impl/FieldRefHandle.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/impl/FieldRefHandle.java diff --git a/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/impl/InputUtils.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/impl/InputUtils.java new file mode 100644 index 000000000..b26c1a1ff --- /dev/null +++ b/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); + } +} diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/impl/JadxFieldRef.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/impl/JadxFieldRef.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/impl/JadxFieldRef.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/impl/JadxFieldRef.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/impl/ListConsumer.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/impl/ListConsumer.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/impl/ListConsumer.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/impl/ListConsumer.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/impl/MethodRefHandle.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/impl/MethodRefHandle.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/impl/MethodRefHandle.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/impl/MethodRefHandle.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/data/impl/TryData.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/impl/TryData.java similarity index 79% rename from jadx-core/src/main/java/jadx/api/plugins/input/data/impl/TryData.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/data/impl/TryData.java index 62f205b28..3b2f069d1 100644 --- a/jadx-core/src/main/java/jadx/api/plugins/input/data/impl/TryData.java +++ b/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 + '}'; } } diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/insns/InsnData.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/insns/InsnData.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/insns/InsnData.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/insns/InsnData.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/insns/InsnIndexType.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/insns/InsnIndexType.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/insns/InsnIndexType.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/insns/InsnIndexType.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/insns/Opcode.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/insns/Opcode.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/insns/Opcode.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/insns/Opcode.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/insns/custom/IArrayPayload.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/insns/custom/IArrayPayload.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/insns/custom/IArrayPayload.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/insns/custom/IArrayPayload.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/insns/custom/ICustomPayload.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/insns/custom/ICustomPayload.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/insns/custom/ICustomPayload.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/insns/custom/ICustomPayload.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/insns/custom/ISwitchPayload.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/insns/custom/ISwitchPayload.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/insns/custom/ISwitchPayload.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/insns/custom/ISwitchPayload.java diff --git a/jadx-core/src/main/java/jadx/api/plugins/input/insns/custom/impl/SwitchPayload.java b/jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/insns/custom/impl/SwitchPayload.java similarity index 100% rename from jadx-core/src/main/java/jadx/api/plugins/input/insns/custom/impl/SwitchPayload.java rename to jadx-plugins/jadx-input-api/src/main/java/jadx/api/plugins/input/insns/custom/impl/SwitchPayload.java diff --git a/settings.gradle.kts b/settings.gradle.kts index 1ebc01d0b..7e3dab0b0 100644 --- a/settings.gradle.kts +++ b/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")