Skip to content

Commit

Permalink
build: use jadx-gui as a library in plugins (PR #2310)
Browse files Browse the repository at this point in the history
* fix(gui): fix javadoc issues

* feat(gui): export jadx-gui as a library

* fix(gui): fix javadoc issues

* fix(gui): remove invalid characters for javadoc

* add jadx-library also for jadx-cli and jadx-script-ide modules

---------

Co-authored-by: Skylot <118523+skylot@users.noreply.github.com>
  • Loading branch information
nitram84 and skylot authored Oct 22, 2024
1 parent a43b328 commit 8a34d97
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 10 deletions.
1 change: 1 addition & 0 deletions jadx-cli/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
id("jadx-java")
id("jadx-library")
id("application")

// use shadow only for application scripts, jar will be copied from jadx-gui
Expand Down
1 change: 1 addition & 0 deletions jadx-gui/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id("jadx-kotlin")
id("application")
id("jadx-library")
id("edu.sc.seis.launch4j") version "3.0.6"
id("com.gradleup.shadow") version "8.3.3"
id("org.beryx.runtime") version "1.13.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ public CacheManager(JadxSettings settings) {
}

/**
* If project cache is set -> check if cache entry exists for this project.
* If not -> calculate new and add entry.
* If project cache is set -&gt; check if cache entry exists for this project.
* If not -&gt; calculate new and add entry.
*/
public Path getCacheDir(JadxProject project, @Nullable String cacheDirStr) {
if (cacheDirStr == null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ public int readArrayLength(RuntimeValue val) throws SmaliDebuggerException {
/**
* @param startIndex less than 0 means 0
* @param len less than or equals 0 means the maximum value 99 or the rest of the elements.
* @return An entry, The key is the total length of this array when len is <= 0, otherwise 0,
* @return An entry, The key is the total length of this array when len is &lt;= 0, otherwise 0,
* the value, if this array is an object array then it's object ids.
*/
public Entry<Integer, List<Long>> readArray(RuntimeValue reg, int startIndex, int len) throws SmaliDebuggerException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public int launchApp(String fullAppName) throws IOException, InterruptedExceptio
}

/**
* @Return binary output of logcat
* @return binary output of logcat
*/
public byte[] getBinaryLogcat() throws IOException {

Expand All @@ -133,7 +133,7 @@ public byte[] getBinaryLogcat() throws IOException {
}

/**
* @Return binary output of logcat after provided timestamp
* @return binary output of logcat after provided timestamp
* Timestamp is in the format 09-08 02:18:03.131
*/
public byte[] getBinaryLogcat(String timestamp) throws IOException {
Expand All @@ -147,7 +147,7 @@ public byte[] getBinaryLogcat(String timestamp) throws IOException {
}

/**
* @Return binary output of logcat -c
* Binary output of logcat -c
*/
public void clearLogcat() throws IOException {
Socket socket = ADB.connect(info.getAdbHost(), info.getAdbPort());
Expand Down
2 changes: 1 addition & 1 deletion jadx-gui/src/main/java/jadx/gui/ui/codearea/CodePanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import jadx.gui.utils.ui.MousePressedHandler;

/**
* A panel combining a {@link SearchBar and a scollable {@link CodeArea}
* A panel combining a {@link SearchBar} and a scollable {@link CodeArea}
*/
public class CodePanel extends JPanel {
private static final long serialVersionUID = 1117721869391885865L;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions jadx-plugins/jadx-script/jadx-script-ide/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
id("jadx-kotlin")
id("jadx-library")
}

dependencies {
Expand Down

0 comments on commit 8a34d97

Please sign in to comment.