Support for 6.0.0-rc.1

.github/workflows/build.yml

@@ -11,9 +11,9 @@ jobs:
         java: [8, 11, 17]
       fail-fast: true
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: JDK ${{ matrix.java }}
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'

build.gradle

@@ -36,7 +36,7 @@ allprojects {
     version = versionInfo.values().join('.')
 
     ext {
-        jdaVersion = '5.3.0'
+        jdaVersion = '6.0.0-rc.1'
         slf4jVersion = '1.7.36'
         okhttpVersion = '4.9.3'
         findbugsVersion = '3.0.2'

menu/src/main/java/com/jagrosh/jdautilities/menu/ButtonEmbedPaginator.java

@@ -17,6 +17,9 @@
 
 import com.jagrosh.jdautilities.commons.waiter.EventWaiter;
 import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.components.actionrow.ActionRow;
+import net.dv8tion.jda.api.components.buttons.Button;
+import net.dv8tion.jda.api.components.buttons.ButtonStyle;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.entities.Role;
@@ -25,8 +28,6 @@
 import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import net.dv8tion.jda.api.interactions.InteractionHook;
-import net.dv8tion.jda.api.interactions.components.buttons.Button;
-import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
 import net.dv8tion.jda.api.requests.RestAction;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
 import net.dv8tion.jda.api.utils.messages.MessageEditBuilder;
@@ -169,19 +170,20 @@ else if (pageNum > embeds.size())
     private void initialize(RestAction<Message> action, int pageNum) {
         action.queue(m -> {
             if (embeds.size() > 1) {
-                List<Button> actions = buildButtons();
+                ActionRow actions = buildButtons();
 
-                m.editMessage(renderPage(pageNum)).setActionRow(actions).queue(v -> pagination(m, pageNum));
+                m.editMessage(renderPage(pageNum)).setComponents(actions).queue(v -> pagination(m, pageNum));
             } else if (waitOnSinglePage) {
                 String id = System.currentTimeMillis() + ":STOP";
-                m.editMessage(renderPage(pageNum)).setActionRow(Button.of(style, id, STOP)).queue(v -> pagination(m, pageNum));
+                ActionRow button = ActionRow.of(Button.of(style, id, STOP));
+                m.editMessage(renderPage(pageNum)).setComponents(button).queue(v -> pagination(m, pageNum));
             } else {
                 finalAction.accept(m);
             }
         });
     }
 
-    private List<Button> buildButtons() {
+    private ActionRow buildButtons() {
         // bep = button embed paginator
         String id = "bep:" + System.currentTimeMillis();
         List<Button> actions = new ArrayList<>();
@@ -194,7 +196,7 @@ private List<Button> buildButtons() {
             actions.add(Button.of(style, id + ":BIG_RIGHT", BIG_RIGHT));
         }
 
-        return actions;
+        return ActionRow.of(actions);
     }
 
     private void pagination(Message message, int pageNum) {
@@ -271,7 +273,7 @@ private void handleButtonInteraction(ButtonInteractionEvent event, Message messa
 
         int n = newPageNum;
         event.deferEdit().queue(
-            interactionHook -> message.editMessage(renderPage(n)).setActionRow(buildButtons()).queue(m -> pagination(m, n))
+            interactionHook -> message.editMessage(renderPage(n)).setComponents(buildButtons()).queue(m -> pagination(m, n))
         );
     }