Dependency updates

Author: Matyrobbrt

build.gradle

@@ -67,7 +67,13 @@ javadoc {
 evaluationDependsOn(':config')
 
 configurations {
-    library.extendsFrom(implementation)
+    library {
+        extendsFrom(implementation)
+
+        // We do not need audio stuff
+        exclude module: 'tink'
+        exclude module: 'opus-java'
+    }
     module
     runtimeClasspath.extendsFrom(module, library)
 }
@@ -81,6 +87,7 @@ dependencies {
     api libs.jda
     implementation libs.trove4j
 
+    implementation libs.caffeine
     implementation libs.guava
     implementation libs.logback
 

config-api/build.gradle

@@ -7,6 +7,7 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 dependencies {
     api(libs.jda)
     api(libs.bundles.database)
+    implementation(libs.caffeine)
     implementation(libs.json)
     compileOnly(libs.annotations)
 }

gradle/libs.versions.toml

@@ -2,26 +2,26 @@
 graal = "25.0.2"
 groovy = "4.0.30"
 jdbi = "3.32.0"
-jackson = "2.20.0"
-jjwt = "0.10.5"
+jackson = "2.21.0"
+jjwt = "0.13.0"
 junit = "5.10.0"
 
 [libraries]
 
-angusmail = { module = "org.eclipse.angus:angus-mail", version = "2.0.1" }
+angusmail = { module = "org.eclipse.angus:angus-mail", version = "2.0.5" }
 annotations = { module = "org.jetbrains:annotations", version = "24.0.1" }
-args4j = { module = "args4j:args4j", version = "2.33" }
+args4j = { module = "args4j:args4j", version = "2.37" }
 assertj = { module = "org.assertj:assertj-core", version = "3.25.1" }
-autoservice = { module = "com.google.auto.service:auto-service", version = "1.0.1" }
 authlib = { module = "com.mojang:authlib", version = "7.0.61" }
 
-bcpkix = { module = "org.bouncycastle:bcpkix-jdk15on", version = "1.58" }
+bcpkix = { module = "org.bouncycastle:bcpkix-jdk18on", version = "1.83" }
 
+caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version = "3.2.3" }
 # TODO - switch back to the normal maven one once https://github.com/Chew/JDA-Chewtils/pull/93 is merged
 chewtils = { module = "com.github.Chew:JDA-Chewtils", version = "39a83bd8" }
 
-fastutil = { module = "it.unimi.dsi:fastutil", version = "8.5.12" }
-flyway = { module = "org.flywaydb:flyway-core", version = "8.5.13" }
+fastutil = { module = "it.unimi.dsi:fastutil", version = "8.5.18" }
+flyway = { module = "org.flywaydb:flyway-core", version = "12.0.0" }
 
 githubapi = { module = "org.kohsuke:github-api", version = "1.330" }
 graal-js = { module = "org.graalvm.js:js", version.ref = "graal" }
@@ -30,23 +30,23 @@ graal-js-scriptengine = { module = "org.graalvm.js:js-scriptengine", version.ref
 groovy = { module = "org.apache.groovy:groovy", version.ref = "groovy" }
 groovy-contracts = { module = "org.apache.groovy:groovy-contracts", version.ref = "groovy" }
 
-guava = { module = "com.google.guava:guava", version = "30.1.1-jre" }
+guava = { module = "com.google.guava:guava", version = "33.5.0-jre" }
 
-jda = { module = "net.dv8tion:JDA", version = "6.0.0" }
+jda = { module = "net.dv8tion:JDA", version = "6.3.0" }
 
 jdbi-core = { module = "org.jdbi:jdbi3-core", version.ref = "jdbi" }
 jdbi-sqlobject = { module = "org.jdbi:jdbi3-sqlobject", version.ref = "jdbi" }
 
 j2html = { module = "com.j2html:j2html", version = "1.6.0" }
 
 jackson-yaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", version.ref = "jackson" }
-javalin = { module = "io.javalin:javalin", version = "6.3.0" }
+javalin = { module = "io.javalin:javalin", version = "6.7.0" }
 
 jjwt-api = { module = "io.jsonwebtoken:jjwt-api", version.ref = "jjwt" }
 jjwt-impl = { module = "io.jsonwebtoken:jjwt-impl", version.ref = "jjwt" }
 jjwt-jackson = { module = "io.jsonwebtoken:jjwt-jackson", version.ref = "jjwt" }
 
-json = { module = "org.json:json", version = "20231013" }
+json = { module = "org.json:json", version = "20251224" }
 junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
 junit-api = { module = "org.junit.jupiter:junit-jupiter-api" }
 junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine" }
@@ -56,10 +56,10 @@ logback = { module = "ch.qos.logback:logback-classic", version = "1.5.6" }
 
 mavenartifact = { module = "org.apache.maven:maven-artifact", version = "3.9.1" }
 
-re2j = { module = "com.google.re2j:re2j", version = "1.7" }
+re2j = { module = "com.google.re2j:re2j", version = "1.8" }
 
 semver = { module = "com.matyrobbrt:semver-graaljs", version = "1.1.0" }
-sqlitejdbc = { module = "org.xerial:sqlite-jdbc", version = "3.40.0.0" }
+sqlitejdbc = { module = "org.xerial:sqlite-jdbc", version = "3.51.1.0" }
 
 trove4j = { module = "net.sf.trove4j:trove4j", version = "3.0.3" }
 

modules/logging/build.gradle

@@ -7,5 +7,6 @@ camelotModule {
 }
 
 dependencies {
+    library(libs.caffeine)
     library(libs.fastutil)
 }

modules/reminders/build.gradle

@@ -7,6 +7,7 @@ camelotModule {
 }
 
 dependencies {
-    library(libs.bundles.database)
     library(libs.guava)
+    library(libs.caffeine)
+    library(libs.bundles.database)
 }

src/main/java/net/neoforged/camelot/commands/moderation/ModerationCommand.java

@@ -25,8 +25,8 @@
 import net.neoforged.camelot.api.config.DateUtils;
 import net.neoforged.camelot.util.ModerationUtil;
 import net.neoforged.camelot.util.Utils;
+import org.jetbrains.annotations.Nullable;
 
-import javax.annotation.ParametersAreNullableByDefault;
 import java.time.Duration;
 import java.time.Instant;
 
@@ -98,8 +98,7 @@ protected final void execute(SlashCommandEvent event) {
      * @param moderator the moderator
      * @return if the target can be moderated, or {@code false} if the target and the moderators are the same user.
      */
-    @ParametersAreNullableByDefault
-    protected final boolean canModerate(Member target, Member moderator) {
+    protected final boolean canModerate(@Nullable Member target, @Nullable Member moderator) {
         Preconditions.checkArgument(target != null, "Unknown user!");
         Preconditions.checkArgument(moderator != null, "Can only run command in guild!");
         Preconditions.checkArgument(target.getIdLong() != moderator.getIdLong(), "Cannot moderate yourself!");

src/main/java/net/neoforged/camelot/script/fs/ScriptPath.java

@@ -1,6 +1,5 @@
 package net.neoforged.camelot.script.fs;
 
-import javax.annotation.ParametersAreNonnullByDefault;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -19,7 +18,6 @@
 import java.util.function.IntBinaryOperator;
 import java.util.stream.IntStream;
 
-@ParametersAreNonnullByDefault
 public record ScriptPath(ScriptFileSystem fileSystem, boolean absolute, String[] pathParts,
                          Function<ScriptPath, ScriptPath> normalized /* lazily-compute the normalized path */) implements Path {
 

src/main/java/net/neoforged/camelot/services/ModerationRecorderService.java

@@ -1,8 +1,8 @@
 package net.neoforged.camelot.services;
 
 import net.dv8tion.jda.api.entities.Guild;
+import org.jetbrains.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.time.Duration;
 import java.util.UUID;
 

src/main/java/net/neoforged/camelot/util/ModerationUtil.java

@@ -7,8 +7,8 @@
 import net.neoforged.camelot.Bot;
 import net.neoforged.camelot.db.transactionals.PendingUnbansDAO;
 import net.neoforged.camelot.services.ModerationRecorderService;
+import org.jetbrains.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.sql.Timestamp;
 import java.time.Duration;
 import java.time.Instant;

src/main/java/net/neoforged/camelot/util/jda/AppEmojiManager.java

@@ -15,8 +15,8 @@
 import org.codehaus.plexus.util.FileUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.NonNull;
 
-import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.time.OffsetDateTime;
@@ -143,7 +143,7 @@ private static class DelegatedEmoji implements CustomEmoji, EmojiUnion {
         protected CustomEmoji emoji;
 
         @Override
-        @Nonnull
+        @NonNull
         public Type getType() {
             return emoji.getType();
         }
@@ -154,25 +154,25 @@ public boolean isAnimated() {
         }
 
         @Override
-        @Nonnull
+        @NonNull
         public String getImageUrl() {
             return emoji.getImageUrl();
         }
 
         @Override
-        @Nonnull
+        @NonNull
         public ImageProxy getImage() {
             return emoji.getImage();
         }
 
         @Override
-        @Nonnull
+        @NonNull
         public String getAsMention() {
             return emoji.getAsMention();
         }
 
         @Override
-        @Nonnull
+        @NonNull
         public String getFormatted() {
             return emoji.getFormatted();
         }
@@ -183,25 +183,25 @@ public void formatTo(Formatter formatter, int flags, int width, int precision) {
         }
 
         @Override
-        @Nonnull
+        @NonNull
         public String getName() {
             return emoji.getName();
         }
 
         @Override
-        @Nonnull
+        @NonNull
         public String getAsReactionCode() {
             return emoji.getAsReactionCode();
         }
 
         @Override
-        @Nonnull
+        @NonNull
         public DataObject toData() {
             return emoji.toData();
         }
 
         @Override
-        @Nonnull
+        @NonNull
         public String getId() {
             return emoji.getId();
         }
@@ -212,7 +212,7 @@ public long getIdLong() {
         }
 
         @Override
-        @Nonnull
+        @NonNull
         public OffsetDateTime getTimeCreated() {
             return emoji.getTimeCreated();
         }