Skip to content

Commit 14d8789

Browse files
committed
Spring Boot 4
1 parent cea5962 commit 14d8789

File tree

3 files changed

+20
-86
lines changed

3 files changed

+20
-86
lines changed

build.gradle.kts

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@ 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.5.5"
7+
id("org.springframework.boot") version "4.0.1"
88
id("io.spring.dependency-management") version "1.1.7"
9-
id("org.graalvm.buildtools.native") version "0.11.0"
9+
id("org.graalvm.buildtools.native") version "0.11.3"
1010
checkstyle
1111
}
1212

1313
java {
14-
sourceCompatibility = JavaVersion.VERSION_25
15-
targetCompatibility = JavaVersion.VERSION_25
14+
toolchain {
15+
languageVersion = JavaLanguageVersion.of(25)
16+
}
1617
}
1718

1819
group = "net.discordjug"
@@ -65,17 +66,13 @@ dependencies {
6566
implementation("io.sentry:sentry:8.20.0")
6667

6768
// Spring
68-
implementation("org.springframework.boot:spring-boot-starter-web")
69+
implementation("org.springframework.boot:spring-boot-starter-webmvc")
6970
implementation("org.springframework.boot:spring-boot-starter-data-jdbc")
7071

7172
//required for registering native hints
7273
implementation("org.jetbrains.kotlin:kotlin-reflect")
73-
}
74-
75-
configurations {
76-
all {
77-
exclude(group = "commons-logging", module = "commons-logging")
78-
}
74+
75+
implementation("org.slf4j:jcl-over-slf4j")
7976
}
8077

8178
tasks.withType<Jar> {

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

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package net.discordjug.javabot;
22

3-
import java.nio.channels.Channel;
4-
53
import club.minnced.discord.webhook.send.WebhookEmbed;
64
import com.zaxxer.hikari.HikariConfig;
75
import net.discordjug.javabot.data.config.BotConfig;
@@ -16,19 +14,19 @@
1614
import net.discordjug.javabot.data.config.guild.QOTWConfig;
1715
import net.discordjug.javabot.data.config.guild.ServerLockConfig;
1816
import net.discordjug.javabot.data.config.guild.StarboardConfig;
19-
import net.dv8tion.jda.api.entities.Guild;
20-
import net.dv8tion.jda.api.entities.Member;
21-
import net.dv8tion.jda.api.entities.Role;
22-
import net.dv8tion.jda.api.entities.ScheduledEvent;
23-
import net.dv8tion.jda.api.entities.ThreadMember;
24-
import net.dv8tion.jda.api.entities.User;
25-
import net.dv8tion.jda.api.entities.channel.forums.ForumTag;
26-
import net.dv8tion.jda.api.entities.emoji.RichCustomEmoji;
27-
import net.dv8tion.jda.api.entities.sticker.GuildSticker;
17+
//import net.dv8tion.jda.api.entities.Guild;
18+
//import net.dv8tion.jda.api.entities.Member;
19+
//import net.dv8tion.jda.api.entities.Role;
20+
//import net.dv8tion.jda.api.entities.ScheduledEvent;
21+
//import net.dv8tion.jda.api.entities.ThreadMember;
22+
//import net.dv8tion.jda.api.entities.User;
23+
//import net.dv8tion.jda.api.entities.channel.forums.ForumTag;
24+
//import net.dv8tion.jda.api.entities.emoji.RichCustomEmoji;
25+
//import net.dv8tion.jda.api.entities.sticker.GuildSticker;
2826
import net.dv8tion.jda.api.hooks.ListenerAdapter;
29-
import net.dv8tion.jda.api.managers.AudioManager;
27+
//import net.dv8tion.jda.api.managers.AudioManager;
3028
import net.dv8tion.jda.internal.entities.GuildVoiceStateImpl;
31-
import net.dv8tion.jda.internal.entities.MemberPresenceImpl;
29+
//import net.dv8tion.jda.internal.entities.MemberPresenceImpl;
3230
import net.dv8tion.jda.internal.requests.restaction.PermOverrideData;
3331
import org.h2.server.TcpServer;
3432
import org.springframework.aot.hint.MemberCategory;
@@ -50,7 +48,7 @@
5048
HelpConfig.class, MessageCacheConfig.class, MetricsConfig.class, ModerationConfig.class, QOTWConfig.class, ServerLockConfig.class, StarboardConfig.class,
5149

5250
//ensure JDA can create necessary caches
53-
User[].class, Guild[].class, Member[].class, Role[].class, Channel[].class, AudioManager[].class, ScheduledEvent[].class, ThreadMember[].class, ForumTag[].class, RichCustomEmoji[].class, GuildSticker[].class, MemberPresenceImpl[].class,
51+
// User[].class, Guild[].class, Member[].class, Role[].class, Channel[].class, AudioManager[].class, ScheduledEvent[].class, ThreadMember[].class, ForumTag[].class, RichCustomEmoji[].class, GuildSticker[].class, MemberPresenceImpl[].class,
5452
//needs to be serialized for channel managers etc
5553
PermOverrideData.class,
5654

src/main/java/net/discordjug/javabot/api/TomcatConfig.java

Lines changed: 0 additions & 61 deletions
This file was deleted.

0 commit comments

Comments
 (0)