Skip to content

update dependencies and Gradle #516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danthe1st merged 2 commits into from
Jul 12, 2025
Merged

update dependencies and Gradle #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2dccc02
update dependencies
danthe1st May 29, 2025
ad97762
update DIH4JDA
danthe1st Jun 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import com.github.jengelman.gradle.plugins.shadow.transformers.*
plugins {
java
id("com.github.johnrengelman.shadow") version "8.1.1"
id("org.springframework.boot") version "3.4.3"
id("org.springframework.boot") version "3.5.0"
id("io.spring.dependency-management") version "1.1.7"
id("org.graalvm.buildtools.native") version "0.10.5"
id("org.graalvm.buildtools.native") version "0.10.6"
checkstyle
}

Expand All @@ -31,15 +31,15 @@ dependencies {
compileOnly("org.jetbrains:annotations:26.0.2")

// DIH4JDA (Command Framework) & JDA
implementation("com.github.DynxstyGIT:DIH4JDA:120a15ad2e")
implementation("net.dv8tion:JDA:5.3.0") {
implementation("com.github.DynxstyGIT:DIH4JDA:a64b5a9dc5")
implementation("net.dv8tion:JDA:5.5.1") {
exclude(module = "opus-java")
}

// Caffeine (Caching Library)
implementation("com.github.ben-manes.caffeine:caffeine:3.2.0")

implementation("com.google.code.gson:gson:2.12.0")
implementation("com.google.code.gson:gson:2.13.1")
implementation("org.yaml:snakeyaml:2.4")
implementation("com.google.re2j:re2j:1.8")
implementation("commons-validator:commons-validator:1.9.0")
Expand All @@ -54,13 +54,13 @@ dependencies {
implementation("com.github.DynxstyGIT:discord-webhooks:74301a46a0")

// Lombok Annotations
compileOnly("org.projectlombok:lombok:1.18.36")
annotationProcessor("org.projectlombok:lombok:1.18.36")
testCompileOnly("org.projectlombok:lombok:1.18.30")
testAnnotationProcessor("org.projectlombok:lombok:1.18.30")
compileOnly("org.projectlombok:lombok:1.18.38")
annotationProcessor("org.projectlombok:lombok:1.18.38")
testCompileOnly("org.projectlombok:lombok:1.18.38")
testAnnotationProcessor("org.projectlombok:lombok:1.18.38")

// Sentry
implementation("io.sentry:sentry:8.3.0")
implementation("io.sentry:sentry:8.13.2")

// Spring
implementation("org.springframework.boot:spring-boot-starter-web")
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
12 changes: 7 additions & 5 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 14 additions & 12 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion src/main/java/net/discordjug/javabot/RuntimeHintsConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.nio.channels.Channel;

import club.minnced.discord.webhook.send.WebhookEmbed;
import com.zaxxer.hikari.HikariConfig;
import net.discordjug.javabot.data.config.BotConfig;
import net.discordjug.javabot.data.config.GuildConfig;
import net.discordjug.javabot.data.config.GuildConfigItem;
Expand All @@ -26,6 +27,7 @@
import net.dv8tion.jda.api.entities.sticker.GuildSticker;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import net.dv8tion.jda.api.managers.AudioManager;
import net.dv8tion.jda.internal.entities.GuildVoiceStateImpl;
import net.dv8tion.jda.internal.entities.MemberPresenceImpl;
import net.dv8tion.jda.internal.requests.restaction.PermOverrideData;
import org.h2.server.TcpServer;
Expand All @@ -50,7 +52,9 @@
//ensure JDA can create necessary caches
User[].class, Guild[].class, Member[].class, Role[].class, Channel[].class, AudioManager[].class, ScheduledEvent[].class, ThreadMember[].class, ForumTag[].class, RichCustomEmoji[].class, GuildSticker[].class, MemberPresenceImpl[].class,
//needs to be serialized for channel managers etc
PermOverrideData.class
PermOverrideData.class,

HikariConfig.class
})
public class RuntimeHintsConfiguration implements RuntimeHintsRegistrar {

Expand All @@ -76,5 +80,7 @@ public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
for (Class<?> cl : WebhookEmbed.class.getClasses()) {
hints.reflection().registerType(cl, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_METHODS);
}

hints.reflection().registerType(GuildVoiceStateImpl[].class, MemberCategory.UNSAFE_ALLOCATED);
}
}