Skip to content

Commit d9dc57d

Browse files
authored
Merge pull request #516 from danthe1st/update-dependencies
update dependencies and Gradle
2 parents fd5403c + ad97762 commit d9dc57d

File tree

6 files changed

+39
-29
lines changed

6 files changed

+39
-29
lines changed

build.gradle.kts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import com.github.jengelman.gradle.plugins.shadow.transformers.*
44
plugins {
55
java
66
id("com.github.johnrengelman.shadow") version "8.1.1"
7-
id("org.springframework.boot") version "3.4.3"
7+
id("org.springframework.boot") version "3.5.0"
88
id("io.spring.dependency-management") version "1.1.7"
9-
id("org.graalvm.buildtools.native") version "0.10.5"
9+
id("org.graalvm.buildtools.native") version "0.10.6"
1010
checkstyle
1111
}
1212

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

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

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

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

5656
// Lombok Annotations
57-
compileOnly("org.projectlombok:lombok:1.18.36")
58-
annotationProcessor("org.projectlombok:lombok:1.18.36")
59-
testCompileOnly("org.projectlombok:lombok:1.18.30")
60-
testAnnotationProcessor("org.projectlombok:lombok:1.18.30")
57+
compileOnly("org.projectlombok:lombok:1.18.38")
58+
annotationProcessor("org.projectlombok:lombok:1.18.38")
59+
testCompileOnly("org.projectlombok:lombok:1.18.38")
60+
testAnnotationProcessor("org.projectlombok:lombok:1.18.38")
6161

6262
// Sentry
63-
implementation("io.sentry:sentry:8.3.0")
63+
implementation("io.sentry:sentry:8.13.2")
6464

6565
// Spring
6666
implementation("org.springframework.boot:spring-boot-starter-web")

gradle/wrapper/gradle-wrapper.jar

302 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
8890

8991
# Use the maximum available, or set MAX_FD != -1 to use that value.
9092
MAX_FD=maximum
@@ -112,7 +114,7 @@ case "$( uname )" in #(
112114
NONSTOP* ) nonstop=true ;;
113115
esac
114116

115-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
116118

117119

118120
# Determine the Java command to use to start the JVM.
@@ -203,15 +205,15 @@ fi
203205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204206

205207
# Collect all arguments for the java command:
206-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207209
# and any embedded shellness will be escaped.
208210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209211
# treated as '${Hostname}' itself on the command line.
210212

211213
set -- \
212214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
213215
-classpath "$CLASSPATH" \
214-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
215217
"$@"
216218

217219
# Stop when "xargs" is not available.

gradlew.bat

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
4345
%JAVA_EXE% -version >NUL 2>&1
4446
if %ERRORLEVEL% equ 0 goto execute
4547

46-
echo.
47-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48-
echo.
49-
echo Please set the JAVA_HOME variable in your environment to match the
50-
echo location of your Java installation.
48+
echo. 1>&2
49+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50+
echo. 1>&2
51+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52+
echo location of your Java installation. 1>&2
5153

5254
goto fail
5355

@@ -57,22 +59,22 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5759

5860
if exist "%JAVA_EXE%" goto execute
5961

60-
echo.
61-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62-
echo.
63-
echo Please set the JAVA_HOME variable in your environment to match the
64-
echo location of your Java installation.
62+
echo. 1>&2
63+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64+
echo. 1>&2
65+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66+
echo location of your Java installation. 1>&2
6567

6668
goto fail
6769

6870
:execute
6971
@rem Setup the command line
7072

71-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7274

7375

7476
@rem Execute Gradle
75-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7678

7779
:end
7880
@rem End local scope for the variables with windows NT shell

src/main/java/net/discordjug/javabot/RuntimeHintsConfiguration.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.nio.channels.Channel;
44

55
import club.minnced.discord.webhook.send.WebhookEmbed;
6+
import com.zaxxer.hikari.HikariConfig;
67
import net.discordjug.javabot.data.config.BotConfig;
78
import net.discordjug.javabot.data.config.GuildConfig;
89
import net.discordjug.javabot.data.config.GuildConfigItem;
@@ -26,6 +27,7 @@
2627
import net.dv8tion.jda.api.entities.sticker.GuildSticker;
2728
import net.dv8tion.jda.api.hooks.ListenerAdapter;
2829
import net.dv8tion.jda.api.managers.AudioManager;
30+
import net.dv8tion.jda.internal.entities.GuildVoiceStateImpl;
2931
import net.dv8tion.jda.internal.entities.MemberPresenceImpl;
3032
import net.dv8tion.jda.internal.requests.restaction.PermOverrideData;
3133
import org.h2.server.TcpServer;
@@ -50,7 +52,9 @@
5052
//ensure JDA can create necessary caches
5153
User[].class, Guild[].class, Member[].class, Role[].class, Channel[].class, AudioManager[].class, ScheduledEvent[].class, ThreadMember[].class, ForumTag[].class, RichCustomEmoji[].class, GuildSticker[].class, MemberPresenceImpl[].class,
5254
//needs to be serialized for channel managers etc
53-
PermOverrideData.class
55+
PermOverrideData.class,
56+
57+
HikariConfig.class
5458
})
5559
public class RuntimeHintsConfiguration implements RuntimeHintsRegistrar {
5660

@@ -76,5 +80,7 @@ public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
7680
for (Class<?> cl : WebhookEmbed.class.getClasses()) {
7781
hints.reflection().registerType(cl, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_METHODS);
7882
}
83+
84+
hints.reflection().registerType(GuildVoiceStateImpl[].class, MemberCategory.UNSAFE_ALLOCATED);
7985
}
8086
}

0 commit comments

Comments
 (0)