Update dependencies and bump to 0.8.2

Author: MinnDevelopment

README.md

@@ -163,9 +163,9 @@ WebhookClient.setDefaultErrorHandler((client, message, throwable) -> {
 
 This library also supports sending webhook messages with integration from other libraries such as
 
-- [JDA](/DV8FromTheWorld/JDA) (version 5.0.0-alpha.1) with [JDAWebhookClient](https://github.com/MinnDevelopment/discord-webhooks/blob/master/src/main/java/club/minnced/discord/webhook/external/JDAWebhookClient.java)
-- [Discord4J](Discord4J/Discord4J) (version 3.2.1) with [D4JWebhookClient](https://github.com/MinnDevelopment/discord-webhooks/blob/master/src/main/java/club/minnced/discord/webhook/external/D4JWebhookClient.java)
-- [Javacord](/Javacord/Javacord) (version 3.3.2) with [JavacordWebhookClient](https://github.com/MinnDevelopment/discord-webhooks/blob/master/src/main/java/club/minnced/discord/webhook/external/JavacordWebhookClient.java)
+- [JDA](/DV8FromTheWorld/JDA) (version 5.0.0-alpha.13) with [JDAWebhookClient](https://github.com/MinnDevelopment/discord-webhooks/blob/master/src/main/java/club/minnced/discord/webhook/external/JDAWebhookClient.java)
+- [Discord4J](/Discord4J/Discord4J) (version 3.2.2) with [D4JWebhookClient](https://github.com/MinnDevelopment/discord-webhooks/blob/master/src/main/java/club/minnced/discord/webhook/external/D4JWebhookClient.java)
+- [Javacord](/Javacord/Javacord) (version 3.4.0) with [JavacordWebhookClient](https://github.com/MinnDevelopment/discord-webhooks/blob/master/src/main/java/club/minnced/discord/webhook/external/JavacordWebhookClient.java)
 
 ### Example JDA
 

build.gradle.kts

@@ -12,7 +12,7 @@ plugins {
 
 val major = "0"
 val minor = "8"
-val patch = "0"
+val patch = "2"
 
 group = "club.minnced"
 version = "$major.$minor.$patch"
@@ -44,13 +44,13 @@ repositories {
 
 val versions = mapOf(
     "slf4j" to "1.7.32",
-    "okhttp" to "3.14.9",
+    "okhttp" to "4.10.0",
     "json" to "20210307",
-    "jda" to "5.0.0-alpha.1",
-    "discord4j" to "3.2.1",
-    "javacord" to "3.3.2",
+    "jda" to "5.0.0-alpha.13",
+    "discord4j" to "3.2.2",
+    "javacord" to "3.4.0",
     "junit" to "4.13.2",
-    "mockito" to "3.6.28", // must be compatible with powermock
+    "mockito" to "3.12.4", // must be compatible with powermock
     "powermock" to "2.0.9",
     "logback" to "1.2.3",
     "annotations" to "22.0.0"
@@ -146,7 +146,7 @@ configure<JavaPluginExtension> {
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-val test: Task by tasks
+val test: Test by tasks
 val build: Task by tasks
 build.apply {
     dependsOn(javadocJar)
@@ -155,6 +155,12 @@ build.apply {
     dependsOn(test)
 }
 
+test.apply {
+    if (JavaVersion.current().isJava11Compatible) doFirst {
+        jvmArgs = listOf("--illegal-access=permit")
+    }
+}
+
 // Generate pom file for maven central
 
 fun generatePom(): MavenPom.() -> Unit {

src/main/java/club/minnced/discord/webhook/send/WebhookMessageBuilder.java

@@ -25,6 +25,7 @@
 import discord4j.discordjson.json.MessageEditRequest;
 import discord4j.discordjson.possible.Possible;
 import discord4j.rest.util.MultipartRequest;
+import net.dv8tion.jda.api.entities.Mentions;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.Role;
 import net.dv8tion.jda.api.entities.User;
@@ -449,15 +450,16 @@ public static WebhookMessageBuilder fromJDA(@NotNull net.dv8tion.jda.api.entitie
             builder.setAllowedMentions(allowedMentions);
         } else if (message instanceof ReceivedMessage) {
             AllowedMentions allowedMentions = AllowedMentions.none();
+            Mentions mentions = message.getMentions();
             allowedMentions.withRoles(
-                message.getMentionedRoles().stream()
+                mentions.getRoles().stream()
                     .map(Role::getId)
                     .collect(Collectors.toList()));
             allowedMentions.withUsers(
-                message.getMentionedUsers().stream()
+                mentions.getUsers().stream()
                     .map(User::getId)
                     .collect(Collectors.toList()));
-            allowedMentions.withParseEveryone(message.mentionsEveryone());
+            allowedMentions.withParseEveryone(mentions.mentionsEveryone());
             builder.setAllowedMentions(allowedMentions);
             builder.setEphemeral(message.isEphemeral());
         }

src/test/java/root/IOTestUtil.java

@@ -30,6 +30,7 @@
 import java.util.regex.Pattern;
 import java.util.zip.GZIPOutputStream;
 
+@SuppressWarnings("deprecation")
 public class IOTestUtil {
 
     public static boolean isMultiPart(RequestBody body) {

src/test/java/root/send/MessageTest.java

@@ -23,6 +23,7 @@
 import club.minnced.discord.webhook.send.WebhookMessageBuilder;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.MessageBuilder;
+import net.dv8tion.jda.api.entities.Mentions;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.internal.entities.DataMessage;
@@ -44,9 +45,9 @@
 import java.util.List;
 import java.util.Map;
 
+import static org.mockito.Answers.RETURNS_DEFAULTS;
 import static org.mockito.Mockito.CALLS_REAL_METHODS;
-import static org.powermock.api.mockito.PowerMockito.mock;
-import static org.powermock.api.mockito.PowerMockito.when;
+import static org.powermock.api.mockito.PowerMockito.*;
 
 public class MessageTest {
     private WebhookMessageBuilder builder;
@@ -170,9 +171,11 @@ public void buildMessageWithReceivedMessage() {
               .build();
 
         Message jdaMessage = mock(ReceivedMessage.class, CALLS_REAL_METHODS);
+        Mentions mentions = mock(Mentions.class, RETURNS_DEFAULTS);
         when(jdaMessage.isTTS()).thenReturn(true);
         when(jdaMessage.getContentRaw()).thenReturn("myContent");
         when(jdaMessage.getEmbeds()).thenReturn(Arrays.asList(jdaEmbed));
+        when(jdaMessage.getMentions()).thenReturn(mentions);
 
         WebhookMessage webhookMessage = WebhookMessageBuilder.fromJDA(jdaMessage).build();
         List<WebhookEmbed> webhookEmbeds = webhookMessage.getEmbeds();