gradle: Update all deps

This commit is contained in:
Owain van Brakel
2019-07-25 01:37:17 +02:00
parent 17a8fae48c
commit af4c2ad6ae
15 changed files with 48 additions and 46 deletions

View File

@@ -1,12 +1,12 @@
description = 'Cache Updater' description = 'Cache Updater'
dependencies { dependencies {
compile group: 'org.springframework.boot', name: 'spring-boot-starter', version: '1.5.6.RELEASE' 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: '1.5.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: '1.5.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.16' compile group: 'mysql', name: 'mysql-connector-java', version: '8.0.17'
compile project(':cache-client') compile project(':cache-client')
compile group: 'org.sql2o', name: 'sql2o', version: '1.6.0' 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' compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8' annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
} }

View File

@@ -33,8 +33,8 @@ import java.util.Map;
import javax.sql.DataSource; import javax.sql.DataSource;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value; 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.context.properties.ConfigurationProperties;
import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.sql2o.Sql2o; import org.sql2o.Sql2o;

4
cache/build.gradle vendored
View File

@@ -2,11 +2,11 @@ description = 'Cache'
dependencies { dependencies {
compile project(':http-api') compile project(':http-api')
compile group: 'com.google.guava', name: 'guava', version: '28.0-jre' 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: 'org.apache.commons', name: 'commons-compress', version: '1.18'
compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5' 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: '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' compile group: 'commons-cli', name: 'commons-cli', version: '1.4'
testCompile group: 'junit', name: 'junit', version: '4.12' testCompile group: 'junit', name: 'junit', version: '4.12'
testCompile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26' testCompile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26'

View File

@@ -4,7 +4,7 @@ dependencies {
compile project(':runescape-api') compile project(':runescape-api')
compile group: 'net.runelite', name: 'fernflower', version: '20171017' compile group: 'net.runelite', name: 'fernflower', version: '20171017'
compile group: 'com.google.guava', name: 'guava', version: '28.0-jre' 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: 'com.google.code.gson', name: 'gson', version: '2.8.5'
compile group: 'org.ow2.asm', name: 'asm-debug-all', version: '5.2' compile group: 'org.ow2.asm', name: 'asm-debug-all', version: '5.2'
runtime group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26' runtime group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26'

View File

@@ -1,13 +1,13 @@
description = 'Web API' description = 'Web API'
dependencies { 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: 'com.google.code.gson', name: 'gson', version: '2.8.5'
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-csv', version: '1.4' compile group: 'org.apache.commons', name: 'commons-csv', version: '1.7'
compile group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.10' compile group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.10'
testCompile group: 'junit', name: 'junit', version: '4.12' testCompile group: 'junit', name: 'junit', version: '4.12'
testCompile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.26' 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' compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8' annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
} }

View File

@@ -2,26 +2,26 @@ apply plugin: 'war'
description = 'Web Service' description = 'Web Service'
dependencies { dependencies {
compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '1.5.6.RELEASE' 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: '1.5.6.RELEASE' compile group: 'org.springframework.boot', name: 'spring-boot-devtools', version: '2.1.6.RELEASE'
compile group: 'org.springframework', name: 'spring-jdbc', version: '4.3.10.RELEASE' compile group: 'org.springframework', name: 'spring-jdbc', version: '5.1.8.RELEASE'
compile group: 'org.mapstruct', name: 'mapstruct-jdk8', version: '1.2.0.Final' compile group: 'org.mapstruct', name: 'mapstruct-jdk8', version: '1.3.0.Final'
compile project(':http-api') compile project(':http-api')
compile project(':cache') compile project(':cache')
compile group: 'org.sql2o', name: 'sql2o', version: '1.6.0' compile group: 'org.sql2o', name: 'sql2o', version: '1.6.0'
compile group: 'com.google.guava', name: 'guava', version: '28.0-jre' 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.github.scribejava', name: 'scribejava-apis', version: '6.6.3' compile group: 'com.github.scribejava', name: 'scribejava-apis', version: '6.7.0'
compile group: 'io.minio', name: 'minio', version: '3.0.6' compile group: 'io.minio', name: 'minio', version: '6.0.8'
compile(group: 'redis.clients', name: 'jedis', version: '3.0.1') { compile(group: 'redis.clients', name: 'jedis', version: '3.1.0') {
exclude(module: 'commons-pool2') 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') exclude(module: 'commons-logging')
} }
testCompile group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '3.14.0' testCompile group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '4.0.1'
testCompile group: 'com.h2database', name: 'h2', version: '1.4.196' testCompile group: 'com.h2database', name: 'h2', version: '1.4.199'
providedCompile group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat', version: '1.5.6.RELEASE' 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' providedCompile group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
annotationProcessor 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' providedCompile group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.4.2'

View File

@@ -49,7 +49,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.context.properties.ConfigurationProperties; 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.context.annotation.Bean;
import org.springframework.jdbc.datasource.lookup.JndiDataSourceLookup; import org.springframework.jdbc.datasource.lookup.JndiDataSourceLookup;
import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.EnableScheduling;

View File

@@ -10,7 +10,7 @@ dependencies {
testCompile group: 'junit', name: 'junit', version: '4.12' testCompile group: 'junit', name: 'junit', version: '4.12'
testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19' 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' 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 { compileJava.doLast {

View File

@@ -1,7 +1,7 @@
description = 'Protocol API' description = 'Protocol API'
dependencies { dependencies {
compile project(':runelite-api') 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' compile group: 'com.google.guava', name: 'guava', version: '28.0-jre'
testCompile group: 'junit', name: 'junit', version: '4.12' testCompile group: 'junit', name: 'junit', version: '4.12'
compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8' compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8'

View File

@@ -1,6 +1,6 @@
description = 'RuneLite API' description = 'RuneLite API'
dependencies { 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' compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
testCompile group: 'junit', name: 'junit', version: '4.12' testCompile group: 'junit', name: 'junit', version: '4.12'
compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8' compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8'

View File

@@ -6,21 +6,21 @@ plugins {
description = 'RuneLite Client' description = 'RuneLite Client'
dependencies { 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: '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.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: 'com.google.code.gson', name: 'gson', version: '2.8.5'
compile group: 'net.runelite.pushingpixels', name: 'substance', version: '8.0.02' 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.jogl', name: 'jogl-all', version: '2.3.2'
compile group: 'org.jogamp.gluegen', name: 'gluegen-rt', 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') { compile(group: 'io.sigpipe', name: 'jbsdiff', version: '1.0') {
exclude(module: 'xz') exclude(module: 'xz')
} }
compile group: 'net.java.dev.jna', name: 'jna', 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: '4.5.1' compile group: 'net.java.dev.jna', name: 'jna-platform', version: '5.4.0'
compile project(':runelite-api') compile project(':runelite-api')
compile project(':http-api') compile project(':http-api')
compile group: 'net.runelite', name: 'discord', version: '1.1' 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: 'org.jetbrains', name: 'annotations', version: '17.0.0'
compile group: 'com.github.joonasvali.naturalmouse', name: 'naturalmouse', version: '[1.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.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: 'httpcore', version: '4.4.11'
compile group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.5.9' compile group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.5.9'
compile group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.10' 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 group: 'org.jogamp.gluegen', name: 'gluegen-rt', version: '2.3.2', classifier: 'natives-linux-i586'
runtime project(':runescape-api') runtime project(':runescape-api')
testCompile group: 'junit', name: 'junit', version: '4.12' 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: '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-testlib', version: '4.2.2'
testCompile group: 'com.google.inject.extensions', name: 'guice-grapher', version: '4.1.0' testCompile group: 'com.google.inject.extensions', name: 'guice-grapher', version: '4.2.2'
compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8' compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.8'
annotationProcessor 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' compileOnly group: 'net.runelite', name: 'orange-extensions', version: '1.0'

View File

@@ -24,6 +24,7 @@
*/ */
package net.runelite.client.plugins.worldhopper.ping; package net.runelite.client.plugins.worldhopper.ping;
import com.sun.jna.Native;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.Structure; import com.sun.jna.Structure;
import com.sun.jna.platform.win32.WinDef; import com.sun.jna.platform.win32.WinDef;
@@ -32,8 +33,8 @@ import java.util.List;
public class IcmpEchoReply extends Structure 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 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 + Pointer.SIZE + IP_OPTION_INFO_SIZE; public static final int SIZE = 4 + 4 + 4 + 2 + 2 + Native.POINTER_SIZE + IP_OPTION_INFO_SIZE;
public WinDef.ULONG address; public WinDef.ULONG address;
public WinDef.ULONG status; public WinDef.ULONG status;

View File

@@ -24,6 +24,7 @@
*/ */
package net.runelite.client.util.ping; package net.runelite.client.util.ping;
import com.sun.jna.Native;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.Structure; import com.sun.jna.Structure;
import com.sun.jna.platform.win32.WinDef; import com.sun.jna.platform.win32.WinDef;
@@ -32,8 +33,8 @@ import java.util.List;
public class IcmpEchoReply extends Structure 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 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 + Pointer.SIZE + IP_OPTION_INFO_SIZE; public static final int SIZE = 4 + 4 + 4 + 2 + 2 + Native.POINTER_SIZE + IP_OPTION_INFO_SIZE;
public WinDef.ULONG address; public WinDef.ULONG address;
public WinDef.ULONG status; public WinDef.ULONG status;

View File

@@ -2,7 +2,7 @@ description = 'RuneLite Mixins'
dependencies { dependencies {
testCompile group: 'junit', name: 'junit', version: '4.12' testCompile group: 'junit', name: 'junit', version: '4.12'
testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19' 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') compile project(':runescape-api')
compileOnly group: 'com.google.guava', name: 'guava', version: '28.0-jre' compileOnly group: 'com.google.guava', name: 'guava', version: '28.0-jre'
compileOnly group: 'javax.inject', name: 'javax.inject', version: '1' compileOnly group: 'javax.inject', name: 'javax.inject', version: '1'

View File

@@ -3,9 +3,9 @@ dependencies {
compile project(':cache') compile project(':cache')
compile project(':runelite-api') compile project(':runelite-api')
compile group: 'org.apache.maven', name: 'maven-plugin-api', version: '3.6.1' 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' 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 { compileJava.doLast {