From 8775f2b051eb050d449d47f01f6632ae35eb0e1f Mon Sep 17 00:00:00 2001 From: topi314 Date: Sat, 1 Feb 2025 17:34:45 +0100 Subject: [PATCH] update lavaplayer to 2.2.3 --- .../server/config/AudioPlayerConfiguration.kt | 20 +------------- settings.gradle.kts | 26 +++++++++---------- 2 files changed, 14 insertions(+), 32 deletions(-) diff --git a/LavalinkServer/src/main/java/lavalink/server/config/AudioPlayerConfiguration.kt b/LavalinkServer/src/main/java/lavalink/server/config/AudioPlayerConfiguration.kt index 20f78a94d..876eff99e 100644 --- a/LavalinkServer/src/main/java/lavalink/server/config/AudioPlayerConfiguration.kt +++ b/LavalinkServer/src/main/java/lavalink/server/config/AudioPlayerConfiguration.kt @@ -25,8 +25,6 @@ import org.apache.http.HttpHost import org.apache.http.auth.AuthScope import org.apache.http.auth.UsernamePasswordCredentials import org.apache.http.client.CredentialsProvider -import org.apache.http.client.config.CookieSpecs -import org.apache.http.client.config.RequestConfig import org.apache.http.impl.client.BasicCredentialsProvider import org.slf4j.LoggerFactory import org.springframework.context.annotation.Bean @@ -54,23 +52,7 @@ class AudioPlayerConfiguration { mediaContainerProbes: Collection ): AudioPlayerManager { serverConfig.timeouts?.let { - HttpClientTools.setDefaultRequestConfig( - RequestConfig.custom() - .setConnectTimeout(it.connectTimeoutMs) - .setConnectionRequestTimeout(it.connectionRequestTimeoutMs) - .setSocketTimeout(it.socketTimeoutMs) - .setCookieSpec(CookieSpecs.STANDARD) - .build() - ) - - HttpClientTools.setNoCookiesRequestConfig( - RequestConfig.custom() - .setConnectTimeout(it.connectTimeoutMs) - .setConnectionRequestTimeout(it.connectionRequestTimeoutMs) - .setSocketTimeout(it.socketTimeoutMs) - .setCookieSpec(CookieSpecs.IGNORE_COOKIES) - .build() - ) + HttpClientTools.setDefaultRequestTimeout(it.connectTimeoutMs, it.connectionRequestTimeoutMs, it.socketTimeoutMs) } val audioPlayerManager = DefaultAudioPlayerManager() diff --git a/settings.gradle.kts b/settings.gradle.kts index c020d6c53..7698b1db6 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -25,23 +25,23 @@ fun VersionCatalogBuilder.spring() { library("spring-websocket", "org.springframework", "spring-websocket").version("6.1.9") - library("spring-boot", "org.springframework.boot", "spring-boot").versionRef("spring-boot") - library("spring-boot-web", "org.springframework.boot", "spring-boot-starter-web").versionRef("spring-boot") - library("spring-boot-undertow", "org.springframework.boot", "spring-boot-starter-undertow") .versionRef("spring-boot") - library("spring-boot-test", "org.springframework.boot", "spring-boot-starter-test") .versionRef("spring-boot") + library("spring-boot", "org.springframework.boot", "spring-boot").versionRef("spring-boot") + library("spring-boot-web", "org.springframework.boot", "spring-boot-starter-web").versionRef("spring-boot") + library("spring-boot-undertow", "org.springframework.boot", "spring-boot-starter-undertow").versionRef("spring-boot") + library("spring-boot-test", "org.springframework.boot", "spring-boot-starter-test").versionRef("spring-boot") bundle("spring", listOf("spring-websocket", "spring-boot-web", "spring-boot-undertow")) } fun VersionCatalogBuilder.voice() { - version("lavaplayer", "a099a98b55e33c1694b2e2636ecd1c3a33769707-SNAPSHOT") + version("lavaplayer", "2.2.3") version("koe", "2.0.3-rc2") - library("lavaplayer", "dev.arbjerg", "lavaplayer").versionRef("lavaplayer") + library("lavaplayer", "dev.arbjerg", "lavaplayer").versionRef("lavaplayer") library("lavaplayer-ip-rotator", "dev.arbjerg", "lavaplayer-ext-youtube-rotator").versionRef("lavaplayer") - library("lavadsp", "dev.arbjerg", "lavadsp").version("0.7.8") + library("lavadsp", "dev.arbjerg", "lavadsp").version("0.7.8") - library("koe", "moe.kyokobot.koe", "core").versionRef("koe") + library("koe", "moe.kyokobot.koe", "core").versionRef("koe") library("koe-udpqueue", "moe.kyokobot.koe", "ext-udpqueue").versionRef("koe") version("udpqueue", "0.2.7") @@ -56,7 +56,7 @@ fun VersionCatalogBuilder.voice() { fun VersionCatalogBuilder.metrics() { version("prometheus", "0.16.0") - library("metrics", "io.prometheus", "simpleclient").versionRef("prometheus") + library("metrics", "io.prometheus", "simpleclient").versionRef("prometheus") library("metrics-hotspot", "io.prometheus", "simpleclient_hotspot").versionRef("prometheus") library("metrics-logback", "io.prometheus", "simpleclient_logback").versionRef("prometheus") library("metrics-servlet", "io.prometheus", "simpleclient_servlet").versionRef("prometheus") @@ -67,15 +67,15 @@ fun VersionCatalogBuilder.metrics() { fun VersionCatalogBuilder.common() { version("kotlin", "2.0.0") - library("kotlin-reflect", "org.jetbrains.kotlin", "kotlin-reflect").versionRef("kotlin") + library("kotlin-reflect", "org.jetbrains.kotlin", "kotlin-reflect").versionRef("kotlin") library("kotlin-stdlib-jdk8", "org.jetbrains.kotlin", "kotlin-stdlib-jdk8").versionRef("kotlin") library("kotlinx-serialization-json", "org.jetbrains.kotlinx", "kotlinx-serialization-json").version("1.7.0") library("kotlinx-datetime", "org.jetbrains.kotlinx", "kotlinx-datetime").version("0.6.0") - library("logback", "ch.qos.logback", "logback-classic").version("1.5.6") - library("sentry-logback", "io.sentry", "sentry-logback").version("7.10.0") - library("oshi", "com.github.oshi", "oshi-core").version("6.4.11") + library("logback", "ch.qos.logback", "logback-classic").version("1.5.6") + library("sentry-logback", "io.sentry", "sentry-logback").version("7.10.0") + library("oshi", "com.github.oshi", "oshi-core").version("6.4.11") } fun VersionCatalogBuilder.other() {