From 5b16da6400e47f4999031ee6b9afa44201685b83 Mon Sep 17 00:00:00 2001 From: Napster Date: Sat, 9 Nov 2024 21:46:13 +0100 Subject: [PATCH] Bump JDA --- gradle.lockfile | 7 +++++-- gradle.properties | 2 +- .../space/npstr/wolfia/config/ShardManagerFactory.java | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gradle.lockfile b/gradle.lockfile index 3b5d4d30..f173afc0 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -36,7 +36,9 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=compileClasspath,implementationD com.google.auto.service:auto-service-annotations:1.1.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.code.gson:gson:2.10.1=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.21.1=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.crypto.tink:tink:1.14.1=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.21.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.22.0=productionRuntimeClasspath com.google.errorprone:error_prone_annotations:2.28.0=testImplementationDependenciesMetadata com.google.guava:failureaccess:1.0.1=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.2=testImplementationDependenciesMetadata @@ -45,6 +47,7 @@ com.google.guava:guava:33.3.0-jre=testImplementationDependenciesMetadata com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.j2objc:j2objc-annotations:1.3=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:3.0.0=testImplementationDependenciesMetadata +com.google.protobuf:protobuf-java:3.25.3=productionRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20220608.1=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.neovisionaries:nv-websocket-client:2.14=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -120,7 +123,7 @@ junit:junit:4.13.2=testCompileClasspath,testImplementationDependenciesMetadata,t net.bytebuddy:byte-buddy-agent:1.14.19=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath net.bytebuddy:byte-buddy:1.14.19=productionRuntimeClasspath,runtimeClasspath net.bytebuddy:byte-buddy:1.15.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -net.dv8tion:JDA:5.0.2=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.dv8tion:JDA:5.2.0=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath net.java.dev.jna:jna:4.4.0=productionRuntimeClasspath,runtimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath net.minidev:accessors-smart:2.5.1=compileClasspath,implementationDependenciesMetadata,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath diff --git a/gradle.properties b/gradle.properties index 4a0208d3..b7e80ab8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -43,7 +43,7 @@ frontendPluginVersion=[6.0.0, 7.0[ theNodeVersion=20.12.2 theYarnVersion=1.22.19 -jdaVersion=[5.0.0-beta.9, 5.1[ +jdaVersion=[5.2.0, 5.3[ discordWebhooksVersion=[0.8.2, 1.0[ sentryVersion=[7.3.0, 8.0[ orgJsonVersion=20231013 diff --git a/src/main/java/space/npstr/wolfia/config/ShardManagerFactory.java b/src/main/java/space/npstr/wolfia/config/ShardManagerFactory.java index 305c68d9..174005f0 100644 --- a/src/main/java/space/npstr/wolfia/config/ShardManagerFactory.java +++ b/src/main/java/space/npstr/wolfia/config/ShardManagerFactory.java @@ -39,7 +39,7 @@ import static net.dv8tion.jda.api.requests.GatewayIntent.DIRECT_MESSAGES; import static net.dv8tion.jda.api.requests.GatewayIntent.DIRECT_MESSAGE_REACTIONS; import static net.dv8tion.jda.api.requests.GatewayIntent.DIRECT_MESSAGE_TYPING; -import static net.dv8tion.jda.api.requests.GatewayIntent.GUILD_EMOJIS_AND_STICKERS; +import static net.dv8tion.jda.api.requests.GatewayIntent.GUILD_EXPRESSIONS; import static net.dv8tion.jda.api.requests.GatewayIntent.GUILD_MEMBERS; import static net.dv8tion.jda.api.requests.GatewayIntent.GUILD_MESSAGES; import static net.dv8tion.jda.api.requests.GatewayIntent.GUILD_MESSAGE_REACTIONS; @@ -61,7 +61,7 @@ public class ShardManagerFactory { private static final List GATEWAY_INTENTS = List.of( //GUILDS, not supported to be turned off by JDA, listed for documentation. - GUILD_EMOJIS_AND_STICKERS, // we use some custom ones, and usage will likely grow bigger in the future, so its a good idea to stay up to date with these + GUILD_EXPRESSIONS, // we use some custom emojis, and usage will likely grow bigger in the future, so its a good idea to stay up to date with these GUILD_MESSAGES, // process messages in guilds DIRECT_MESSAGES, // we have some in-game roles that send their commands in DMs GUILD_MESSAGE_REACTIONS, // some reactions are used, for example when voting in the wolf chat