From b9e55b5f76e2d2af58f9f5107c4fa196596d28f3 Mon Sep 17 00:00:00 2001
From: Owain van Brakel <owain.vanbrakel@gmail.com>
Date: Tue, 10 Mar 2020 13:56:45 +0100
Subject: [PATCH] project: Update dependencies

---
 buildSrc/src/main/kotlin/Dependencies.kt   | 32 ++++++++++------------
 runelite-client/runelite-client.gradle.kts |  4 +--
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index c4592e3599..6314dd1a11 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -47,12 +47,12 @@ object Plugins {
 
 object Libraries {
     private object Versions {
-        const val annotations = "18.0.0"
-        const val antlr = "4.7.2"
-        const val apacheCommonsCompress = "1.19"
-        const val apacheCommonsCsv = "1.7"
+        const val annotations = "19.0.0"
+        const val antlr = "4.8-1"
+        const val apacheCommonsCompress = "1.20"
+        const val apacheCommonsCsv = "1.8"
         const val apacheCommonsText = "1.8"
-        const val asm = "7.2"
+        const val asm = "7.3.1"
         const val commonsCli = "1.4"
         const val discord = "1.1"
         const val fernflower = "07082019"
@@ -67,27 +67,25 @@ object Libraries {
         const val jna = "5.5.0"
         const val jogamp = "2.3.2"
         const val jopt = "5.0.4"
-        const val jooq = "3.12.3"
+        const val jooq = "3.13.0"
         const val junit = "4.13"
-        const val jupiter = "5.6.0-M1"
+        const val jupiter = "5.6.0"
         const val logback = "1.2.3"
-        const val lombok = "1.18.10"
+        const val lombok = "1.18.12"
         const val mavenPluginAnnotations = "3.6.0"
         const val mavenPluginApi = "3.6.3"
-        const val mockito = "3.2.4"
-        const val naturalMouse = "2.0.2"
-        const val netty = "4.1.44.Final"
-        const val okhttp3 = "4.3.0"
+        const val mockito = "3.3.1"
+        const val netty = "4.1.45.Final"
+        const val okhttp3 = "4.4.0"
         const val orangeExtensions = "1.0"
         const val petitparser = "2.3.1"
         const val pf4j = "3.2.0"
-        const val pf4jUpdate = "2.2.0"
-        const val plexus = "3.3.0"
+        const val pf4jUpdate = "2.3.0"
         const val radiance = "2.5.1"
-        const val rxjava = "2.2.16"
+        const val rxjava = "2.2.18"
         const val rxrelay = "2.1.1"
         const val sisu = "0.3.4"
-        const val sentry = "1.7.29"
+        const val sentry = "1.7.30"
         const val semver = "0.9.0"
         const val slf4j = "1.7.30"
     }
@@ -136,7 +134,6 @@ object Libraries {
     const val mavenPluginApi = "org.apache.maven:maven-plugin-api:${Versions.mavenPluginApi}"
     const val mockitoCore = "org.mockito:mockito-core:${Versions.mockito}"
     const val mockitoInline = "org.mockito:mockito-inline:${Versions.mockito}"
-    const val naturalMouse = "com.github.joonasvali.naturalmouse:naturalmouse:${Versions.naturalMouse}"
     const val nettyBuffer = "io.netty:netty-buffer:${Versions.netty}"
     const val okhttp3 = "com.squareup.okhttp3:okhttp:${Versions.okhttp3}"
     const val okhttp3Webserver = "com.squareup.okhttp3:mockwebserver:${Versions.okhttp3}"
@@ -144,7 +141,6 @@ object Libraries {
     const val petitparser = "com.github.petitparser:java-petitparser:${Versions.petitparser}"
     const val pf4j = "org.pf4j:pf4j:${Versions.pf4j}"
     const val pf4jUpdate = "org.pf4j:pf4j-update:${Versions.pf4jUpdate}"
-    const val plexus = "org.codehaus.plexus:plexus-utils:${Versions.plexus}"
     const val rxjava = "io.reactivex.rxjava2:rxjava:${Versions.rxjava}"
     const val rxrelay = "com.jakewharton.rxrelay2:rxrelay:${Versions.rxrelay}"
     const val sisu = "org.eclipse.sisu:org.eclipse.sisu.inject:${Versions.sisu}"
diff --git a/runelite-client/runelite-client.gradle.kts b/runelite-client/runelite-client.gradle.kts
index 2985205140..e5c70903f3 100644
--- a/runelite-client/runelite-client.gradle.kts
+++ b/runelite-client/runelite-client.gradle.kts
@@ -41,6 +41,8 @@ dependencies {
     annotationProcessor(Libraries.lombok)
     annotationProcessor(Libraries.pf4j)
 
+    api(project(":runelite-api"))
+
     compileOnly(Libraries.javax)
     compileOnly(Libraries.lombok)
     compileOnly(Libraries.orangeExtensions)
@@ -73,8 +75,6 @@ dependencies {
     }
     implementation(Libraries.pf4jUpdate)
     implementation(project(":http-api"))
-    api(project(":runelite-api"))
-    implementation(Libraries.naturalMouse)
 
     runtimeOnly(Libraries.trident)
     runtimeOnly(Libraries.jogampGluegenLinuxAmd64)