jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

chore: migrate from old unsupported rxjava2 to rxjava3 (PR #2511)

Browse Source
This commit is contained in:
Yaroslav
2025-05-24 23:56:23 +03:00
committed by GitHub
parent 646ee2d963
commit 3d8e5e5851
11 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-gui/build.gradle.kts
+2 -2
View File
@@ -44,8 +44,8 @@ dependencies {
implementation("org.apache.commons:commons-text:1.13.1")
implementation("commons-io:commons-io:2.19.0")
implementation("io.reactivex.rxjava2:rxjava:2.2.21")
implementation("com.github.akarnokd:rxjava2-swing:0.3.7")
implementation("io.reactivex.rxjava3:rxjava:3.1.10")
implementation("com.github.akarnokd:rxjava3-swing:3.1.1")
implementation("com.android.tools.build:apksig:8.10.0")
implementation("io.github.skylot:jdwp:2.0.0")
jadx-gui/src/main/java/jadx/gui/cache/code/CodeStringCache.java
Vendored
+2 -2
View File
@@ -11,8 +11,8 @@ import org.reactivestreams.Subscriber;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.reactivex.disposables.Disposable;
import io.reactivex.processors.PublishProcessor;
import io.reactivex.rxjava3.disposables.Disposable;
import io.reactivex.rxjava3.processors.PublishProcessor;
import jadx.api.ICodeCache;
import jadx.api.ICodeInfo;
jadx-gui/src/main/java/jadx/gui/device/protocol/ADBDevice.java
+1 -1
View File
@@ -16,7 +16,7 @@ import java.util.regex.Pattern;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.reactivex.annotations.NonNull;
import io.reactivex.rxjava3.annotations.NonNull;
import jadx.core.utils.StringUtils;
import jadx.core.utils.log.LogUtils;
jadx-gui/src/main/java/jadx/gui/ui/HeapUsageBar.java
+4 -4
View File
@@ -12,10 +12,10 @@ import javax.swing.JProgressBar;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import hu.akarnokd.rxjava2.swing.SwingSchedulers;
import io.reactivex.Flowable;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
import hu.akarnokd.rxjava3.swing.SwingSchedulers;
import io.reactivex.rxjava3.core.Flowable;
import io.reactivex.rxjava3.disposables.Disposable;
import io.reactivex.rxjava3.schedulers.Schedulers;
import jadx.gui.utils.NLS;
import jadx.gui.utils.UiUtils;
jadx-gui/src/main/java/jadx/gui/ui/action/ActionModel.java
+1 -1
View File
@@ -8,7 +8,7 @@ import java.util.stream.Collectors;
import javax.swing.ImageIcon;
import io.reactivex.annotations.NonNull;
import io.reactivex.rxjava3.annotations.NonNull;
import jadx.gui.utils.NLS;
import jadx.gui.utils.UiUtils;
jadx-gui/src/main/java/jadx/gui/ui/dialog/SearchDialog.java
+5 -5
View File
@@ -38,11 +38,11 @@ import org.slf4j.LoggerFactory;
import com.formdev.flatlaf.FlatClientProperties;
import com.formdev.flatlaf.icons.FlatSearchWithHistoryIcon;
import io.reactivex.BackpressureStrategy;
import io.reactivex.Emitter;
import io.reactivex.Flowable;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
import io.reactivex.rxjava3.core.BackpressureStrategy;
import io.reactivex.rxjava3.core.Emitter;
import io.reactivex.rxjava3.core.Flowable;
import io.reactivex.rxjava3.disposables.Disposable;
import io.reactivex.rxjava3.schedulers.Schedulers;
import jadx.api.JavaClass;
import jadx.api.JavaPackage;
jadx-gui/src/main/java/jadx/gui/ui/panel/JDebuggerPanel.java
+1 -1
View File
@@ -43,7 +43,7 @@ import javax.swing.tree.TreePath;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.reactivex.annotations.Nullable;
import io.reactivex.rxjava3.annotations.Nullable;
import jadx.core.utils.StringUtils;
import jadx.gui.device.debugger.DebugController;
jadx-gui/src/main/java/jadx/gui/utils/fileswatcher/LiveReloadWorker.java
+1 -1
View File
@@ -9,7 +9,7 @@ import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.reactivex.processors.PublishProcessor;
import io.reactivex.rxjava3.processors.PublishProcessor;
import jadx.gui.ui.MainWindow;
import jadx.gui.utils.UiUtils;
jadx-gui/src/main/java/jadx/gui/utils/rx/CustomDisposable.java
+1 -1
View File
@@ -2,7 +2,7 @@ package jadx.gui.utils.rx;
import java.util.concurrent.atomic.AtomicBoolean;
import io.reactivex.disposables.Disposable;
import io.reactivex.rxjava3.disposables.Disposable;
public class CustomDisposable implements Disposable {
jadx-gui/src/main/java/jadx/gui/utils/rx/DebounceUpdate.java
+5 -5
View File
@@ -2,11 +2,11 @@ package jadx.gui.utils.rx;
import java.util.concurrent.TimeUnit;
import io.reactivex.BackpressureStrategy;
import io.reactivex.Flowable;
import io.reactivex.FlowableEmitter;
import io.reactivex.FlowableOnSubscribe;
import io.reactivex.disposables.Disposable;
import io.reactivex.rxjava3.core.BackpressureStrategy;
import io.reactivex.rxjava3.core.Flowable;
import io.reactivex.rxjava3.core.FlowableEmitter;
import io.reactivex.rxjava3.core.FlowableOnSubscribe;
import io.reactivex.rxjava3.disposables.Disposable;
public class DebounceUpdate {
jadx-gui/src/main/java/jadx/gui/utils/rx/RxUtils.java
+3 -3
View File
@@ -7,9 +7,9 @@ import java.awt.event.KeyListener;
import javax.swing.JTextField;
import javax.swing.event.DocumentListener;
import io.reactivex.BackpressureStrategy;
import io.reactivex.Flowable;
import io.reactivex.FlowableOnSubscribe;
import io.reactivex.rxjava3.core.BackpressureStrategy;
import io.reactivex.rxjava3.core.Flowable;
import io.reactivex.rxjava3.core.FlowableOnSubscribe;
import jadx.gui.utils.ui.DocumentUpdateListener;