project: Cleanup deps and update to RxJava 3

themrrobert · Mar 11, 2020 · db77aac · db77aac
1 parent ce40fa9
commit db77aac
Show file tree

Hide file tree

Showing 103 changed files with 19 additions and 126 deletions.
diff --git a/achievementdiary/achievementdiary.gradle.kts b/achievementdiary/achievementdiary.gradle.kts
@@ -38,7 +38,6 @@ dependencies {
     compileOnly("com.openosrs:runelite-client:$rlVersion")
 
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 }

diff --git a/agility/agility.gradle.kts b/agility/agility.gradle.kts
@@ -25,7 +25,7 @@ import ProjectVersions.rlVersion
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-version = "0.0.4"
+version = "0.0.5"
 
 project.extra["PluginName"] = "Agility"
 project.extra["PluginDescription"] = "Show helpful information about agility courses and obstacles"
@@ -38,10 +38,9 @@ dependencies {
     compileOnly("com.openosrs:runelite-client:$rlVersion")
 
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
-    compileOnly(Libraries.rxjava)
     compileOnly(Libraries.pf4j)
+    compileOnly(Libraries.rxjava)
 }
 
 tasks {

diff --git a/ammo/ammo.gradle.kts b/ammo/ammo.gradle.kts
@@ -38,7 +38,6 @@ dependencies {
     compileOnly("com.openosrs:runelite-client:$rlVersion")
 
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 }

diff --git a/animsmoothing/animsmoothing.gradle.kts b/animsmoothing/animsmoothing.gradle.kts
@@ -38,7 +38,6 @@ dependencies {
     compileOnly("com.openosrs:runelite-client:$rlVersion")
 
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 }

diff --git a/antidrag/antidrag.gradle.kts b/antidrag/antidrag.gradle.kts
@@ -40,7 +40,6 @@ dependencies {
     compileOnly(project(":customcursor"))
 
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 }

diff --git a/attackstyles/attackstyles.gradle.kts b/attackstyles/attackstyles.gradle.kts
@@ -38,7 +38,6 @@ dependencies {
     compileOnly("com.openosrs:runelite-client:$rlVersion")
 
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 

diff --git a/bank/bank.gradle.kts b/bank/bank.gradle.kts
@@ -41,7 +41,6 @@ dependencies {
     compileOnly(project(":cluescroll"))
 
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 

diff --git a/banktags/banktags.gradle.kts b/banktags/banktags.gradle.kts
@@ -41,7 +41,6 @@ dependencies {
 
     compileOnly(Libraries.apacheCommonsText)
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 

diff --git a/banlist/banlist.gradle.kts b/banlist/banlist.gradle.kts
@@ -40,7 +40,6 @@ dependencies {
 
     compileOnly(Libraries.annotations)
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.okhttp3)
     compileOnly(Libraries.pf4j)

diff --git a/barbarianassault/barbarianassault.gradle.kts b/barbarianassault/barbarianassault.gradle.kts
@@ -41,7 +41,6 @@ dependencies {
 
     compileOnly(Libraries.apacheCommonsText)
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 }

diff --git a/barrows/barrows.gradle.kts b/barrows/barrows.gradle.kts
@@ -39,7 +39,6 @@ dependencies {
 
     compileOnly(Libraries.apacheCommonsText)
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 }

diff --git a/blastfurnance/blastfurnance.gradle.kts b/blastfurnance/blastfurnance.gradle.kts
@@ -39,7 +39,6 @@ dependencies {
 
     compileOnly(Libraries.apacheCommonsText)
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 }

diff --git a/blastmine/blastmine.gradle.kts b/blastmine/blastmine.gradle.kts
@@ -38,7 +38,6 @@ dependencies {
     compileOnly("com.openosrs:runelite-client:$rlVersion")
 
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 }

diff --git a/boosts/boosts.gradle.kts b/boosts/boosts.gradle.kts
@@ -38,7 +38,6 @@ dependencies {
     compileOnly("com.openosrs:runelite-client:$rlVersion")
 
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 }

diff --git a/bosstimer/bosstimer.gradle.kts b/bosstimer/bosstimer.gradle.kts
@@ -38,7 +38,6 @@ dependencies {
     compileOnly("com.openosrs:runelite-client:$rlVersion")
 
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 }

diff --git a/bosstimetracker/bosstimetracker.gradle.kts b/bosstimetracker/bosstimetracker.gradle.kts
@@ -38,7 +38,6 @@ dependencies {
     compileOnly("com.openosrs:runelite-client:$rlVersion")
 
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 }

diff --git a/bronzeman/bronzeman.gradle.kts b/bronzeman/bronzeman.gradle.kts
@@ -38,7 +38,6 @@ dependencies {
     compileOnly("com.openosrs:runelite-client:$rlVersion")
 
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 }

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -48,7 +48,7 @@ object Libraries {
         const val okhttp3 = "4.4.0"
         const val pf4j = "3.2.0"
         const val radiance = "2.5.1"
-        const val rxjava = "2.2.18"
+        const val rxjava = "3.0.0"
         const val slf4j = "1.7.30"
     }
 
@@ -60,7 +60,6 @@ object Libraries {
     const val guice = "com.google.inject:guice:${Versions.guice}:no_aop"
     const val guiceTestlib = "com.google.inject.extensions:guice-testlib:${Versions.guice}"
     const val hamcrest = "org.hamcrest:hamcrest-library:${Versions.hamcrest}"
-    const val javax = "javax.annotation:javax.annotation-api:${Versions.javax}"
     const val jogampJogl = "org.jogamp.jogl:jogl-all:${Versions.jogamp}"
     const val jogampGluegen = "org.jogamp.gluegen:gluegen-rt:${Versions.jogamp}"
     const val jopt = "net.sf.jopt-simple:jopt-simple:${Versions.jopt}"
@@ -72,7 +71,7 @@ object Libraries {
     const val mockitoInline = "org.mockito:mockito-inline:${Versions.mockito}"
     const val okhttp3 = "com.squareup.okhttp3:okhttp:${Versions.okhttp3}"
     const val pf4j = "org.pf4j:pf4j:${Versions.pf4j}"
-    const val rxjava = "io.reactivex.rxjava2:rxjava:${Versions.rxjava}"
+    const val rxjava = "io.reactivex.rxjava3:rxjava:${Versions.rxjava}"
     const val slf4jApi = "org.slf4j:slf4j-api:${Versions.slf4j}"
     const val substance = "org.pushing-pixels:radiance-substance:${Versions.radiance}"
 

diff --git a/cannon/cannon.gradle.kts b/cannon/cannon.gradle.kts
@@ -38,7 +38,6 @@ dependencies {
     compileOnly("com.openosrs:runelite-client:$rlVersion")
 
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 }

diff --git a/chatcommands/chatcommands.gradle.kts b/chatcommands/chatcommands.gradle.kts
@@ -25,7 +25,7 @@ import ProjectVersions.rlVersion
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-version = "0.0.5"
+version = "0.0.6"
 
 project.extra["PluginName"] = "Chat Commands"
 project.extra["PluginDescription"] = "Enable chat commands"
@@ -40,7 +40,6 @@ dependencies {
 
     compileOnly(Libraries.apacheCommonsText)
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.okhttp3)
     compileOnly(Libraries.pf4j)

diff --git a/chatcommands/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java b/chatcommands/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
@@ -27,7 +27,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.inject.Provides;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 import java.io.IOException;
 import java.util.EnumSet;
 import java.util.List;

diff --git a/chatfilter/chatfilter.gradle.kts b/chatfilter/chatfilter.gradle.kts
@@ -39,11 +39,9 @@ dependencies {
 
     compileOnly(Libraries.apacheCommonsText)
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.okhttp3)
     compileOnly(Libraries.pf4j)
-    compileOnly(Libraries.rxjava)
 
     testImplementation("com.openosrs:runelite-api:$rlVersion")
     testImplementation("com.openosrs:runelite-client:$rlVersion")

diff --git a/chathistory/chathistory.gradle.kts b/chathistory/chathistory.gradle.kts
@@ -39,7 +39,6 @@ dependencies {
 
     compileOnly(Libraries.apacheCommonsText)
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 }

diff --git a/chatnotifications/chatnotifications.gradle.kts b/chatnotifications/chatnotifications.gradle.kts
@@ -39,11 +39,9 @@ dependencies {
 
     compileOnly(Libraries.apacheCommonsText)
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.okhttp3)
     compileOnly(Libraries.pf4j)
-    compileOnly(Libraries.rxjava)
 
     testImplementation("com.openosrs:runelite-api:$rlVersion")
     testImplementation("com.openosrs:runelite-client:$rlVersion")

diff --git a/chattranslation/chattranslation.gradle.kts b/chattranslation/chattranslation.gradle.kts
@@ -25,7 +25,7 @@ import ProjectVersions.rlVersion
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-version = "0.0.2"
+version = "0.0.3"
 
 project.extra["PluginName"] = "Chat Translator"
 project.extra["PluginDescription"] = "Translates messages from one Language to another"
@@ -39,7 +39,6 @@ dependencies {
 
     compileOnly(Libraries.guice)
     compileOnly(Libraries.gson)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
     compileOnly(Libraries.rxjava)

diff --git a/clanchat/clanchat.gradle.kts b/clanchat/clanchat.gradle.kts
@@ -38,7 +38,6 @@ dependencies {
     compileOnly("com.openosrs:runelite-client:$rlVersion")
 
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 }

diff --git a/cluescroll/cluescroll.gradle.kts b/cluescroll/cluescroll.gradle.kts
@@ -38,7 +38,6 @@ dependencies {
     compileOnly("com.openosrs:runelite-client:$rlVersion")
 
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.jopt)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)

diff --git a/cooking/cooking.gradle.kts b/cooking/cooking.gradle.kts
@@ -40,7 +40,6 @@ dependencies {
     compileOnly(project(":xptracker"))
 
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 

diff --git a/customcursor/customcursor.gradle.kts b/customcursor/customcursor.gradle.kts
@@ -38,7 +38,6 @@ dependencies {
     compileOnly("com.openosrs:runelite-client:$rlVersion")
 
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 }

diff --git a/deathindicator/deathindicator.gradle.kts b/deathindicator/deathindicator.gradle.kts
@@ -25,7 +25,7 @@ import ProjectVersions.rlVersion
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-version = "0.0.2"
+version = "0.0.3"
 
 project.extra["PluginName"] = "Death Indicator"
 project.extra["PluginDescription"] = "Show where you last died, and on what world"

diff --git a/devtools/devtools.gradle.kts b/devtools/devtools.gradle.kts
@@ -25,7 +25,7 @@ import ProjectVersions.rlVersion
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-version = "0.0.7"
+version = "0.0.8"
 
 project.extra["PluginName"] = "Developer Tools"
 project.extra["PluginDescription"] = "Enables the developer tools"

diff --git a/examine/examine.gradle.kts b/examine/examine.gradle.kts
@@ -41,7 +41,6 @@ dependencies {
     compileOnly(Libraries.guice)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
-    compileOnly(Libraries.rxjava)
 
     testImplementation("com.openosrs:runelite-api:$rlVersion")
     testImplementation("com.openosrs:runelite-client:$rlVersion")

diff --git a/fishing/fishing.gradle.kts b/fishing/fishing.gradle.kts
@@ -40,7 +40,6 @@ dependencies {
     compileOnly(project(":xptracker"))
 
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 }

diff --git a/friendtagging/friendtagging.gradle.kts b/friendtagging/friendtagging.gradle.kts
@@ -39,7 +39,6 @@ dependencies {
 
     compileOnly(Libraries.apacheCommonsText)
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 }

diff --git a/gpu/gpu.gradle.kts b/gpu/gpu.gradle.kts
@@ -38,7 +38,6 @@ dependencies {
     compileOnly("com.openosrs:runelite-client:$rlVersion")
 
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
     compileOnly(Libraries.jogampJogl)

diff --git a/grandexchange/grandexchange.gradle.kts b/grandexchange/grandexchange.gradle.kts
@@ -25,7 +25,7 @@ import ProjectVersions.rlVersion
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-version = "0.0.5"
+version = "0.0.6"
 
 project.extra["PluginName"] = "Grand Exchange"
 project.extra["PluginDescription"] = "Provide additional and/or easier access to Grand Exchange information"

diff --git a/...exchange/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java b/...exchange/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java
@@ -29,7 +29,7 @@
 
 import com.google.common.reflect.TypeToken;
 import com.google.inject.Provides;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 import java.awt.image.BufferedImage;
 import java.util.Map;
 import java.util.concurrent.ScheduledExecutorService;

diff --git a/inventoryviewer/inventoryviewer.gradle.kts b/inventoryviewer/inventoryviewer.gradle.kts
@@ -38,7 +38,6 @@ dependencies {
     compileOnly("com.openosrs:runelite-client:$rlVersion")
 
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 }

diff --git a/keyremapping/keyremapping.gradle.kts b/keyremapping/keyremapping.gradle.kts
@@ -38,7 +38,6 @@ dependencies {
     compileOnly("com.openosrs:runelite-client:$rlVersion")
 
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 }

diff --git a/kingdomofmiscellania/kingdomofmiscellania.gradle.kts b/kingdomofmiscellania/kingdomofmiscellania.gradle.kts
@@ -38,7 +38,6 @@ dependencies {
     compileOnly("com.openosrs:runelite-client:$rlVersion")
 
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 }

diff --git a/kourendlibrary/kourendlibrary.gradle.kts b/kourendlibrary/kourendlibrary.gradle.kts
@@ -38,7 +38,6 @@ dependencies {
     compileOnly("com.openosrs:runelite-client:$rlVersion")
 
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 }

diff --git a/learntoclick/learntoclick.gradle.kts b/learntoclick/learntoclick.gradle.kts
@@ -39,7 +39,6 @@ dependencies {
 
     compileOnly(Libraries.apacheCommonsText)
     compileOnly(Libraries.guice)
-    compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.pf4j)
 }