Merge remote-tracking branch 'runelite/master' into 2009-merge

2019-10-03 17:35:19 +02:00
parent 410f67cb1b ad5514acde
commit 72ae9ddabd
46 changed files with 1855 additions and 522 deletions
--- a/http-api/build.gradle
+++ b/http-api/build.gradle
@@ -5,6 +5,7 @@ description = 'Web API'
 dependencies {
    annotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombok

+    compileOnly group: 'javax.inject', name: 'javax.inject', version: javaxInject
    compileOnly group: 'org.projectlombok', name: 'lombok', version: lombok

    implementation group: 'com.google.code.gson', name: 'gson', version: gson