diff --git a/LavalinkServer/build.gradle.kts b/LavalinkServer/build.gradle.kts index c1f131a7b..477f18f99 100644 --- a/LavalinkServer/build.gradle.kts +++ b/LavalinkServer/build.gradle.kts @@ -51,7 +51,7 @@ dependencies { exclude(group = "org.slf4j", module = "slf4j-api") } implementation(libs.koe.udpqueue) { - exclude(module="udp-queue") + exclude(module = "lava-common") } implementation(libs.bundles.udpqueue.natives) { exclude(group = "com.sedmelluq", module = "lava-common") diff --git a/LavalinkServer/src/main/java/lavalink/server/config/KoeConfiguration.kt b/LavalinkServer/src/main/java/lavalink/server/config/KoeConfiguration.kt index 41397f506..53a9a999b 100644 --- a/LavalinkServer/src/main/java/lavalink/server/config/KoeConfiguration.kt +++ b/LavalinkServer/src/main/java/lavalink/server/config/KoeConfiguration.kt @@ -5,6 +5,7 @@ import com.sedmelluq.lava.common.natives.architecture.DefaultOperatingSystemType import com.sedmelluq.lava.common.natives.architecture.SystemType import moe.kyokobot.koe.KoeOptions import moe.kyokobot.koe.codec.udpqueue.UdpQueueFramePollerFactory +import moe.kyokobot.koe.gateway.GatewayVersion import org.slf4j.Logger import org.slf4j.LoggerFactory import org.springframework.context.annotation.Bean @@ -32,6 +33,8 @@ class KoeConfiguration(val serverConfig: ServerConfig) { @Bean fun koeOptions(): KoeOptions = KoeOptions.builder().apply { + setGatewayVersion(GatewayVersion.V8) + val systemType: SystemType? = try { SystemType(DefaultArchitectureTypes.detect(), DefaultOperatingSystemTypes.detect()) } catch (e: IllegalArgumentException) { @@ -70,4 +73,4 @@ class KoeConfiguration(val serverConfig: ServerConfig) { ) } }.create() -} \ No newline at end of file +} diff --git a/settings.gradle.kts b/settings.gradle.kts index 8f1142574..c902f7b23 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,7 +16,6 @@ dependencyResolutionManagement { voice() metrics() common() - other() } } } @@ -42,8 +41,8 @@ fun VersionCatalogBuilder.voice() { library("lavaplayer-ip-rotator", "dev.arbjerg", "lavaplayer-ext-youtube-rotator").versionRef("lavaplayer") library("lavadsp", "dev.arbjerg", "lavadsp").version("0.7.8") - library("koe", "moe.kyokobot.koe", "core").version("2.0.2") - library("koe-udpqueue", "moe.kyokobot.koe", "ext-udpqueue").version("2.0.2") + library("koe", "moe.kyokobot.koe", "core").version("2.0.3-rc2") + library("koe-udpqueue", "moe.kyokobot.koe", "ext-udpqueue").version("2.0.3-rc2") version("udpqueue", "0.2.7") val platforms = listOf("linux-x86-64", "linux-x86", "linux-aarch64", "linux-arm", "linux-musl-x86-64", "linux-musl-aarch64", "win-x86-64", "win-x86", "darwin") @@ -78,9 +77,3 @@ fun VersionCatalogBuilder.common() { library("spotbugs", "com.github.spotbugs", "spotbugs-annotations").version("3.1.6") } - - -fun VersionCatalogBuilder.other() { - library("jda", "net.dv8tion", "JDA").version("4.1.1_135") - library("lavalink-client", "com.github.FredBoat", "Lavalink-Client").version("8d9b660") -}