Add DAVE support

Author: freyacodes

Dockerfile

@@ -1,6 +1,6 @@
-FROM azul/zulu-openjdk:17-jre-latest
+FROM azul/zulu-openjdk:25-jre-latest
 RUN groupadd -r -g 999 ukulele && useradd -rd /opt/ukulele -g ukulele -u 999 -ms /bin/bash ukulele
 COPY --chown=ukulele:ukulele build/libs/ukulele.jar /opt/ukulele/ukulele.jar
 USER ukulele
 WORKDIR /opt/ukulele/
-ENTRYPOINT ["java", "-jar", "/opt/ukulele/ukulele.jar"]
+ENTRYPOINT ["java", "--enable-native-access=ALL-UNNAMED", "-jar", "/opt/ukulele/ukulele.jar"]

README.md

@@ -3,7 +3,7 @@
 
 Ukulele is a bot made by the creator and collaborators of FredBoat. The concept is to replicate FredBoat while keeping it simple. The original stack is engineered for serving millions of servers, and is thus too complex to selfhost.
 
-The bot is self-contained and only requires Java 17 to run. This bot uses some of the underlying technology behind Lavalink without actually requiring you to host Lavalink.
+The bot is self-contained and only requires Java 25 to run. This bot uses some of the underlying technology behind Lavalink without actually requiring you to host Lavalink.
 
 ## Features
 - Basic player commands (::play, ::list, ::skip, ::shuffle)
@@ -13,7 +13,7 @@ The bot is self-contained and only requires Java 17 to run. This bot uses some o
 ## Host it yourself
 
 ### Manual
-- Install Java 11
+- Install Java 25
 - Make a copy of `ukulele.example.yml` and rename it to `ukulele.yml`
 - Input the bot token [(guide)](https://discordjs.guide/preparations/setting-up-a-bot-application.html)
 - Make sure to enable 'Message Content Intent' in your bot settings on Discord

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 
 group = "dev.arbjerg"
 version = "0.1"
-java.sourceCompatibility = JavaVersion.VERSION_17
+java.sourceCompatibility = JavaVersion.VERSION_25
 
 // r2dbc-h2 1.1.0.RELEASE was compiled against H2 2.4.240; Spring Boot BOM would downgrade to 2.3.232
 extra["h2.version"] = "2.4.240"
@@ -26,6 +26,9 @@ repositories {
 
 dependencies {
     implementation("net.dv8tion:JDA:6.4.1")
+    implementation("club.minnced:jdave-api:0.1.8")
+    runtimeOnly("club.minnced:jdave-native-linux-x86-64:0.1.8")
+    runtimeOnly("club.minnced:jdave-native-linux-aarch64:0.1.8")
     implementation("dev.arbjerg:lavaplayer:2.2.6")
     implementation("dev.lavalink.youtube:v2:1.18.1")
     implementation("org.springframework.boot:spring-boot-starter-data-r2dbc")
@@ -44,6 +47,10 @@ dependencies {
     }
 }
 
+tasks.withType<org.springframework.boot.gradle.tasks.run.BootRun> {
+    jvmArgs("--enable-native-access=ALL-UNNAMED")
+}
+
 tasks.withType<BootJar> {
     archiveFileName.set("ukulele.jar")
     doLast {
@@ -62,6 +69,6 @@ tasks.withType<Test> {
 tasks.withType<KotlinCompile> {
     compilerOptions {
         freeCompilerArgs.add("-Xjsr305=strict")
-        jvmTarget.set(JvmTarget.JVM_17)
+        jvmTarget.set(JvmTarget.JVM_25)
     }
 }

src/main/kotlin/dev/arbjerg/ukulele/jda/JdaConfig.kt

@@ -1,15 +1,16 @@
 package dev.arbjerg.ukulele.jda
 
+import club.minnced.discord.jdave.interop.JDaveSessionFactory
 import dev.arbjerg.ukulele.config.BotProps
+import net.dv8tion.jda.api.audio.AudioModuleConfig
 import net.dv8tion.jda.api.entities.Activity
-import net.dv8tion.jda.api.requests.GatewayIntent
-import net.dv8tion.jda.api.sharding.ShardManager
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
 import net.dv8tion.jda.api.requests.GatewayIntent.*
 import net.dv8tion.jda.api.sharding.DefaultShardManagerBuilder
+import net.dv8tion.jda.api.sharding.ShardManager
 import net.dv8tion.jda.api.utils.cache.CacheFlag
 import net.dv8tion.jda.api.utils.messages.MessageRequest
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
 import javax.security.auth.login.LoginException
 import kotlin.concurrent.thread
 
@@ -35,6 +36,7 @@ class JdaConfig {
         )
 
         val builder = DefaultShardManagerBuilder.create(botProps.token, intents)
+            .setAudioModuleConfig(AudioModuleConfig().withDaveSessionFactory(JDaveSessionFactory()))
             .disableCache(
                 CacheFlag.ACTIVITY,
                 CacheFlag.EMOJI,

ukulele

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 ./gradlew --no-daemon build
 cd `dirname "$0"`
-java -jar "build/libs/ukulele.jar"
+java --enable-native-access=ALL-UNNAMED -jar "build/libs/ukulele.jar"