From af4c2ad6ae0e69b19ef1e3e7a90d1073856cc9b3 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Thu, 25 Jul 2019 01:37:17 +0200 Subject: [PATCH] gradle: Update all deps --- cache-updater/build.gradle | 10 ++++---- .../cache/updater/CacheConfiguration.java | 2 +- cache/build.gradle | 4 ++-- deobfuscator/build.gradle | 2 +- http-api/build.gradle | 8 +++---- http-service/build.gradle | 24 +++++++++---------- .../service/SpringBootWebApplication.java | 2 +- injector-plugin/build.gradle | 2 +- protocol-api/build.gradle | 2 +- runelite-api/build.gradle | 2 +- runelite-client/build.gradle | 20 ++++++++-------- .../worldhopper/ping/IcmpEchoReply.java | 5 ++-- .../client/util/ping/IcmpEchoReply.java | 5 ++-- runelite-mixins/build.gradle | 2 +- runelite-script-assembler-plugin/build.gradle | 4 ++-- 15 files changed, 48 insertions(+), 46 deletions(-) diff --git a/cache-updater/build.gradle b/cache-updater/build.gradle index 0e145b615c..12db934c98 100644 --- a/cache-updater/build.gradle +++ b/cache-updater/build.gradle @@ -1,12 +1,12 @@ description = 'Cache Updater' dependencies { - compile group: 'org.springframework.boot', name: 'spring-boot-starter', version: '1.5.6.RELEASE' - compile group: 'org.springframework.boot', name: 'spring-boot-starter-jdbc', version: '1.5.6.RELEASE' - compile group: 'org.springframework.boot', name: 'spring-boot-devtools', version: '1.5.6.RELEASE' - compile group: 'mysql', name: 'mysql-connector-java', version: '8.0.16' + 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: '3.0.6' + compile 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-updater/src/main/java/net/runelite/cache/updater/CacheConfiguration.java b/cache-updater/src/main/java/net/runelite/cache/updater/CacheConfiguration.java index 229ea1d268..69c405aeb4 100644 --- a/cache-updater/src/main/java/net/runelite/cache/updater/CacheConfiguration.java +++ b/cache-updater/src/main/java/net/runelite/cache/updater/CacheConfiguration.java @@ -33,8 +33,8 @@ import java.util.Map; import javax.sql.DataSource; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.jdbc.DataSourceBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.sql2o.Sql2o; diff --git a/cache/build.gradle b/cache/build.gradle index 0b0f7a6827..e801a85fd8 100644 --- a/cache/build.gradle +++ b/cache/build.gradle @@ -2,11 +2,11 @@ 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.25' + 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.6' + 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' diff --git a/deobfuscator/build.gradle b/deobfuscator/build.gradle index 65fff62a7f..610aaa448f 100644 --- a/deobfuscator/build.gradle +++ b/deobfuscator/build.gradle @@ -4,7 +4,7 @@ dependencies { 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.25' + 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' diff --git a/http-api/build.gradle b/http-api/build.gradle index d808f5bb49..25fcead874 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: '3.14.0' + 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.25' - compile group: 'org.apache.commons', name: 'commons-csv', version: '1.4' + 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: '3.14.0' + testCompile 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 61d1e7ae22..39da851f05 100644 --- a/http-service/build.gradle +++ b/http-service/build.gradle @@ -2,26 +2,26 @@ apply plugin: 'war' description = 'Web Service' dependencies { - compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '1.5.6.RELEASE' - compile group: 'org.springframework.boot', name: 'spring-boot-devtools', version: '1.5.6.RELEASE' - compile group: 'org.springframework', name: 'spring-jdbc', version: '4.3.10.RELEASE' - compile group: 'org.mapstruct', name: 'mapstruct-jdk8', version: '1.2.0.Final' + 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.25' - compile group: 'com.github.scribejava', name: 'scribejava-apis', version: '6.6.3' - compile group: 'io.minio', name: 'minio', version: '3.0.6' - compile(group: 'redis.clients', name: 'jedis', version: '3.0.1') { + 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') { exclude(module: 'commons-pool2') } - testCompile(group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '1.5.6.RELEASE') { + testCompile(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: '3.14.0' - testCompile group: 'com.h2database', name: 'h2', version: '1.4.196' - providedCompile group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat', version: '1.5.6.RELEASE' + testCompile group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '4.0.1' + testCompile 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' providedCompile group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.4.2' diff --git a/http-service/src/main/java/net/runelite/http/service/SpringBootWebApplication.java b/http-service/src/main/java/net/runelite/http/service/SpringBootWebApplication.java index 344e2ec916..c24ebd8d49 100644 --- a/http-service/src/main/java/net/runelite/http/service/SpringBootWebApplication.java +++ b/http-service/src/main/java/net/runelite/http/service/SpringBootWebApplication.java @@ -49,7 +49,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.web.support.SpringBootServletInitializer; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.context.annotation.Bean; import org.springframework.jdbc.datasource.lookup.JndiDataSourceLookup; import org.springframework.scheduling.annotation.EnableScheduling; diff --git a/injector-plugin/build.gradle b/injector-plugin/build.gradle index b1cc1f6e27..bd50f90b79 100644 --- a/injector-plugin/build.gradle +++ b/injector-plugin/build.gradle @@ -10,7 +10,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' testCompile 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.0.0.M2a' + annotationProcessor group: 'org.eclipse.sisu', name: 'org.eclipse.sisu.inject', version: '0.3.3' } compileJava.doLast { diff --git a/protocol-api/build.gradle b/protocol-api/build.gradle index 2650a7c7b8..480099a817 100644 --- a/protocol-api/build.gradle +++ b/protocol-api/build.gradle @@ -1,7 +1,7 @@ description = 'Protocol API' dependencies { compile project(':runelite-api') - compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' + 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' compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8' diff --git a/runelite-api/build.gradle b/runelite-api/build.gradle index 05857a558b..a84f44de3b 100644 --- a/runelite-api/build.gradle +++ b/runelite-api/build.gradle @@ -1,6 +1,6 @@ description = 'RuneLite API' dependencies { - compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' + 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' compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8' diff --git a/runelite-client/build.gradle b/runelite-client/build.gradle index acfc1178e6..c100e4007f 100644 --- a/runelite-client/build.gradle +++ b/runelite-client/build.gradle @@ -6,21 +6,21 @@ plugins { description = 'RuneLite Client' dependencies { - compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' + 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.1' + 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.1.0', classifier: 'no_aop' + 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.2' + 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') { exclude(module: 'xz') } - compile group: 'net.java.dev.jna', name: 'jna', version: '4.5.1' - compile group: 'net.java.dev.jna', name: 'jna-platform', version: '4.5.1' + 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' @@ -29,7 +29,7 @@ dependencies { 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.0' + 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' @@ -45,10 +45,10 @@ dependencies { 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: '1.3' + 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.1.0' - testCompile group: 'com.google.inject.extensions', name: 'guice-grapher', version: '4.1.0' + 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' compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8' annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8' compileOnly group: 'net.runelite', name: 'orange-extensions', version: '1.0' diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/ping/IcmpEchoReply.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/ping/IcmpEchoReply.java index 75a7e4226c..235ae136d8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/ping/IcmpEchoReply.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/ping/IcmpEchoReply.java @@ -24,6 +24,7 @@ */ package net.runelite.client.plugins.worldhopper.ping; +import com.sun.jna.Native; import com.sun.jna.Pointer; import com.sun.jna.Structure; import com.sun.jna.platform.win32.WinDef; @@ -32,8 +33,8 @@ import java.util.List; public class IcmpEchoReply extends Structure { - private static final int IP_OPTION_INFO_SIZE = 1 + 1 + 1 + 1 + (Pointer.SIZE == 8 ? 12 : 4); // on 64bit vms add 4 byte padding - public static final int SIZE = 4 + 4 + 4 + 2 + 2 + Pointer.SIZE + IP_OPTION_INFO_SIZE; + private static final int IP_OPTION_INFO_SIZE = 1 + 1 + 1 + 1 + (Native.POINTER_SIZE == 8 ? 12 : 4); // on 64bit vms add 4 byte padding + public static final int SIZE = 4 + 4 + 4 + 2 + 2 + Native.POINTER_SIZE + IP_OPTION_INFO_SIZE; public WinDef.ULONG address; public WinDef.ULONG status; diff --git a/runelite-client/src/main/java/net/runelite/client/util/ping/IcmpEchoReply.java b/runelite-client/src/main/java/net/runelite/client/util/ping/IcmpEchoReply.java index 2756320990..bf5616144b 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/ping/IcmpEchoReply.java +++ b/runelite-client/src/main/java/net/runelite/client/util/ping/IcmpEchoReply.java @@ -24,6 +24,7 @@ */ package net.runelite.client.util.ping; +import com.sun.jna.Native; import com.sun.jna.Pointer; import com.sun.jna.Structure; import com.sun.jna.platform.win32.WinDef; @@ -32,8 +33,8 @@ import java.util.List; public class IcmpEchoReply extends Structure { - private static final int IP_OPTION_INFO_SIZE = 1 + 1 + 1 + 1 + (Pointer.SIZE == 8 ? 12 : 4); // on 64bit vms add 4 byte padding - public static final int SIZE = 4 + 4 + 4 + 2 + 2 + Pointer.SIZE + IP_OPTION_INFO_SIZE; + private static final int IP_OPTION_INFO_SIZE = 1 + 1 + 1 + 1 + (Native.POINTER_SIZE == 8 ? 12 : 4); // on 64bit vms add 4 byte padding + public static final int SIZE = 4 + 4 + 4 + 2 + 2 + Native.POINTER_SIZE + IP_OPTION_INFO_SIZE; public WinDef.ULONG address; public WinDef.ULONG status; diff --git a/runelite-mixins/build.gradle b/runelite-mixins/build.gradle index ed59895c8a..60c4996bdf 100644 --- a/runelite-mixins/build.gradle +++ b/runelite-mixins/build.gradle @@ -2,7 +2,7 @@ description = 'RuneLite Mixins' dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19' - compileOnly group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' + compileOnly group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26' compile 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 a38e99113e..b92f13ce1e 100644 --- a/runelite-script-assembler-plugin/build.gradle +++ b/runelite-script-assembler-plugin/build.gradle @@ -3,9 +3,9 @@ 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.25' + compile 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.0.0.M2a' + annotationProcessor group: 'org.eclipse.sisu', name: 'org.eclipse.sisu.inject', version: '0.3.3' } compileJava.doLast {