From 5a0c48d7db8e92e0a6695b5d78256565cd8c0721 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 17:27:59 +0000 Subject: [PATCH 1/2] Update dependency net.dv8tion:JDA to v5.0.0-beta.24 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 62aa604..60ecb4c 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ <dependency> <groupId>net.dv8tion</groupId> <artifactId>JDA</artifactId> - <version>5.0.0-alpha.21</version> + <version>5.0.0-beta.24</version> </dependency> <!-- https://javalibs.com/artifact/org.apache.commons/commons-lang3 --> From 1b53f7558d49b5aa7e648a9daa7326b6bc25d425 Mon Sep 17 00:00:00 2001 From: RettichLP <rettichlp01@gmail.com> Date: Wed, 3 Jul 2024 19:30:38 +0200 Subject: [PATCH 2/2] Resolve dependency conflicts --- .../turniptales/discord/events/ButtonInteractionListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/turniptales/discord/events/ButtonInteractionListener.java b/src/main/java/net/turniptales/discord/events/ButtonInteractionListener.java index 25cfef0..cbe3f0f 100644 --- a/src/main/java/net/turniptales/discord/events/ButtonInteractionListener.java +++ b/src/main/java/net/turniptales/discord/events/ButtonInteractionListener.java @@ -7,9 +7,9 @@ import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; import net.dv8tion.jda.api.interactions.components.ActionRow; -import net.dv8tion.jda.api.interactions.components.Modal; import net.dv8tion.jda.api.interactions.components.text.TextInput; import net.dv8tion.jda.api.interactions.components.text.TextInputStyle; +import net.dv8tion.jda.api.interactions.modals.Modal; import net.turniptales.discord.Config; import java.util.EnumSet; @@ -19,11 +19,11 @@ import static java.util.concurrent.TimeUnit.SECONDS; import static net.dv8tion.jda.api.Permission.VIEW_CHANNEL; import static net.dv8tion.jda.api.entities.emoji.Emoji.fromUnicode; -import static net.dv8tion.jda.api.interactions.components.Modal.create; import static net.dv8tion.jda.api.interactions.components.buttons.Button.danger; import static net.dv8tion.jda.api.interactions.components.buttons.Button.secondary; import static net.dv8tion.jda.api.interactions.components.buttons.Button.success; import static net.dv8tion.jda.api.interactions.components.text.TextInputStyle.PARAGRAPH; +import static net.dv8tion.jda.api.interactions.modals.Modal.create; import static net.turniptales.discord.Config.GUILD; import static net.turniptales.discord.Config.MODERATOR_ROLE; import static net.turniptales.discord.Config.SENIOR_MODERATOR_ROLE;