gradle: Update deps, format files (#1316)
* gradle: Update dependencies Also made the version numbers global to make updating easier, also this way we can't have mismatches where different projects use diffrent versions of a dep * cache: Fix TitleDumper test * gradle: Format build files * httpserviceplus: Remove unneeded deps
This commit is contained in:
65
build.gradle
65
build.gradle
@@ -1,3 +1,5 @@
|
||||
import org.ajoberstar.grgit.Grgit
|
||||
|
||||
buildscript {
|
||||
repositories {
|
||||
maven {
|
||||
@@ -10,17 +12,69 @@ buildscript {
|
||||
}
|
||||
|
||||
plugins {
|
||||
id "com.github.ben-manes.versions" version "0.21.0"
|
||||
id "com.gradle.build-scan" version "2.3"
|
||||
id "com.github.ben-manes.versions" version "0.22.0" apply false
|
||||
id "com.gradle.build-scan" version "2.4"
|
||||
}
|
||||
|
||||
apply plugin: 'application'
|
||||
|
||||
ext {
|
||||
grgit = org.ajoberstar.grgit.Grgit.open(dir: "${rootProject.projectDir}")
|
||||
grgit = Grgit.open(dir: "${rootProject.projectDir}")
|
||||
localGitCommit = grgit.head().id
|
||||
localGitCommitShort = grgit.head().getAbbreviatedId(7)
|
||||
localGitDirty = !grgit.status().clean
|
||||
|
||||
// Dependencies versions
|
||||
annotations = '17.0.0'
|
||||
antlr = '4.7.2'
|
||||
apacheCommonsCompress = '1.18'
|
||||
apacheCommonsCsv = '1.7'
|
||||
apacheCommonsText = '1.7'
|
||||
asm = '7.1'
|
||||
commonsCli = '1.4'
|
||||
discord = '1.1'
|
||||
fernflower = '20171017'
|
||||
findbugs = '3.0.2'
|
||||
gson = '2.8.5'
|
||||
guava = '28.0-jre'
|
||||
guice = '4.2.2'
|
||||
h2 = '1.4.199'
|
||||
hamcrest = '2.1'
|
||||
httpcore = '4.4.11'
|
||||
httpmime = '4.5.9'
|
||||
javassist = '3.25.0-GA'
|
||||
javaxInject = '1'
|
||||
jbsdiff = '1.0'
|
||||
jclCore = '2.8'
|
||||
jedis = '3.1.0'
|
||||
jna = '5.4.0'
|
||||
jogamp = '2.3.2'
|
||||
jopt = '5.0.4'
|
||||
junit = '4.12'
|
||||
logback = '1.2.3'
|
||||
lombok = '1.18.8'
|
||||
mapstruct = '1.3.0.Final'
|
||||
mariadbJdbc = '2.4.3'
|
||||
mavenPluginAnnotations = '3.6.0'
|
||||
mavenPluginApi = '3.6.1'
|
||||
minio = '6.0.9'
|
||||
mockito = '3.0.0'
|
||||
mongodbDriverSync = '3.11.0'
|
||||
mysqlConnectorJava = '8.0.17'
|
||||
netty = '4.1.37.Final'
|
||||
okhttp3 = '4.1.0'
|
||||
orangeExtensions = '1.0'
|
||||
plexus = '3.2.1'
|
||||
rxjava = '2.2.11'
|
||||
rxrelay = '2.1.0'
|
||||
scribejava = '6.7.0'
|
||||
sisu = '0.3.3'
|
||||
slf4j = '1.7.26'
|
||||
springJdbc = '5.1.9.RELEASE'
|
||||
springboot = '2.1.7.RELEASE'
|
||||
sql2o = '1.6.0'
|
||||
substance = '8.0.02'
|
||||
trident = '1.5.00'
|
||||
}
|
||||
|
||||
allprojects {
|
||||
@@ -47,13 +101,15 @@ allprojects {
|
||||
subprojects {
|
||||
apply plugin: 'java-library'
|
||||
apply plugin: 'maven'
|
||||
apply plugin: "com.github.ben-manes.versions"
|
||||
|
||||
sourceCompatibility = 1.8
|
||||
targetCompatibility = 1.8
|
||||
|
||||
tasks.withType(JavaCompile) {
|
||||
options.encoding = 'UTF-8'
|
||||
}
|
||||
|
||||
|
||||
repositories {
|
||||
mavenLocal()
|
||||
|
||||
@@ -61,6 +117,7 @@ subprojects {
|
||||
maven { url "http://repo.runelite.net" }
|
||||
maven { url "http://repo.maven.apache.org/maven2" }
|
||||
maven { url "https://raw.githubusercontent.com/runelite-extended/maven-repo/master" }
|
||||
|
||||
if (System.getenv("NEXUS-URL") != null) {
|
||||
maven { url System.getenv("NEXUS-URL") }
|
||||
}
|
||||
|
||||
@@ -3,10 +3,12 @@ description = 'Cache Client'
|
||||
dependencies {
|
||||
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'
|
||||
|
||||
implementation group: 'com.google.guava', name: 'guava', version: guava
|
||||
implementation group: 'io.netty', name: 'netty-all', version: netty
|
||||
implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4j
|
||||
|
||||
testImplementation group: 'junit', name: 'junit', version: junit
|
||||
testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: slf4j
|
||||
testImplementation project(path: ':cache', configuration: 'testArchives')
|
||||
}
|
||||
|
||||
@@ -1,13 +1,15 @@
|
||||
description = 'Cache Updater'
|
||||
|
||||
dependencies {
|
||||
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'
|
||||
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombok
|
||||
|
||||
compileOnly group: 'org.projectlombok', name: 'lombok', version: lombok
|
||||
|
||||
implementation group: 'io.minio', name: 'minio', version: minio
|
||||
implementation group: 'mysql', name: 'mysql-connector-java', version: mysqlConnectorJava
|
||||
implementation group: 'org.springframework.boot', name: 'spring-boot-devtools', version: springboot
|
||||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter', version: springboot
|
||||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-jdbc', version: springboot
|
||||
implementation group: 'org.sql2o', name: 'sql2o', version: sql2o
|
||||
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'
|
||||
}
|
||||
|
||||
@@ -32,6 +32,7 @@ import io.minio.errors.InsufficientDataException;
|
||||
import io.minio.errors.InternalException;
|
||||
import io.minio.errors.InvalidArgumentException;
|
||||
import io.minio.errors.InvalidBucketNameException;
|
||||
import io.minio.errors.InvalidResponseException;
|
||||
import io.minio.errors.NoResponseException;
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.IOException;
|
||||
@@ -87,7 +88,7 @@ public class CacheUploader implements Runnable
|
||||
|
||||
minioClient.putObject(minioBucket, path, new ByteArrayInputStream(data), data.length, "binary/octet-stream");
|
||||
}
|
||||
catch (ErrorResponseException | InsufficientDataException | InternalException | InvalidArgumentException | InvalidBucketNameException | NoResponseException | IOException | InvalidKeyException | NoSuchAlgorithmException | XmlPullParserException ex)
|
||||
catch (ErrorResponseException | InsufficientDataException | InternalException | InvalidArgumentException | InvalidBucketNameException | NoResponseException | IOException | InvalidKeyException | NoSuchAlgorithmException | XmlPullParserException | InvalidResponseException ex)
|
||||
{
|
||||
logger.warn("unable to upload data to store", ex);
|
||||
}
|
||||
|
||||
32
cache/build.gradle
vendored
32
cache/build.gradle
vendored
@@ -7,23 +7,23 @@ plugins {
|
||||
description = 'Cache'
|
||||
|
||||
dependencies {
|
||||
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'
|
||||
}
|
||||
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombok
|
||||
|
||||
test {
|
||||
exclude '**/TitleDumper*'
|
||||
api project(':http-api')
|
||||
|
||||
compileOnly group: 'org.projectlombok', name: 'lombok', version: lombok
|
||||
|
||||
implementation group: 'com.google.code.gson', name: 'gson', version: gson
|
||||
implementation group: 'com.google.guava', name: 'guava', version: guava
|
||||
implementation group: 'commons-cli', name: 'commons-cli', version: commonsCli
|
||||
implementation group: 'io.netty', name: 'netty-buffer', version: netty
|
||||
implementation group: 'org.antlr', name: 'antlr4-runtime', version: antlr
|
||||
implementation group: 'org.apache.commons', name: 'commons-compress', version: apacheCommonsCompress
|
||||
implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4j
|
||||
|
||||
testImplementation group: 'junit', name: 'junit', version: junit
|
||||
testImplementation group: 'net.runelite.rs', name: 'cache', version: cacheversion
|
||||
testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: slf4j
|
||||
}
|
||||
|
||||
processTestResources {
|
||||
|
||||
@@ -47,8 +47,8 @@ public class TitleDumper
|
||||
@Test
|
||||
public void extract() throws IOException
|
||||
{
|
||||
File base = StoreLocation.LOCATION,
|
||||
outFile = folder.newFolder();
|
||||
File base = StoreLocation.LOCATION;
|
||||
File outFile = folder.newFile();
|
||||
|
||||
try (Store store = new Store(base))
|
||||
{
|
||||
|
||||
@@ -11,19 +11,23 @@ configurations {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
deobjars group: 'net.runelite.rs', name: 'vanilla', version: rsversion
|
||||
deobjars project(':rs-client')
|
||||
|
||||
implementation group: 'com.google.code.gson', name: 'gson', version: gson
|
||||
implementation group: 'com.google.guava', name: 'guava', version: guava
|
||||
implementation group: 'net.runelite', name: 'fernflower', version: fernflower
|
||||
implementation group: 'org.ow2.asm', name: 'asm', version: asm
|
||||
implementation group: 'org.ow2.asm', name: 'asm-util', version: asm
|
||||
implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4j
|
||||
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'
|
||||
deobjars project(':rs-client')
|
||||
deobjars group: 'net.runelite.rs', name: 'vanilla', version: '181'
|
||||
|
||||
runtime group: 'org.slf4j', name: 'slf4j-simple', version: slf4j
|
||||
|
||||
testImplementation configurations.deobjars.dependencies
|
||||
testImplementation group: 'junit', name: 'junit', version: '4.12'
|
||||
testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.0.0'
|
||||
testImplementation group: 'junit', name: 'junit', version: junit
|
||||
testImplementation group: 'org.mockito', name: 'mockito-core', version: mockito
|
||||
}
|
||||
|
||||
processResources {
|
||||
|
||||
@@ -1,17 +1,22 @@
|
||||
import org.apache.tools.ant.filters.ReplaceTokens
|
||||
|
||||
description = 'Web API'
|
||||
|
||||
dependencies {
|
||||
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombok
|
||||
|
||||
compileOnly group: 'org.projectlombok', name: 'lombok', version: lombok
|
||||
|
||||
implementation group: 'com.google.code.gson', name: 'gson', version: gson
|
||||
implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: okhttp3
|
||||
implementation group: 'io.reactivex.rxjava2', name: 'rxjava', version: rxjava
|
||||
implementation group: 'org.apache.commons', name: 'commons-csv', version: apacheCommonsCsv
|
||||
implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4j
|
||||
implementation project(':runelite-api')
|
||||
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'
|
||||
|
||||
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: okhttp3
|
||||
testImplementation group: 'junit', name: 'junit', version: junit
|
||||
testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: slf4j
|
||||
}
|
||||
|
||||
processResources {
|
||||
|
||||
@@ -1,30 +1,26 @@
|
||||
apply plugin: 'war'
|
||||
|
||||
description = 'Web Service Plus'
|
||||
|
||||
dependencies {
|
||||
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')
|
||||
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombok
|
||||
|
||||
api project(':cache')
|
||||
api project(':http-api')
|
||||
api project(':http-service')
|
||||
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') {
|
||||
|
||||
implementation group: 'com.google.code.gson', name: 'gson', version: gson
|
||||
implementation group: 'com.google.guava', name: 'guava', version: guava
|
||||
implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: okhttp3
|
||||
implementation group: 'org.springframework', name: 'spring-jdbc', version: springJdbc
|
||||
implementation group: 'org.springframework.boot', name: 'spring-boot-devtools', version: springboot
|
||||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: springboot
|
||||
implementation group: 'org.sql2o', name: 'sql2o', version: sql2o
|
||||
implementation(group: 'redis.clients', name: 'jedis', version: jedis) {
|
||||
exclude(module: 'commons-pool2')
|
||||
}
|
||||
testImplementation(group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.1.6.RELEASE') {
|
||||
exclude(module: 'commons-logging')
|
||||
}
|
||||
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'
|
||||
providedCompile group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.4.2'
|
||||
|
||||
providedCompile group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: mariadbJdbc
|
||||
providedCompile group: 'org.projectlombok', name: 'lombok', version: lombok
|
||||
providedCompile group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat', version: springboot
|
||||
}
|
||||
|
||||
@@ -1,32 +1,37 @@
|
||||
apply plugin: 'war'
|
||||
|
||||
description = 'Web Service'
|
||||
|
||||
dependencies {
|
||||
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(':runelite-api')
|
||||
api project(':http-api')
|
||||
annotationProcessor group: 'org.mapstruct', name: 'mapstruct-processor', version: mapstruct
|
||||
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombok
|
||||
|
||||
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: 'org.mongodb', name: 'mongodb-driver-sync', version: '3.10.2'
|
||||
implementation(group: 'redis.clients', name: 'jedis', version: '3.1.0') {
|
||||
api project(':http-api')
|
||||
api project(':runelite-api')
|
||||
|
||||
implementation group: 'com.github.scribejava', name: 'scribejava-apis', version: scribejava
|
||||
implementation group: 'com.google.code.gson', name: 'gson', version: gson
|
||||
implementation group: 'com.google.guava', name: 'guava', version: guava
|
||||
implementation group: 'io.minio', name: 'minio', version: minio
|
||||
implementation group: 'org.mapstruct', name: 'mapstruct-jdk8', version: mapstruct
|
||||
implementation group: 'org.mongodb', name: 'mongodb-driver-sync', version: mongodbDriverSync
|
||||
implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4j
|
||||
implementation group: 'org.springframework', name: 'spring-jdbc', version: springJdbc
|
||||
implementation group: 'org.springframework.boot', name: 'spring-boot-devtools', version: springboot
|
||||
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: springboot
|
||||
implementation group: 'org.sql2o', name: 'sql2o', version: sql2o
|
||||
implementation(group: 'redis.clients', name: 'jedis', version: jedis) {
|
||||
exclude(module: 'commons-pool2')
|
||||
}
|
||||
testImplementation(group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.1.6.RELEASE') {
|
||||
|
||||
providedCompile group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: mariadbJdbc
|
||||
providedCompile group: 'org.projectlombok', name: 'lombok', version: lombok
|
||||
providedCompile group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat', version: springboot
|
||||
|
||||
testImplementation group: 'com.h2database', name: 'h2', version: '1.4.199'
|
||||
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: okhttp3
|
||||
testImplementation(group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: springboot) {
|
||||
exclude(module: 'commons-logging')
|
||||
}
|
||||
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'
|
||||
annotationProcessor group: 'org.mapstruct', name: 'mapstruct-processor', version: '1.3.0.Final'
|
||||
providedCompile group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.4.2'
|
||||
}
|
||||
|
||||
@@ -35,6 +35,7 @@ import io.minio.errors.InvalidArgumentException;
|
||||
import io.minio.errors.InvalidBucketNameException;
|
||||
import io.minio.errors.InvalidEndpointException;
|
||||
import io.minio.errors.InvalidPortException;
|
||||
import io.minio.errors.InvalidResponseException;
|
||||
import io.minio.errors.NoResponseException;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
@@ -113,9 +114,7 @@ public class CacheService
|
||||
{
|
||||
return ByteStreams.toByteArray(in);
|
||||
}
|
||||
catch (InvalidBucketNameException | NoSuchAlgorithmException | InsufficientDataException
|
||||
| IOException | InvalidKeyException | NoResponseException | XmlPullParserException
|
||||
| ErrorResponseException | InternalException | InvalidArgumentException ex)
|
||||
catch (InvalidBucketNameException | NoSuchAlgorithmException | InsufficientDataException | IOException | InvalidKeyException | NoResponseException | XmlPullParserException | ErrorResponseException | InternalException | InvalidArgumentException | InvalidResponseException ex)
|
||||
{
|
||||
log.warn(null, ex);
|
||||
return null;
|
||||
|
||||
@@ -44,4 +44,3 @@ classes.doLast() {
|
||||
File f = file("build/classes/java/main/Placeholder.class")
|
||||
f.delete()
|
||||
}
|
||||
|
||||
|
||||
@@ -5,26 +5,30 @@ def buildPath = buildDir.toString().replace('\\', '/') // this doesnt work in an
|
||||
def deobfuscatedJar = "${rootPath}/runescape-client/build/libs/rs-client-${project.version}.jar"
|
||||
def vanillaJar = "${buildPath}/vanilla-${rsversion}.jar"
|
||||
|
||||
|
||||
configurations {
|
||||
vanilla
|
||||
}
|
||||
|
||||
dependencies {
|
||||
annotationProcessor group: 'org.eclipse.sisu', name: 'org.eclipse.sisu.inject', version: sisu
|
||||
|
||||
compileOnly group: 'org.apache.maven.plugin-tools', name: 'maven-plugin-annotations', version: mavenPluginAnnotations
|
||||
|
||||
implementation group: 'com.google.guava', name: 'guava', version: guava
|
||||
implementation group: 'org.apache.maven', name: 'maven-plugin-api', version: mavenPluginApi
|
||||
implementation group: 'org.ow2.asm', name: 'asm', version: asm
|
||||
implementation group: 'org.ow2.asm', name: 'asm-util', version: asm
|
||||
implementation project(':deobfuscator')
|
||||
implementation project(':mixins')
|
||||
implementation project(':runelite-api')
|
||||
implementation project(':runescape-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.ow2.asm', name: 'asm-debug-all', version: '5.2'
|
||||
|
||||
testImplementation group: 'junit', name: 'junit', version: junit
|
||||
testImplementation group: 'org.mockito', name: 'mockito-core', version: mockito
|
||||
testImplementation project(':deobfuscator')
|
||||
testImplementation group: 'junit', name: 'junit', version: '4.12'
|
||||
testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.0.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.3.3'
|
||||
vanilla "net.runelite.rs:vanilla:${rsversion}"
|
||||
testImplementation project(path: ':deobfuscator', configuration: 'testArchives')
|
||||
|
||||
vanilla "net.runelite.rs:vanilla:${rsversion}"
|
||||
}
|
||||
|
||||
compileJava {
|
||||
@@ -55,6 +59,3 @@ compileJava.doLast() {
|
||||
}
|
||||
}
|
||||
}
|
||||
test {
|
||||
|
||||
}
|
||||
@@ -1,9 +1,13 @@
|
||||
description = 'Protocol API'
|
||||
|
||||
dependencies {
|
||||
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombok
|
||||
|
||||
compileOnly group: 'org.projectlombok', name: 'lombok', version: lombok
|
||||
|
||||
implementation group: 'com.google.guava', name: 'guava', version: guava
|
||||
implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4j
|
||||
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'
|
||||
|
||||
testImplementation group: 'junit', name: 'junit', version: junit
|
||||
}
|
||||
|
||||
@@ -1,11 +1,16 @@
|
||||
description = 'Protocol'
|
||||
|
||||
dependencies {
|
||||
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombok
|
||||
|
||||
api project(':protocol-api')
|
||||
|
||||
compileOnly group: 'org.projectlombok', name: 'lombok', version: lombok
|
||||
|
||||
implementation group: 'com.google.guava', name: 'guava', version: guava
|
||||
implementation group: 'io.netty', name: 'netty-all', version: netty
|
||||
implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4j
|
||||
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'
|
||||
|
||||
testImplementation group: 'junit', name: 'junit', version: junit
|
||||
}
|
||||
|
||||
@@ -1,8 +1,12 @@
|
||||
description = 'RuneLite API'
|
||||
|
||||
dependencies {
|
||||
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'
|
||||
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombok
|
||||
|
||||
compileOnly group: 'org.projectlombok', name: 'lombok', version: lombok
|
||||
|
||||
implementation group: 'com.google.code.findbugs', name: 'jsr305', version: findbugs
|
||||
implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4j
|
||||
|
||||
testImplementation group: 'junit', name: 'junit', version: junit
|
||||
}
|
||||
|
||||
@@ -9,57 +9,63 @@ plugins {
|
||||
description = 'RuneLite Client'
|
||||
|
||||
dependencies {
|
||||
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') {
|
||||
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombok
|
||||
|
||||
compileOnly group: 'net.runelite', name: 'orange-extensions', version: orangeExtensions
|
||||
compileOnly group: 'org.projectlombok', name: 'lombok', version: lombok
|
||||
|
||||
implementation group: 'ch.qos.logback', name: 'logback-classic', version: logback
|
||||
implementation group: 'com.google.code.gson', name: 'gson', version: gson
|
||||
implementation group: 'com.google.guava', name: 'guava', version: guava
|
||||
implementation group: 'com.google.inject', name: 'guice', version: guice, classifier: 'no_aop'
|
||||
implementation group: 'com.jakewharton.rxrelay2', name: 'rxrelay', version: rxrelay
|
||||
implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: okhttp3
|
||||
implementation group: 'io.reactivex.rxjava2', name: 'rxjava', version: rxjava
|
||||
implementation group: 'net.java.dev.jna', name: 'jna', version: jna
|
||||
implementation group: 'net.java.dev.jna', name: 'jna-platform', version: jna
|
||||
implementation group: 'net.runelite', name: 'discord', version: discord
|
||||
implementation group: 'net.runelite.pushingpixels', name: 'substance', version: substance
|
||||
implementation group: 'net.sf.jopt-simple', name: 'jopt-simple', version: jopt
|
||||
implementation group: 'org.apache.commons', name: 'commons-text', version: apacheCommonsText
|
||||
implementation group: 'org.apache.httpcomponents', name: 'httpcore', version: httpcore
|
||||
implementation group: 'org.apache.httpcomponents', name: 'httpmime', version: httpmime
|
||||
implementation group: 'org.codehaus.plexus', name: 'plexus-utils', version: plexus
|
||||
implementation group: 'org.javassist', name: 'javassist', version: javassist
|
||||
implementation group: 'org.jetbrains', name: 'annotations', version: annotations
|
||||
implementation group: 'org.jogamp.gluegen', name: 'gluegen-rt', version: jogamp
|
||||
implementation group: 'org.jogamp.jogl', name: 'jogl-all', version: jogamp
|
||||
implementation group: 'org.ow2.asm', name: 'asm-tree', version: asm
|
||||
implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4j
|
||||
implementation group: 'org.xeustechnologies', name: 'jcl-core', version: jclCore
|
||||
implementation project(':http-api')
|
||||
implementation project(':runelite-api')
|
||||
implementation(group: 'io.sigpipe', name: 'jbsdiff', version: jbsdiff) {
|
||||
exclude(module: 'xz')
|
||||
}
|
||||
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: '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'
|
||||
runtime group: 'org.jogamp.jogl', name: 'jogl-all', version: '2.3.2', classifier: 'natives-linux-amd64'
|
||||
runtime group: 'org.jogamp.jogl', name: 'jogl-all', version: '2.3.2', classifier: 'natives-linux-i586'
|
||||
runtime group: 'org.jogamp.gluegen', name: 'gluegen-rt', version: '2.3.2', classifier: 'natives-windows-amd64'
|
||||
runtime group: 'org.jogamp.gluegen', name: 'gluegen-rt', version: '2.3.2', classifier: 'natives-windows-i586'
|
||||
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')
|
||||
|
||||
runtime group: 'net.runelite.pushingpixels', name: 'trident', version: trident
|
||||
runtime group: 'org.jogamp.gluegen', name: 'gluegen-rt', version: jogamp, classifier: 'natives-linux-amd64'
|
||||
runtime group: 'org.jogamp.gluegen', name: 'gluegen-rt', version: jogamp, classifier: 'natives-linux-i586'
|
||||
runtime group: 'org.jogamp.gluegen', name: 'gluegen-rt', version: jogamp, classifier: 'natives-windows-amd64'
|
||||
runtime group: 'org.jogamp.gluegen', name: 'gluegen-rt', version: jogamp, classifier: 'natives-windows-i586'
|
||||
runtime group: 'org.jogamp.jogl', name: 'jogl-all', version: jogamp, classifier: 'natives-linux-amd64'
|
||||
runtime group: 'org.jogamp.jogl', name: 'jogl-all', version: jogamp, classifier: 'natives-linux-i586'
|
||||
runtime group: 'org.jogamp.jogl', name: 'jogl-all', version: jogamp, classifier: 'natives-windows-amd64'
|
||||
runtime group: 'org.jogamp.jogl', name: 'jogl-all', version: jogamp, classifier: 'natives-windows-i586'
|
||||
runtime project(':injected-client')
|
||||
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-core', version: '3.0.0'
|
||||
testImplementation group: 'org.mockito', name: 'mockito-inline', version: '3.0.0'
|
||||
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'
|
||||
runtime project(':runescape-api')
|
||||
|
||||
testAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombok
|
||||
|
||||
testCompileOnly group: 'org.projectlombok', name: 'lombok', version: lombok
|
||||
|
||||
testImplementation group: 'com.google.inject.extensions', name: 'guice-grapher', version: guice
|
||||
testImplementation group: 'com.google.inject.extensions', name: 'guice-testlib', version: guice
|
||||
testImplementation group: 'junit', name: 'junit', version: junit
|
||||
testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: hamcrest
|
||||
testImplementation group: 'org.mockito', name: 'mockito-core', version: mockito
|
||||
testImplementation group: 'org.mockito', name: 'mockito-inline', version: mockito
|
||||
testImplementation group: 'org.slf4j', name: 'slf4j-api', version: slf4j
|
||||
}
|
||||
|
||||
static def getDate() {
|
||||
|
||||
@@ -1,10 +1,13 @@
|
||||
description = 'RuneLite Mixins'
|
||||
|
||||
dependencies {
|
||||
compileOnly group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'
|
||||
compileOnly group: 'com.google.guava', name: 'guava', version: guava
|
||||
compileOnly group: 'javax.inject', name: 'javax.inject', version: javaxInject
|
||||
compileOnly group: 'org.slf4j', name: 'slf4j-api', version: slf4j
|
||||
|
||||
implementation project(':runescape-api')
|
||||
compileOnly group: 'com.google.guava', name: 'guava', version: '28.0-jre'
|
||||
compileOnly group: 'javax.inject', name: 'javax.inject', version: '1'
|
||||
}
|
||||
|
||||
tasks.withType(JavaCompile){
|
||||
options.compilerArgs.addAll('-source', '7', '-Xlint:-unchecked')
|
||||
}
|
||||
@@ -1,12 +1,15 @@
|
||||
description = 'Script Assembler Plugin'
|
||||
|
||||
dependencies {
|
||||
annotationProcessor group: 'org.eclipse.sisu', name: 'org.eclipse.sisu.inject', version: sisu
|
||||
|
||||
compileOnly group: 'org.apache.maven.plugin-tools', name: 'maven-plugin-annotations', version: mavenPluginAnnotations
|
||||
|
||||
implementation group: 'com.google.guava', name: 'guava', version: guava
|
||||
implementation group: 'org.apache.maven', name: 'maven-plugin-api', version: mavenPluginApi
|
||||
implementation group: 'org.slf4j', name: 'slf4j-nop', version: slf4j
|
||||
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'
|
||||
}
|
||||
|
||||
compileJava.outputs.upToDateWhen {false}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
group = 'net.runelite.rs'
|
||||
description = 'RuneScape API'
|
||||
|
||||
dependencies {
|
||||
api project(':runelite-api')
|
||||
}
|
||||
|
||||
@@ -1,11 +1,14 @@
|
||||
group = 'net.runelite.rs'
|
||||
description = 'RuneScape Client'
|
||||
|
||||
dependencies {
|
||||
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'
|
||||
|
||||
testImplementation group: 'junit', name: 'junit', version: junit
|
||||
testImplementation group: 'org.slf4j', name: 'slf4j-api', version: slf4j
|
||||
testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: slf4j
|
||||
}
|
||||
|
||||
tasks.withType(JavaCompile) {
|
||||
options.compilerArgs.addAll('-g:source,vars,lines', '-Xlint:-unchecked')
|
||||
}
|
||||
Reference in New Issue
Block a user