From 3d8e5e58519181e0d9b3807b283d60577534ab6f Mon Sep 17 00:00:00 2001 From: Yaroslav <43380144+MrIkso@users.noreply.github.com> Date: Sat, 24 May 2025 23:56:23 +0300 Subject: [PATCH] chore: migrate from old unsupported rxjava2 to rxjava3 (PR #2511) --- jadx-gui/build.gradle.kts | 4 ++-- .../main/java/jadx/gui/cache/code/CodeStringCache.java | 4 ++-- .../main/java/jadx/gui/device/protocol/ADBDevice.java | 2 +- jadx-gui/src/main/java/jadx/gui/ui/HeapUsageBar.java | 8 ++++---- .../src/main/java/jadx/gui/ui/action/ActionModel.java | 2 +- .../src/main/java/jadx/gui/ui/dialog/SearchDialog.java | 10 +++++----- .../main/java/jadx/gui/ui/panel/JDebuggerPanel.java | 2 +- .../jadx/gui/utils/fileswatcher/LiveReloadWorker.java | 2 +- .../main/java/jadx/gui/utils/rx/CustomDisposable.java | 2 +- .../main/java/jadx/gui/utils/rx/DebounceUpdate.java | 10 +++++----- jadx-gui/src/main/java/jadx/gui/utils/rx/RxUtils.java | 6 +++--- 11 files changed, 26 insertions(+), 26 deletions(-) diff --git a/jadx-gui/build.gradle.kts b/jadx-gui/build.gradle.kts index 09fbd2a84..bcd7fa168 100644 --- a/jadx-gui/build.gradle.kts +++ b/jadx-gui/build.gradle.kts @@ -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") diff --git a/jadx-gui/src/main/java/jadx/gui/cache/code/CodeStringCache.java b/jadx-gui/src/main/java/jadx/gui/cache/code/CodeStringCache.java index dc43b835a..d85750c6f 100644 --- a/jadx-gui/src/main/java/jadx/gui/cache/code/CodeStringCache.java +++ b/jadx-gui/src/main/java/jadx/gui/cache/code/CodeStringCache.java @@ -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; diff --git a/jadx-gui/src/main/java/jadx/gui/device/protocol/ADBDevice.java b/jadx-gui/src/main/java/jadx/gui/device/protocol/ADBDevice.java index 52472602c..2a052679f 100644 --- a/jadx-gui/src/main/java/jadx/gui/device/protocol/ADBDevice.java +++ b/jadx-gui/src/main/java/jadx/gui/device/protocol/ADBDevice.java @@ -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; diff --git a/jadx-gui/src/main/java/jadx/gui/ui/HeapUsageBar.java b/jadx-gui/src/main/java/jadx/gui/ui/HeapUsageBar.java index 03ed093d9..6cef6e49a 100644 --- a/jadx-gui/src/main/java/jadx/gui/ui/HeapUsageBar.java +++ b/jadx-gui/src/main/java/jadx/gui/ui/HeapUsageBar.java @@ -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; diff --git a/jadx-gui/src/main/java/jadx/gui/ui/action/ActionModel.java b/jadx-gui/src/main/java/jadx/gui/ui/action/ActionModel.java index 8429b2466..2433694e1 100644 --- a/jadx-gui/src/main/java/jadx/gui/ui/action/ActionModel.java +++ b/jadx-gui/src/main/java/jadx/gui/ui/action/ActionModel.java @@ -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; diff --git a/jadx-gui/src/main/java/jadx/gui/ui/dialog/SearchDialog.java b/jadx-gui/src/main/java/jadx/gui/ui/dialog/SearchDialog.java index f281a13fc..2631f4a47 100644 --- a/jadx-gui/src/main/java/jadx/gui/ui/dialog/SearchDialog.java +++ b/jadx-gui/src/main/java/jadx/gui/ui/dialog/SearchDialog.java @@ -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; diff --git a/jadx-gui/src/main/java/jadx/gui/ui/panel/JDebuggerPanel.java b/jadx-gui/src/main/java/jadx/gui/ui/panel/JDebuggerPanel.java index 540f66fae..bd2a028c8 100644 --- a/jadx-gui/src/main/java/jadx/gui/ui/panel/JDebuggerPanel.java +++ b/jadx-gui/src/main/java/jadx/gui/ui/panel/JDebuggerPanel.java @@ -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; diff --git a/jadx-gui/src/main/java/jadx/gui/utils/fileswatcher/LiveReloadWorker.java b/jadx-gui/src/main/java/jadx/gui/utils/fileswatcher/LiveReloadWorker.java index 10c321e21..b06ab891b 100644 --- a/jadx-gui/src/main/java/jadx/gui/utils/fileswatcher/LiveReloadWorker.java +++ b/jadx-gui/src/main/java/jadx/gui/utils/fileswatcher/LiveReloadWorker.java @@ -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; diff --git a/jadx-gui/src/main/java/jadx/gui/utils/rx/CustomDisposable.java b/jadx-gui/src/main/java/jadx/gui/utils/rx/CustomDisposable.java index f63de60b9..9b2c5054b 100644 --- a/jadx-gui/src/main/java/jadx/gui/utils/rx/CustomDisposable.java +++ b/jadx-gui/src/main/java/jadx/gui/utils/rx/CustomDisposable.java @@ -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 { diff --git a/jadx-gui/src/main/java/jadx/gui/utils/rx/DebounceUpdate.java b/jadx-gui/src/main/java/jadx/gui/utils/rx/DebounceUpdate.java index 7cabe4187..2ef5716b9 100644 --- a/jadx-gui/src/main/java/jadx/gui/utils/rx/DebounceUpdate.java +++ b/jadx-gui/src/main/java/jadx/gui/utils/rx/DebounceUpdate.java @@ -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 { diff --git a/jadx-gui/src/main/java/jadx/gui/utils/rx/RxUtils.java b/jadx-gui/src/main/java/jadx/gui/utils/rx/RxUtils.java index c437f8cab..64709c611 100644 --- a/jadx-gui/src/main/java/jadx/gui/utils/rx/RxUtils.java +++ b/jadx-gui/src/main/java/jadx/gui/utils/rx/RxUtils.java @@ -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;