ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

project: Update to RxJava 3

Browse Source
This commit is contained in:
Owain van Brakel
2020-03-11 11:20:21 +01:00
parent 07a025ca16
commit cb0995f037
19 changed files with 48 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle.kts
View File

@@ -90,6 +90,7 @@ subprojects {
} }
filter { filter {
includeModule("net.runelite", "fernflower") includeModule("net.runelite", "fernflower")
includeModule("com.openosrs.rxrelay3", "rxrelay")
} }
} }
} }

8
buildSrc/src/main/kotlin/Dependencies.kt
View File

@@ -82,8 +82,8 @@ object Libraries {
const val pf4j = "3.2.0" const val pf4j = "3.2.0"
const val pf4jUpdate = "2.3.0" const val pf4jUpdate = "2.3.0"
const val radiance = "2.5.1" const val radiance = "2.5.1"
const val rxjava = "2.2.18" const val rxjava = "3.0.0"
const val rxrelay = "2.1.1" const val rxrelay = "3.0.0-SNAPSHOT"
const val sisu = "0.3.4" const val sisu = "0.3.4"
const val sentry = "1.7.30" const val sentry = "1.7.30"
const val semver = "0.9.0" const val semver = "0.9.0"
@@ -141,8 +141,8 @@ object Libraries {
const val petitparser = "com.github.petitparser:java-petitparser:${Versions.petitparser}" const val petitparser = "com.github.petitparser:java-petitparser:${Versions.petitparser}"
const val pf4j = "org.pf4j:pf4j:${Versions.pf4j}" const val pf4j = "org.pf4j:pf4j:${Versions.pf4j}"
const val pf4jUpdate = "org.pf4j:pf4j-update:${Versions.pf4jUpdate}" const val pf4jUpdate = "org.pf4j:pf4j-update:${Versions.pf4jUpdate}"
const val rxjava = "io.reactivex.rxjava2:rxjava:${Versions.rxjava}" const val rxjava = "io.reactivex.rxjava3:rxjava:${Versions.rxjava}"
const val rxrelay = "com.jakewharton.rxrelay2:rxrelay:${Versions.rxrelay}" const val rxrelay = "com.openosrs.rxrelay3:rxrelay:${Versions.rxrelay}"
const val sisu = "org.eclipse.sisu:org.eclipse.sisu.inject:${Versions.sisu}" const val sisu = "org.eclipse.sisu:org.eclipse.sisu.inject:${Versions.sisu}"
const val slf4jApi = "org.slf4j:slf4j-api:${Versions.slf4j}" const val slf4jApi = "org.slf4j:slf4j-api:${Versions.slf4j}"
const val slf4jNop = "org.slf4j:slf4j-nop:${Versions.slf4j}" const val slf4jNop = "org.slf4j:slf4j-nop:${Versions.slf4j}"

2
http-api/src/main/java/net/runelite/http/api/account/AccountClient.java
View File

@@ -25,7 +25,7 @@
package net.runelite.http.api.account; package net.runelite.http.api.account;
import com.google.gson.JsonParseException; import com.google.gson.JsonParseException;
import io.reactivex.Observable; import io.reactivex.rxjava3.core.Observable;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;

2
http-api/src/main/java/net/runelite/http/api/item/ItemClient.java
View File

@@ -27,7 +27,7 @@ package net.runelite.http.api.item;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.gson.JsonParseException; import com.google.gson.JsonParseException;
import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonReader;
import io.reactivex.Observable; import io.reactivex.rxjava3.core.Observable;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;

2
http-api/src/main/java/net/runelite/http/api/osbuddy/OSBGrandExchangeClient.java
View File

@@ -25,7 +25,7 @@
package net.runelite.http.api.osbuddy; package net.runelite.http.api.osbuddy;
import com.google.gson.JsonParseException; import com.google.gson.JsonParseException;
import io.reactivex.Observable; import io.reactivex.rxjava3.core.Observable;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;

2
runelite-client/src/main/java/net/runelite/client/ClientSessionManager.java
View File

@@ -24,7 +24,7 @@
*/ */
package net.runelite.client; package net.runelite.client;
import io.reactivex.schedulers.Schedulers; import io.reactivex.rxjava3.schedulers.Schedulers;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
import java.util.UUID; import java.util.UUID;
import javax.inject.Inject; import javax.inject.Inject;

4
runelite-client/src/main/java/net/runelite/client/RuneLite.java
View File

@@ -30,8 +30,8 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.inject.Guice; import com.google.inject.Guice;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Injector; import com.google.inject.Injector;
import io.reactivex.Completable; import io.reactivex.rxjava3.core.Completable;
import io.reactivex.schedulers.Schedulers; import io.reactivex.rxjava3.schedulers.Schedulers;
import io.sentry.Sentry; import io.sentry.Sentry;
import io.sentry.SentryClient; import io.sentry.SentryClient;
import java.io.File; import java.io.File;

4
runelite-client/src/main/java/net/runelite/client/SessionClient.java
View File

@@ -24,8 +24,8 @@
*/ */
package net.runelite.client; package net.runelite.client;
import io.reactivex.Completable; import io.reactivex.rxjava3.core.Completable;
import io.reactivex.Observable; import io.reactivex.rxjava3.core.Observable;
import java.io.IOException; import java.io.IOException;
import java.util.UUID; import java.util.UUID;
import net.runelite.http.api.RuneLiteAPI; import net.runelite.http.api.RuneLiteAPI;

2
runelite-client/src/main/java/net/runelite/client/account/SessionManager.java
View File

@@ -25,7 +25,7 @@
package net.runelite.client.account; package net.runelite.client.account;
import com.google.gson.Gson; import com.google.gson.Gson;
import io.reactivex.schedulers.Schedulers; import io.reactivex.rxjava3.schedulers.Schedulers;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileWriter; import java.io.FileWriter;

4
runelite-client/src/main/java/net/runelite/client/callback/ClientThread.java
View File

@@ -25,8 +25,8 @@
package net.runelite.client.callback; package net.runelite.client.callback;
import com.google.inject.Inject; import com.google.inject.Inject;
import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.rxjava3.plugins.RxJavaPlugins;
import io.reactivex.schedulers.Schedulers; import io.reactivex.rxjava3.schedulers.Schedulers;
import java.util.Iterator; import java.util.Iterator;
import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;

2
runelite-client/src/main/java/net/runelite/client/eventbus/AccessorGenerator.java
View File

@@ -1,7 +1,7 @@
package net.runelite.client.eventbus; package net.runelite.client.eventbus;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import io.reactivex.functions.Consumer; import io.reactivex.rxjava3.functions.Consumer;
import java.lang.invoke.CallSite; import java.lang.invoke.CallSite;
import java.lang.invoke.LambdaMetafactory; import java.lang.invoke.LambdaMetafactory;
import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandle;

18
runelite-client/src/main/java/net/runelite/client/eventbus/EventBus.java
View File

@@ -1,18 +1,18 @@
package net.runelite.client.eventbus; package net.runelite.client.eventbus;
import com.jakewharton.rxrelay2.PublishRelay; import com.jakewharton.rxrelay3.PublishRelay;
import com.jakewharton.rxrelay2.Relay; import com.jakewharton.rxrelay3.Relay;
import io.reactivex.ObservableTransformer; import io.reactivex.rxjava3.annotations.NonNull;
import io.reactivex.Scheduler; import io.reactivex.rxjava3.core.ObservableTransformer;
import io.reactivex.annotations.NonNull; import io.reactivex.rxjava3.core.Scheduler;
import io.reactivex.annotations.Nullable; import io.reactivex.rxjava3.disposables.CompositeDisposable;
import io.reactivex.disposables.CompositeDisposable; import io.reactivex.rxjava3.disposables.Disposable;
import io.reactivex.disposables.Disposable; import io.reactivex.rxjava3.functions.Consumer;
import io.reactivex.functions.Consumer;
import io.sentry.Sentry; import io.sentry.Sentry;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

4
runelite-client/src/main/java/net/runelite/client/eventbus/EventBusInterface.java
View File

@@ -1,7 +1,7 @@
package net.runelite.client.eventbus; package net.runelite.client.eventbus;
import io.reactivex.annotations.NonNull; import io.reactivex.rxjava3.annotations.NonNull;
import io.reactivex.functions.Consumer; import io.reactivex.rxjava3.functions.Consumer;
import net.runelite.api.events.Event; import net.runelite.api.events.Event;
public interface EventBusInterface public interface EventBusInterface

16
runelite-client/src/main/java/net/runelite/client/eventbus/EventScheduler.java
View File

@@ -1,9 +1,9 @@
package net.runelite.client.eventbus; package net.runelite.client.eventbus;
import io.reactivex.Scheduler; import io.reactivex.rxjava3.core.Scheduler;
import io.reactivex.annotations.Nullable; import io.reactivex.rxjava3.functions.Supplier;
import io.reactivex.schedulers.Schedulers; import io.reactivex.rxjava3.schedulers.Schedulers;
import java.util.function.Supplier; import javax.annotation.Nullable;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
@AllArgsConstructor @AllArgsConstructor
@@ -21,7 +21,15 @@ public enum EventScheduler
@Nullable @Nullable
public Scheduler get() public Scheduler get()
{
try
{ {
return scheduler.get(); return scheduler.get();
} }
catch (Throwable ignored)
{
}
return null;
}
} }

2
runelite-client/src/main/java/net/runelite/client/eventbus/Subscription.java
View File

@@ -1,6 +1,6 @@
package net.runelite.client.eventbus; package net.runelite.client.eventbus;
import io.reactivex.functions.Consumer; import io.reactivex.rxjava3.functions.Consumer;
import lombok.Value; import lombok.Value;
@Value @Value

4
runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
View File

@@ -28,8 +28,8 @@ import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader; import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache; import com.google.common.cache.LoadingCache;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import io.reactivex.Completable; import io.reactivex.rxjava3.core.Completable;
import io.reactivex.schedulers.Schedulers; import io.reactivex.rxjava3.schedulers.Schedulers;
import java.awt.Color; import java.awt.Color;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.util.ArrayList; import java.util.ArrayList;

4
runelite-client/src/main/java/net/runelite/client/game/NPCManager.java
View File

@@ -27,8 +27,8 @@ package net.runelite.client.game;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonReader;
import io.reactivex.Completable; import io.reactivex.rxjava3.core.Completable;
import io.reactivex.schedulers.Schedulers; import io.reactivex.rxjava3.schedulers.Schedulers;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;

2
runelite-client/src/main/java/net/runelite/client/plugins/Plugin.java
View File

@@ -28,7 +28,7 @@ import com.google.common.collect.ImmutableSet;
import com.google.inject.Binder; import com.google.inject.Binder;
import com.google.inject.Injector; import com.google.inject.Injector;
import com.google.inject.Module; import com.google.inject.Module;
import io.reactivex.functions.Consumer; import io.reactivex.rxjava3.functions.Consumer;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Set; import java.util.Set;
import lombok.AccessLevel; import lombok.AccessLevel;

2
runelite-client/src/main/java/net/runelite/client/util/DeferredEventBus.java
View File

@@ -24,7 +24,7 @@
*/ */
package net.runelite.client.util; package net.runelite.client.util;
import io.reactivex.annotations.NonNull; import io.reactivex.rxjava3.annotations.NonNull;
import java.util.Queue; import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentLinkedQueue;
import javax.inject.Inject; import javax.inject.Inject;