ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #2832 from open-osrs/GRADLE-DEPS-UPDATE

Browse Source 
gradle: Update gradle dependencies
This commit is contained in:
Owain van Brakel
2020-10-21 13:11:47 +02:00
committed by GitHub
parent 900c0a6a35 d56f4da47d
commit 72ec1b1488
12 changed files with 42 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@@ -41,7 +41,7 @@ buildscript {
}
plugins {
id("com.adarshr.test-logger") version "2.1.0" apply false
id("com.adarshr.test-logger") version "2.1.1" apply false
id("com.github.ben-manes.versions") version "0.33.0"
id("se.patrikerdes.use-latest-versions") version "0.2.15"
id("org.ajoberstar.grgit") version "4.1.0"

14
cache/cache.gradle.kts vendored
View File

@@ -32,26 +32,26 @@ plugins {
description = "Cache"
dependencies {
annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.12")
annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.16")
api(project(":http-api"))
compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.12")
compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.16")
implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6")
implementation(group = "com.google.guava", name = "guava", version = "29.0-jre")
implementation(group = "com.google.guava", name = "guava", version = "30.0-jre")
implementation(group = "commons-cli", name = "commons-cli", version = "1.4")
implementation(group = "io.netty", name = "netty-buffer", version = "4.1.52.Final")
implementation(group = "io.netty", name = "netty-buffer", version = "4.1.53.Final")
implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.9.0")
implementation(group = "org.antlr", name = "antlr4-runtime", version = "4.8-1")
implementation(group = "org.apache.commons", name = "commons-compress", version = "1.20")
implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30")
testAnnotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.12")
testAnnotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.16")
testCompileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.12")
testCompileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.16")
testImplementation(group = "junit", name = "junit", version = "4.13")
testImplementation(group = "junit", name = "junit", version = "4.13.1")
testImplementation(group = "net.runelite.rs", name = "cache", version = "${ProjectVersions.cacheversion}")
}

8
deobfuscator/deobfuscator.gradle.kts
View File

@@ -35,14 +35,14 @@ dependencies {
deobjars(group = "net.runelite.rs", name = "vanilla", version = ProjectVersions.rsversion.toString())
deobjars(project(":runescape-client"))
annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.12")
annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.16")
implementation(group = "org.jetbrains", name = "annotations", version = "20.1.0")
implementation(group = "org.ow2.asm", name = "asm", version = "9.0")
implementation(group = "org.ow2.asm", name = "asm-util", version = "9.0")
implementation(group = "net.runelite", name = "fernflower", version = "07082019")
implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6")
implementation(group = "com.google.guava", name = "guava", version = "29.0-jre")
implementation(group = "com.google.guava", name = "guava", version = "30.0-jre")
implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30")
implementation(project(":runelite-api"))
implementation(project(":runescape-api"))
@@ -50,8 +50,8 @@ dependencies {
runtimeOnly(group = "org.slf4j", name = "slf4j-simple", version = "1.7.30")
testImplementation(deobjars)
testImplementation(group = "junit", name = "junit", version = "4.13")
testImplementation(group = "org.mockito", name = "mockito-core", version = "3.5.13")
testImplementation(group = "junit", name = "junit", version = "4.13.1")
testImplementation(group = "org.mockito", name = "mockito-core", version = "3.5.15")
}
tasks {

10
http-api/http-api.gradle.kts
View File

@@ -28,20 +28,20 @@ import org.apache.tools.ant.filters.ReplaceTokens
description = "Web API"
dependencies {
annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.12")
annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.16")
compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.12")
compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.16")
implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6")
implementation(group = "com.google.guava", name = "guava", version = "29.0-jre")
implementation(group = "com.google.guava", name = "guava", version = "30.0-jre")
implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.9.0")
implementation(group = "io.reactivex.rxjava3", name = "rxjava", version = "3.0.6")
implementation(group = "io.reactivex.rxjava3", name = "rxjava", version = "3.0.7")
implementation(group = "org.apache.commons", name = "commons-csv", version = "1.8")
implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30")
implementation(project(":runelite-api"))
testImplementation(group = "com.squareup.okhttp3", name = "mockwebserver", version = "4.9.0")
testImplementation(group = "junit", name = "junit", version = "4.13")
testImplementation(group = "junit", name = "junit", version = "4.13.1")
testImplementation(group = "org.slf4j", name = "slf4j-simple", version = "1.7.30")
}

8
runelite-api/runelite-api.gradle.kts
View File

@@ -26,14 +26,14 @@
description = "RuneLite API"
dependencies {
annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.12")
annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.16")
compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.12")
compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.16")
implementation(group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2")
implementation(group = "com.google.guava", name = "guava", version = "29.0-jre")
implementation(group = "com.google.guava", name = "guava", version = "30.0-jre")
implementation(group = "org.apache.commons", name = "commons-text", version = "1.9")
implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30")
testImplementation(group = "junit", name = "junit", version = "4.13")
testImplementation(group = "junit", name = "junit", version = "4.13.1")
}

28
runelite-client/runelite-client.gradle.kts
View File

@@ -28,7 +28,7 @@ import java.text.SimpleDateFormat
import java.util.Date
plugins {
id("com.github.johnrengelman.shadow") version "6.0.0"
id("com.github.johnrengelman.shadow") version "6.1.0"
java
}
@@ -38,23 +38,23 @@ apply<BootstrapPlugin>()
description = "RuneLite Client"
dependencies {
annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.12")
annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.16")
annotationProcessor(group = "org.pf4j", name = "pf4j", version = "3.4.1")
api(project(":runelite-api"))
compileOnly(group = "javax.annotation", name = "javax.annotation-api", version = "1.3.2")
compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.12")
compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.16")
compileOnly(group = "net.runelite", name = "orange-extensions", version = "1.0")
implementation(group = "ch.qos.logback", name = "logback-classic", version = "1.2.3")
implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6")
implementation(group = "com.google.guava", name = "guava", version = "29.0-jre")
implementation(group = "com.google.guava", name = "guava", version = "30.0-jre")
implementation(group = "com.google.inject", name = "guice", version = "4.2.3", classifier = "no_aop")
implementation(group = "com.h2database", name = "h2", version = "1.4.200")
implementation(group = "com.jakewharton.rxrelay3", name = "rxrelay", version = "3.0.0")
implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.9.0")
implementation(group = "io.reactivex.rxjava3", name = "rxjava", version = "3.0.6")
implementation(group = "io.reactivex.rxjava3", name = "rxjava", version = "3.0.7")
implementation(group = "net.java.dev.jna", name = "jna", version = "5.6.0")
implementation(group = "org.jgroups", name = "jgroups", version = "5.0.4.Final")
implementation(group = "net.java.dev.jna", name = "jna-platform", version = "5.6.0")
@@ -63,10 +63,10 @@ dependencies {
implementation(group = "net.sf.jopt-simple", name = "jopt-simple", version = "5.0.4")
implementation(group = "org.apache.commons", name = "commons-text", version = "1.9")
implementation(group = "org.jetbrains", name = "annotations", version = "20.1.0")
implementation(group = "org.jooq", name = "jooq", version = "3.13.5")
implementation(group = "org.jooq", name = "jooq-codegen", version = "3.13.5")
implementation(group = "org.jooq", name = "jooq-meta", version = "3.13.5")
implementation(group = "io.sentry", name = "sentry-logback", version = "1.7.30")
implementation(group = "org.jooq", name = "jooq", version = "3.14.0")
implementation(group = "org.jooq", name = "jooq-codegen", version = "3.14.0")
implementation(group = "org.jooq", name = "jooq-meta", version = "3.14.0")
implementation(group = "io.sentry", name = "sentry-logback", version = "3.1.1")
implementation(group = "com.github.zafarkhaja", name = "java-semver", version = "0.9.0")
implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30")
implementation(group = "org.pf4j", name = "pf4j", version = "3.4.1") {
@@ -79,16 +79,16 @@ dependencies {
runtimeOnly(project(":injected-client"))
runtimeOnly(project(":runescape-api"))
testAnnotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.12")
testAnnotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.16")
testCompileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.12")
testCompileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.16")
testImplementation(group = "com.google.inject.extensions", name = "guice-grapher", version = "4.2.3")
testImplementation(group = "com.google.inject.extensions", name = "guice-testlib", version = "4.2.3")
testImplementation(group = "org.hamcrest", name = "hamcrest-library", version = "2.2")
testImplementation(group = "junit", name = "junit", version = "4.13")
testImplementation(group = "org.mockito", name = "mockito-core", version = "3.5.13")
testImplementation(group = "org.mockito", name = "mockito-inline", version = "3.5.13")
testImplementation(group = "junit", name = "junit", version = "4.13.1")
testImplementation(group = "org.mockito", name = "mockito-core", version = "3.5.15")
testImplementation(group = "org.mockito", name = "mockito-inline", version = "3.5.15")
testImplementation(group = "com.squareup.okhttp3", name = "mockwebserver", version = "4.9.0")
testImplementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30")
}

2
runelite-client/src/main/java/net/runelite/client/plugins/Plugin.java
View File

@@ -29,7 +29,6 @@ import com.google.inject.Binder;
import com.google.inject.Injector;
import com.google.inject.Module;
import io.reactivex.rxjava3.functions.Consumer;
import io.sentry.Sentry;
import java.lang.reflect.Method;
import java.util.Set;
import lombok.AccessLevel;
@@ -96,7 +95,6 @@ public abstract class Plugin implements Module, ExtensionPoint
if (method.getExceptionTypes().length != 0)
{
log.warn("Event handlers should handle all checked exceptions themselves " + method.toString());
Sentry.capture("EventHandler " + method.toString()); // Spam Owain's inbox with this :)
}
method.setAccessible(true);

2
runelite-client/src/main/java/net/runelite/client/ui/ClientPanel.java
View File

@@ -72,7 +72,7 @@ final class ClientPanel extends JPanel
{
JOptionPane.showMessageDialog(ClientUI.getFrame(), "Error loading Oldschool RuneScape!", "Error",
JOptionPane.ERROR_MESSAGE);
Sentry.capture(e);
Sentry.captureException(e);
}
((Client) client).getLogger().error(null, e);

2
runelite-mixins/runelite-mixins.gradle.kts
View File

@@ -26,7 +26,7 @@
description = "RuneLite Mixins"
dependencies {
compileOnly(group = "com.google.guava", name = "guava", version = "29.0-jre")
compileOnly(group = "com.google.guava", name = "guava", version = "30.0-jre")
compileOnly(group = "javax.inject", name = "javax.inject", version = "1")
compileOnly(group = "org.slf4j", name = "slf4j-api", version = "1.7.30")
compileOnly(project(":injection-annotations"))

2
runelite-script-assembler-plugin/runelite-script-assembler-plugin.gradle.kts
View File

@@ -32,7 +32,7 @@ dependencies {
compileOnly(group = "org.apache.maven.plugin-tools", name = "maven-plugin-annotations", version = "3.6.0")
implementation(group = "com.google.guava", name = "guava", version = "29.0-jre")
implementation(group = "com.google.guava", name = "guava", version = "30.0-jre")
implementation(group = "org.apache.maven", name = "maven-plugin-api", version = "3.6.3")
implementation(group = "org.slf4j", name = "slf4j-nop", version = "1.7.30")
implementation(project(":cache"))

2
runescape-client/runescape-client.gradle.kts
View File

@@ -29,7 +29,7 @@ description = "RuneScape Client"
dependencies {
implementation(project(":injection-annotations"))
testImplementation(group = "junit", name = "junit", version = "4.13")
testImplementation(group = "junit", name = "junit", version = "4.13.1")
testImplementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30")
testImplementation(group = "org.slf4j", name = "slf4j-simple", version = "1.7.30")
}

6
wiki-scraper/wiki-scraper.gradle.kts
View File

@@ -29,12 +29,12 @@ dependencies {
api(project(":cache"))
api(project(":runelite-api"))
annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.12")
annotationProcessor(group = "org.projectlombok", name = "lombok", version = "1.18.16")
compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.12")
compileOnly(group = "org.projectlombok", name = "lombok", version = "1.18.16")
implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6")
implementation(group = "com.google.guava", name = "guava", version = "29.0-jre")
implementation(group = "com.google.guava", name = "guava", version = "30.0-jre")
implementation(group = "com.github.petitparser", name = "java-petitparser", version = "2.3.1")
implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "4.9.0")
implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.30")