Skip to content

Commit 483d8e6

Browse files
committed
Update dependencies
1 parent 0d00444 commit 483d8e6

6 files changed

Lines changed: 131 additions & 124 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ build/
77
!**/src/main/**/build/
88
!**/src/test/**/build/
99
ukulele.yml
10+
ukulele.jar
1011

1112
### STS ###
1213
.apt_generated

build.gradle.kts

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,40 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
12
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
23
import org.springframework.boot.gradle.tasks.bundling.BootJar
34

45
plugins {
5-
id("org.springframework.boot") version "2.3.5.RELEASE"
6-
id("io.spring.dependency-management") version "1.0.10.RELEASE"
7-
kotlin("jvm") version "1.4.10"
8-
kotlin("plugin.spring") version "1.4.10"
6+
id("org.springframework.boot") version "3.5.14"
7+
id("io.spring.dependency-management") version "1.1.7"
8+
kotlin("jvm") version "2.3.21"
9+
kotlin("plugin.spring") version "2.3.21"
910
}
1011

1112
group = "dev.arbjerg"
1213
version = "0.1"
13-
java.sourceCompatibility = JavaVersion.VERSION_11
14+
java.sourceCompatibility = JavaVersion.VERSION_17
1415

1516
repositories {
1617
mavenCentral()
1718
flatDir {
1819
dirs("lib")
1920
}
20-
maven { url = uri("https://m2.dv8tion.net/releases") }
21-
maven { url = uri("https://jitpack.io") }
2221
maven { url = uri("https://maven.lavalink.dev/releases") }
2322
}
2423

2524
dependencies {
26-
implementation("com.github.DV8FromTheWorld:JDA:v5.0.0-beta.23")
27-
implementation("dev.arbjerg:lavaplayer:2.2.2")
28-
implementation("dev.lavalink.youtube:v2:1.8.3")
25+
implementation("net.dv8tion:JDA:6.4.1")
26+
implementation("dev.arbjerg:lavaplayer:2.2.6")
27+
implementation("dev.lavalink.youtube:v2:1.18.1")
2928
implementation("org.springframework.boot:spring-boot-starter-data-r2dbc")
3029

3130
runtimeOnly("com.h2database:h2")
32-
implementation("io.r2dbc:r2dbc-h2")
31+
implementation("io.r2dbc:r2dbc-h2:1.1.0.RELEASE")
3332
implementation("org.flywaydb:flyway-core")
34-
implementation("com.github.ben-manes.caffeine:caffeine:3.1.5")
33+
implementation("com.github.ben-manes.caffeine:caffeine:3.2.4")
3534

3635
implementation("org.jetbrains.kotlin:kotlin-reflect")
37-
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
38-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:1.4.0")
36+
implementation("org.jetbrains.kotlin:kotlin-stdlib")
37+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
3938
implementation("io.projectreactor.kotlin:reactor-kotlin-extensions")
4039
testImplementation("org.springframework.boot:spring-boot-starter-test") {
4140
exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
@@ -58,8 +57,8 @@ tasks.withType<Test> {
5857
}
5958

6059
tasks.withType<KotlinCompile> {
61-
kotlinOptions {
62-
freeCompilerArgs = listOf("-Xjsr305=strict")
63-
jvmTarget = "11"
60+
compilerOptions {
61+
freeCompilerArgs.add("-Xjsr305=strict")
62+
jvmTarget.set(JvmTarget.JVM_17)
6463
}
6564
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 104 additions & 103 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/kotlin/dev/arbjerg/ukulele/audio/LavaplayerConfig.kt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package dev.arbjerg.ukulele.audio
33
import com.sedmelluq.discord.lavaplayer.container.MediaContainerRegistry
44
import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager
55
import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager
6-
import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers
6+
import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers.registerRemoteSources
77
import dev.lavalink.youtube.YoutubeAudioSourceManager
88
import org.springframework.context.annotation.Bean
99
import org.springframework.context.annotation.Configuration
@@ -18,7 +18,12 @@ class LavaplayerConfig {
1818
apm.registerSourceManager(YoutubeAudioSourceManager(true))
1919

2020
// Then add the rest, while excluding the legacy `YoutubeAudioSourceManager`
21-
AudioSourceManagers.registerRemoteSources(apm, MediaContainerRegistry.DEFAULT_REGISTRY, com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioSourceManager::class.java)
21+
@Suppress("DEPRECATION")
22+
registerRemoteSources(
23+
apm,
24+
MediaContainerRegistry.DEFAULT_REGISTRY,
25+
com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioSourceManager::class.java
26+
)
2227

2328
return apm
2429
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package dev.arbjerg.ukulele.jda
22

33
import dev.arbjerg.ukulele.config.BotProps
44
import net.dv8tion.jda.api.entities.Activity
5+
import net.dv8tion.jda.api.requests.GatewayIntent
56
import net.dv8tion.jda.api.sharding.ShardManager
67
import org.springframework.context.annotation.Bean
78
import org.springframework.context.annotation.Configuration
@@ -28,7 +29,7 @@ class JdaConfig {
2829
val intents = listOf(
2930
GUILD_VOICE_STATES,
3031
GUILD_MESSAGES,
31-
GUILD_BANS,
32+
GUILD_MODERATION,
3233
DIRECT_MESSAGES,
3334
MESSAGE_CONTENT
3435
)

0 commit comments

Comments
 (0)