diff --git a/.travis.yml b/.travis.yml
index 12d8006390..518ca7ff82 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,5 +13,5 @@ cache:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
 
-script: ./gradlew clean build -x test
+script: ./gradlew build -x test --rerun-tasks
 
diff --git a/build.gradle b/build.gradle
index 0fd170d5d6..fa5376d11f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ allprojects {
 }
 
 subprojects {
-    apply plugin: 'java'
+    apply plugin: 'java-library'
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
     tasks.withType(JavaCompile) {
diff --git a/cache-client/build.gradle b/cache-client/build.gradle
index 42cd4e4836..a33e6a6cbc 100644
--- a/cache-client/build.gradle
+++ b/cache-client/build.gradle
@@ -1,8 +1,12 @@
 description = 'Cache Client'
+
 dependencies {
-    compile project(':cache')
-    compile project(':protocol')
-    testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26'
-    testCompile project(':cache')
+    api project(':cache')
+    api project(':protocol')
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
+    implementation group: 'com.google.guava', name: 'guava', version: '28.0-jre'
+    implementation group: 'io.netty', name: 'netty-all', version: '4.1.37.Final'
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
+    testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26'
+    testImplementation project(path: ':cache', configuration: 'testArchives')
 }
diff --git a/cache-updater/build.gradle b/cache-updater/build.gradle
index 12db934c98..5e597184ad 100644
--- a/cache-updater/build.gradle
+++ b/cache-updater/build.gradle
@@ -1,12 +1,13 @@
 description = 'Cache Updater'
+
 dependencies {
-    compile group: 'org.springframework.boot', name: 'spring-boot-starter', version: '2.1.6.RELEASE'
-    compile group: 'org.springframework.boot', name: 'spring-boot-starter-jdbc', version: '2.1.6.RELEASE'
-    compile group: 'org.springframework.boot', name: 'spring-boot-devtools', version: '2.1.6.RELEASE'
-    compile group: 'mysql', name: 'mysql-connector-java', version: '8.0.17'
-    compile project(':cache-client')
-    compile group: 'org.sql2o', name: 'sql2o', version: '1.6.0'
-    compile group: 'io.minio', name: 'minio', version: '6.0.8'
+    implementation group: 'org.springframework.boot', name: 'spring-boot-starter', version: '2.1.6.RELEASE'
+    implementation group: 'org.springframework.boot', name: 'spring-boot-starter-jdbc', version: '2.1.6.RELEASE'
+    implementation group: 'org.springframework.boot', name: 'spring-boot-devtools', version: '2.1.6.RELEASE'
+    implementation group: 'mysql', name: 'mysql-connector-java', version: '8.0.17'
+    implementation project(':cache-client')
+    implementation group: 'org.sql2o', name: 'sql2o', version: '1.6.0'
+    implementation group: 'io.minio', name: 'minio', version: '6.0.8'
     compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
     annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
 }
diff --git a/cache/build.gradle b/cache/build.gradle
index e801a85fd8..f6febcd2c1 100644
--- a/cache/build.gradle
+++ b/cache/build.gradle
@@ -1,22 +1,21 @@
+plugins {
+    id "com.github.hauner.jarTest" version "1.0.1"
+}
+
 description = 'Cache'
+
 dependencies {
-    compile project(':http-api')
-    compile group: 'com.google.guava', name: 'guava', version: '28.0-jre'
-    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
-    compile group: 'org.apache.commons', name: 'commons-compress', version: '1.18'
-    compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
-    compile group: 'io.netty', name: 'netty-buffer', version: '4.1.37.Final'
-    compile group: 'org.antlr', name: 'antlr4-runtime', version: '4.7.2'
-    compile group: 'commons-cli', name: 'commons-cli', version: '1.4'
-    testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26'
-    testCompile group: 'net.runelite.rs', name: 'cache', version: '165'
+    api project(':http-api')
+    implementation group: 'com.google.guava', name: 'guava', version: '28.0-jre'
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
+    implementation group: 'org.apache.commons', name: 'commons-compress', version: '1.18'
+    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
+    implementation group: 'io.netty', name: 'netty-buffer', version: '4.1.37.Final'
+    implementation group: 'org.antlr', name: 'antlr4-runtime', version: '4.7.2'
+    implementation group: 'commons-cli', name: 'commons-cli', version: '1.4'
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
+    testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26'
+    testImplementation group: 'net.runelite.rs', name: 'cache', version: '165'
     compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
     annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
 }
-
-task packageTests(type: Jar) {
-    from sourceSets.test.output
-    classifier = 'tests'
-}
-artifacts.archives packageTests
diff --git a/deobfuscator/build.gradle b/deobfuscator/build.gradle
index 610aaa448f..4fe4ff601b 100644
--- a/deobfuscator/build.gradle
+++ b/deobfuscator/build.gradle
@@ -1,21 +1,20 @@
-description = 'Deobfuscator'
-dependencies {
-    compile project(':runelite-api')
-    compile project(':runescape-api')
-    compile group: 'net.runelite', name: 'fernflower', version: '20171017'
-    compile group: 'com.google.guava', name: 'guava', version: '28.0-jre'
-    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
-    compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
-    compile group: 'org.ow2.asm', name: 'asm-debug-all', version: '5.2'
-    runtime group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26'
-    testCompile project(':rs-client')
-    testCompile group: 'net.runelite.rs', name: 'vanilla', version: '181'
-    testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
+plugins {
+    id "com.github.hauner.jarTest" version "1.0.1"
 }
 
-task packageTests(type: Jar) {
-    from sourceSets.test.output
-    classifier = 'tests'
+description = 'Deobfuscator'
+
+dependencies {
+    implementation project(':runelite-api')
+    implementation project(':runescape-api')
+    implementation group: 'net.runelite', name: 'fernflower', version: '20171017'
+    implementation group: 'com.google.guava', name: 'guava', version: '28.0-jre'
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
+    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
+    implementation group: 'org.ow2.asm', name: 'asm-debug-all', version: '5.2'
+    runtime group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26'
+    testImplementation project(':rs-client')
+    testImplementation group: 'net.runelite.rs', name: 'vanilla', version: '181'
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.0.0'
 }
-artifacts.archives packageTests
diff --git a/http-api/build.gradle b/http-api/build.gradle
index 25fcead874..7707e42c95 100644
--- a/http-api/build.gradle
+++ b/http-api/build.gradle
@@ -1,13 +1,13 @@
 description = 'Web API'
 dependencies {
-    compile group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.0.1'
-    compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
-    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
-    compile group: 'org.apache.commons', name: 'commons-csv', version: '1.7'
-    compile group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.10'
-    testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26'
-    testCompile group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '4.0.1'
+    implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.0.1'
+    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
+    implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.7'
+    implementation group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.10'
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
+    testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26'
+    testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '4.0.1'
     compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
     annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
 }
diff --git a/http-service/build.gradle b/http-service/build.gradle
index 39da851f05..127256d7a5 100644
--- a/http-service/build.gradle
+++ b/http-service/build.gradle
@@ -2,25 +2,26 @@ apply plugin: 'war'
 
 description = 'Web Service'
 dependencies {
-    compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.1.6.RELEASE'
-    compile group: 'org.springframework.boot', name: 'spring-boot-devtools', version: '2.1.6.RELEASE'
-    compile group: 'org.springframework', name: 'spring-jdbc', version: '5.1.8.RELEASE'
-    compile group: 'org.mapstruct', name: 'mapstruct-jdk8', version: '1.3.0.Final'
-    compile project(':http-api')
-    compile project(':cache')
-    compile group: 'org.sql2o', name: 'sql2o', version: '1.6.0'
-    compile group: 'com.google.guava', name: 'guava', version: '28.0-jre'
-    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
-    compile group: 'com.github.scribejava', name: 'scribejava-apis', version: '6.7.0'
-    compile group: 'io.minio', name: 'minio', version: '6.0.8'
-    compile(group: 'redis.clients', name: 'jedis', version: '3.1.0') {
+    implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.1.6.RELEASE'
+    implementation group: 'org.springframework.boot', name: 'spring-boot-devtools', version: '2.1.6.RELEASE'
+    implementation group: 'org.springframework', name: 'spring-jdbc', version: '5.1.8.RELEASE'
+    implementation group: 'org.mapstruct', name: 'mapstruct-jdk8', version: '1.3.0.Final'
+    api project(':http-api')
+    api project(':cache')
+    implementation group: 'org.sql2o', name: 'sql2o', version: '1.6.0'
+    implementation group: 'com.google.guava', name: 'guava', version: '28.0-jre'
+    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
+    implementation group: 'com.github.scribejava', name: 'scribejava-apis', version: '6.7.0'
+    implementation group: 'io.minio', name: 'minio', version: '6.0.8'
+    implementation(group: 'redis.clients', name: 'jedis', version: '3.1.0') {
         exclude(module: 'commons-pool2')
     }
-    testCompile(group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.1.6.RELEASE') {
+    testImplementation(group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.1.6.RELEASE') {
         exclude(module: 'commons-logging')
     }
-    testCompile group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '4.0.1'
-    testCompile group: 'com.h2database', name: 'h2', version: '1.4.199'
+    testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '4.0.1'
+    testImplementation group: 'com.h2database', name: 'h2', version: '1.4.199'
     providedCompile group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat', version: '2.1.6.RELEASE'
     providedCompile group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
     annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
diff --git a/injected-client/build.gradle b/injected-client/build.gradle
index 0534874e3f..2812e69f44 100644
--- a/injected-client/build.gradle
+++ b/injected-client/build.gradle
@@ -1,5 +1,5 @@
 description = 'Injected Client'
 dependencies {
-    compile project(':rs-client')
-    compile group: 'net.runelite.rs', name: 'vanilla', version: '181'
+    implementation project(':rs-client')
+    implementation group: 'net.runelite.rs', name: 'vanilla', version: '181'
 }
diff --git a/injector-plugin/build.gradle b/injector-plugin/build.gradle
index 09eb50356c..de4a9eb716 100644
--- a/injector-plugin/build.gradle
+++ b/injector-plugin/build.gradle
@@ -2,30 +2,35 @@ group = 'net.runelite.rs'
 description = 'Injector'
 
 def osrsRevision = 181
-def deobfuscatedJar = "${project.rootDir}/runescape-client/build/libs/rs-client-"+project.version+".jar"
-def vanillaJar = "$buildDir/vanilla-"+osrsRevision+".jar"
-def injectedJar = "${project.rootDir}/injected-client/build/libs/injected-client-"+project.version+".jar"
+def deobfuscatedJar = [project.rootDir, 'runescape-client', 'build', 'libs', "rs-client-${project.version}.jar"].join(File.separator)
+def vanillaJar = [project.buildDir, "vanilla-${osrsRevision}.jar"].join(File.separator)
+def injectedJar = [project.rootDir, 'injected-client', 'build', 'libs', "injected-client-${project.version}.jar"].join(File.separator)
 
 configurations {
     vanilla
 }
 
 dependencies {
-    compile project(':deobfuscator')
-    compile project(':mixins')
-    compile project(':runelite-api')
-    compile project(':runescape-api')
-    compile project(':rs-client')
-    compile project(':injected-client')
-    compile group: 'org.apache.maven', name: 'maven-plugin-api', version: '3.6.1'
-    testCompile project(':deobfuscator')
-    testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
+    implementation project(':deobfuscator')
+    implementation project(':mixins')
+    implementation project(':runelite-api')
+    implementation project(':runescape-api')
+    implementation project(':injected-client')
+    implementation group: 'com.google.guava', name: 'guava', version: '28.0-jre'
+    implementation group: 'org.apache.maven', name: 'maven-plugin-api', version: '3.6.1'
+    implementation group: 'org.ow2.asm', name: 'asm-debug-all', version: '5.2'
+    testImplementation project(':deobfuscator')
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
+    testImplementation group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
     compileOnly group: 'org.apache.maven.plugin-tools', name: 'maven-plugin-annotations', version: '3.6.0'
     annotationProcessor group: 'org.eclipse.sisu', name: 'org.eclipse.sisu.inject', version: '0.3.3'
     vanilla "net.runelite.rs:vanilla:"+osrsRevision
 }
 
+compileJava {
+    dependsOn ":rs-client:build"
+}
+
 compileJava.outputs.upToDateWhen {false}
 
 compileJava.doLast() {
@@ -37,9 +42,9 @@ compileJava.doLast() {
     def loader = new URLClassLoader(path.collect { f -> f.toURL() } as URL[])
     def inject = loader.loadClass('net.runelite.injector.Injector')
     String[] jarPaths = [
-            deobfuscatedJar,
-            vanillaJar,
-            injectedJar
+            deobfuscatedJar.toString(),
+            vanillaJar.toString(),
+            injectedJar.toString()
     ]
     inject.main(jarPaths)
 }
\ No newline at end of file
diff --git a/protocol-api/build.gradle b/protocol-api/build.gradle
index 480099a817..93950cccaa 100644
--- a/protocol-api/build.gradle
+++ b/protocol-api/build.gradle
@@ -1,9 +1,9 @@
 description = 'Protocol API'
 dependencies {
-    compile project(':runelite-api')
-    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
-    compile group: 'com.google.guava', name: 'guava', version: '28.0-jre'
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    implementation project(':runelite-api')
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
+    implementation group: 'com.google.guava', name: 'guava', version: '28.0-jre'
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
     compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
     annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
 }
diff --git a/protocol/build.gradle b/protocol/build.gradle
index faacf85e28..79b146b5ee 100644
--- a/protocol/build.gradle
+++ b/protocol/build.gradle
@@ -1,10 +1,11 @@
 description = 'Protocol'
 dependencies {
-    compile project(':protocol-api')
-    compile project(':cache')
-    compile group: 'com.google.guava', name: 'guava', version: '28.0-jre'
-    compile group: 'io.netty', name: 'netty-all', version: '4.1.37.Final'
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    api project(':protocol-api')
+    implementation project(':cache')
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
+    implementation group: 'com.google.guava', name: 'guava', version: '28.0-jre'
+    implementation group: 'io.netty', name: 'netty-all', version: '4.1.37.Final'
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
     compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
     annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
 }
diff --git a/runelite-api/build.gradle b/runelite-api/build.gradle
index a84f44de3b..7d2afb5a87 100644
--- a/runelite-api/build.gradle
+++ b/runelite-api/build.gradle
@@ -1,8 +1,8 @@
 description = 'RuneLite API'
 dependencies {
-    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
-    compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
+    implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
     compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
     annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
 }
diff --git a/runelite-client/build.gradle b/runelite-client/build.gradle
index c100e4007f..d8bcad7e96 100644
--- a/runelite-client/build.gradle
+++ b/runelite-client/build.gradle
@@ -6,34 +6,35 @@ plugins {
 description = 'RuneLite Client'
 
 dependencies {
-    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
-    compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
-    compile group: 'net.sf.jopt-simple', name: 'jopt-simple', version: '5.0.4'
-    compile group: 'com.google.guava', name: 'guava', version: '28.0-jre'
-    compile group: 'com.google.inject', name: 'guice', version: '4.2.2', classifier: 'no_aop'
-    compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
-    compile group: 'net.runelite.pushingpixels', name: 'substance', version: '8.0.02'
-    compile group: 'org.apache.commons', name: 'commons-text', version: '1.7'
-    compile group: 'org.jogamp.jogl', name: 'jogl-all', version: '2.3.2'
-    compile group: 'org.jogamp.gluegen', name: 'gluegen-rt', version: '2.3.2'
-    compile(group: 'io.sigpipe', name: 'jbsdiff', version: '1.0') {
+    implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.0.1'
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
+    implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
+    implementation group: 'net.sf.jopt-simple', name: 'jopt-simple', version: '5.0.4'
+    implementation group: 'com.google.guava', name: 'guava', version: '28.0-jre'
+    implementation group: 'com.google.inject', name: 'guice', version: '4.2.2', classifier: 'no_aop'
+    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
+    implementation group: 'net.runelite.pushingpixels', name: 'substance', version: '8.0.02'
+    implementation group: 'org.apache.commons', name: 'commons-text', version: '1.7'
+    implementation group: 'org.jogamp.jogl', name: 'jogl-all', version: '2.3.2'
+    implementation group: 'org.jogamp.gluegen', name: 'gluegen-rt', version: '2.3.2'
+    implementation(group: 'io.sigpipe', name: 'jbsdiff', version: '1.0') {
         exclude(module: 'xz')
     }
-    compile group: 'net.java.dev.jna', name: 'jna', version: '5.4.0'
-    compile group: 'net.java.dev.jna', name: 'jna-platform', version: '5.4.0'
-    compile project(':runelite-api')
-    compile project(':http-api')
-    compile group: 'net.runelite', name: 'discord', version: '1.1'
-    compile group: 'org.javassist', name: 'javassist', version: '3.25.0-GA'
-    compile group: 'org.xeustechnologies', name: 'jcl-core', version: '2.8'
-    compile group: 'org.jetbrains', name: 'annotations', version: '17.0.0'
-    compile group: 'com.github.joonasvali.naturalmouse', name: 'naturalmouse', version: '[1.0.0,)'
-    compile group: 'org.ow2.asm', name: 'asm-all', version: '6.0_BETA'
-    compile group: 'org.codehaus.plexus', name: 'plexus-utils', version: '3.2.1'
-    compile group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.11'
-    compile group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.5.9'
-    compile group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.10'
-    compile group: 'com.jakewharton.rxrelay2', name: 'rxrelay', version: '2.1.0'
+    implementation group: 'net.java.dev.jna', name: 'jna', version: '5.4.0'
+    implementation group: 'net.java.dev.jna', name: 'jna-platform', version: '5.4.0'
+    implementation project(':runelite-api')
+    implementation project(':http-api')
+    implementation group: 'net.runelite', name: 'discord', version: '1.1'
+    implementation group: 'org.javassist', name: 'javassist', version: '3.25.0-GA'
+    implementation group: 'org.xeustechnologies', name: 'jcl-core', version: '2.8'
+    implementation group: 'org.jetbrains', name: 'annotations', version: '17.0.0'
+    implementation group: 'com.github.joonasvali.naturalmouse', name: 'naturalmouse', version: '[1.0.0,)'
+    implementation group: 'org.ow2.asm', name: 'asm-all', version: '6.0_BETA'
+    implementation group: 'org.codehaus.plexus', name: 'plexus-utils', version: '3.2.1'
+    implementation group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.11'
+    implementation group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.5.9'
+    implementation group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.10'
+    implementation group: 'com.jakewharton.rxrelay2', name: 'rxrelay', version: '2.1.0'
     runtime group: 'net.runelite.pushingpixels', name: 'trident', version: '1.5.00'
     runtime group: 'org.jogamp.jogl', name: 'jogl-all', version: '2.3.2', classifier: 'natives-windows-amd64'
     runtime group: 'org.jogamp.jogl', name: 'jogl-all', version: '2.3.2', classifier: 'natives-windows-i586'
@@ -44,13 +45,16 @@ dependencies {
     runtime group: 'org.jogamp.gluegen', name: 'gluegen-rt', version: '2.3.2', classifier: 'natives-linux-amd64'
     runtime group: 'org.jogamp.gluegen', name: 'gluegen-rt', version: '2.3.2', classifier: 'natives-linux-i586'
     runtime project(':runescape-api')
-    testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
-    testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
-    testCompile group: 'com.google.inject.extensions', name: 'guice-testlib', version: '4.2.2'
-    testCompile group: 'com.google.inject.extensions', name: 'guice-grapher', version: '4.2.2'
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
+    testImplementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
+    testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
+    testImplementation group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
+    testImplementation group: 'com.google.inject.extensions', name: 'guice-testlib', version: '4.2.2'
+    testImplementation group: 'com.google.inject.extensions', name: 'guice-grapher', version: '4.2.2'
     compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
+    testCompileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
     annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
+    testAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
     compileOnly group: 'net.runelite', name: 'orange-extensions', version: '1.0'
 }
 
@@ -66,7 +70,7 @@ jar {
 }
 
 shadowJar {
-    classifier = "shaded"
+    archiveClassifier.set("shaded")
 }
 
 tasks.build.dependsOn tasks.shadowJar
\ No newline at end of file
diff --git a/runelite-mixins/build.gradle b/runelite-mixins/build.gradle
index 60c4996bdf..07f462bd9e 100644
--- a/runelite-mixins/build.gradle
+++ b/runelite-mixins/build.gradle
@@ -1,9 +1,9 @@
 description = 'RuneLite Mixins'
 dependencies {
-    testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
+    testImplementation group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
     compileOnly group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
-    compile project(':runescape-api')
+    implementation project(':runescape-api')
     compileOnly group: 'com.google.guava', name: 'guava', version: '28.0-jre'
     compileOnly group: 'javax.inject', name: 'javax.inject', version: '1'
 }
diff --git a/runelite-script-assembler-plugin/build.gradle b/runelite-script-assembler-plugin/build.gradle
index 74c08b358a..165c0a3d4d 100644
--- a/runelite-script-assembler-plugin/build.gradle
+++ b/runelite-script-assembler-plugin/build.gradle
@@ -1,9 +1,10 @@
 description = 'Script Assembler Plugin'
 dependencies {
-    compile project(':cache')
-    compile project(':runelite-api')
-    compile group: 'org.apache.maven', name: 'maven-plugin-api', version: '3.6.1'
-    compile group: 'org.slf4j', name: 'slf4j-nop', version: '1.7.26'
+    implementation project(':cache')
+    implementation project(':runelite-api')
+    implementation group: 'com.google.guava', name: 'guava', version: '28.0-jre'
+    implementation group: 'org.apache.maven', name: 'maven-plugin-api', version: '3.6.1'
+    implementation group: 'org.slf4j', name: 'slf4j-nop', version: '1.7.26'
     compileOnly group: 'org.apache.maven.plugin-tools', name: 'maven-plugin-annotations', version: '3.6.0'
     annotationProcessor group: 'org.eclipse.sisu', name: 'org.eclipse.sisu.inject', version: '0.3.3'
 }
diff --git a/runescape-api/build.gradle b/runescape-api/build.gradle
index 4295d3b740..79bfc483b5 100644
--- a/runescape-api/build.gradle
+++ b/runescape-api/build.gradle
@@ -1,5 +1,5 @@
 group = 'net.runelite.rs'
 description = 'RuneScape API'
 dependencies {
-    compile project(':runelite-api')
+    api project(':runelite-api')
 }
diff --git a/runescape-client/build.gradle b/runescape-client/build.gradle
index ea985ed5be..b697f0a39b 100644
--- a/runescape-client/build.gradle
+++ b/runescape-client/build.gradle
@@ -1,8 +1,8 @@
 group = 'net.runelite.rs'
 description = 'RuneScape Client'
 dependencies {
-    compile project(':runescape-api')
-    testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
-    testCompile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26'
+    implementation project(':runescape-api')
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
+    testImplementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
+    testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26'
 }