From afe20ce074ff8594d1adf6b95802d19a1c95ca83 Mon Sep 17 00:00:00 2001 From: Marcel Korzonek Date: Sun, 20 Jul 2025 18:44:00 +0200 Subject: [PATCH] Update JDA to 6.0.0-rc.1 --- .../main/kotlin/at/xirado/jdui/component/message/Button.kt | 4 ++-- .../kotlin/at/xirado/jdui/component/message/SelectMenu.kt | 6 +++--- .../kotlin/at/xirado/jdui/component/message/TextDisplay.kt | 2 +- core/src/main/kotlin/at/xirado/jdui/utils/JDA.kt | 2 +- .../src/main/kotlin/at/xirado/jdui/example/view/CatView.kt | 2 +- .../kotlin/at/xirado/jdui/example/view/ComponentTest.kt | 6 +++--- .../main/kotlin/at/xirado/jdui/example/view/CounterView.kt | 2 +- .../kotlin/at/xirado/jdui/example/view/MultipleMenusView.kt | 2 +- .../main/kotlin/at/xirado/jdui/example/view/StateTest.kt | 2 +- .../at/xirado/jdui/example/view/UrbanDictionaryView.kt | 2 +- gradle/libs.versions.toml | 4 ++-- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/core/src/main/kotlin/at/xirado/jdui/component/message/Button.kt b/core/src/main/kotlin/at/xirado/jdui/component/message/Button.kt index 6cbaf13..92204b8 100644 --- a/core/src/main/kotlin/at/xirado/jdui/component/message/Button.kt +++ b/core/src/main/kotlin/at/xirado/jdui/component/message/Button.kt @@ -2,12 +2,12 @@ package at.xirado.jdui.component.message import at.xirado.jdui.component.StatefulActionComponent import at.xirado.jdui.component.StatelessComponent -import net.dv8tion.jda.api.components.button.ButtonStyle +import net.dv8tion.jda.api.components.buttons.ButtonStyle import net.dv8tion.jda.api.entities.emoji.Emoji import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent import net.dv8tion.jda.api.events.interaction.component.GenericComponentInteractionCreateEvent import kotlin.reflect.typeOf -import net.dv8tion.jda.api.components.button.Button as JDAButton +import net.dv8tion.jda.api.components.buttons.Button as JDAButton class ActionButton( var style: ButtonStyle, diff --git a/core/src/main/kotlin/at/xirado/jdui/component/message/SelectMenu.kt b/core/src/main/kotlin/at/xirado/jdui/component/message/SelectMenu.kt index 0d12e04..781068b 100644 --- a/core/src/main/kotlin/at/xirado/jdui/component/message/SelectMenu.kt +++ b/core/src/main/kotlin/at/xirado/jdui/component/message/SelectMenu.kt @@ -1,14 +1,14 @@ package at.xirado.jdui.component.message import at.xirado.jdui.component.StatefulActionComponent -import net.dv8tion.jda.api.components.selects.SelectOption +import net.dv8tion.jda.api.components.selections.SelectOption import net.dv8tion.jda.api.entities.channel.ChannelType import net.dv8tion.jda.api.events.interaction.component.EntitySelectInteractionEvent import net.dv8tion.jda.api.events.interaction.component.GenericComponentInteractionCreateEvent import net.dv8tion.jda.api.events.interaction.component.StringSelectInteractionEvent import kotlin.reflect.typeOf -import net.dv8tion.jda.api.components.selects.EntitySelectMenu as JDAEntitySelectMenu -import net.dv8tion.jda.api.components.selects.StringSelectMenu as JDAStringSelectMenu +import net.dv8tion.jda.api.components.selections.EntitySelectMenu as JDAEntitySelectMenu +import net.dv8tion.jda.api.components.selections.StringSelectMenu as JDAStringSelectMenu private typealias StringCallback = suspend StringSelectInteractionEvent.() -> Unit private typealias EntityCallback = suspend EntitySelectInteractionEvent.() -> Unit diff --git a/core/src/main/kotlin/at/xirado/jdui/component/message/TextDisplay.kt b/core/src/main/kotlin/at/xirado/jdui/component/message/TextDisplay.kt index 2857cca..f0e09e8 100644 --- a/core/src/main/kotlin/at/xirado/jdui/component/message/TextDisplay.kt +++ b/core/src/main/kotlin/at/xirado/jdui/component/message/TextDisplay.kt @@ -8,7 +8,7 @@ class TextDisplay( var content: String ) : StatelessComponent() { override fun buildComponent(uniqueId: Int): JDATextDisplay { - return JDATextDisplay.create(content).withUniqueId(uniqueId) + return JDATextDisplay.of(content).withUniqueId(uniqueId) } override val type = typeOf() diff --git a/core/src/main/kotlin/at/xirado/jdui/utils/JDA.kt b/core/src/main/kotlin/at/xirado/jdui/utils/JDA.kt index 05147c2..cb3c172 100644 --- a/core/src/main/kotlin/at/xirado/jdui/utils/JDA.kt +++ b/core/src/main/kotlin/at/xirado/jdui/utils/JDA.kt @@ -3,7 +3,7 @@ package at.xirado.jdui.utils import net.dv8tion.jda.api.components.ActionComponent import net.dv8tion.jda.api.components.Component import net.dv8tion.jda.api.components.actionrow.ActionRow -import net.dv8tion.jda.api.components.button.Button +import net.dv8tion.jda.api.components.buttons.Button import net.dv8tion.jda.api.components.container.Container import net.dv8tion.jda.api.components.section.Section diff --git a/example/src/main/kotlin/at/xirado/jdui/example/view/CatView.kt b/example/src/main/kotlin/at/xirado/jdui/example/view/CatView.kt index 1dada14..4416ca0 100644 --- a/example/src/main/kotlin/at/xirado/jdui/example/view/CatView.kt +++ b/example/src/main/kotlin/at/xirado/jdui/example/view/CatView.kt @@ -14,7 +14,7 @@ import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json import kotlinx.serialization.json.decodeFromStream -import net.dv8tion.jda.api.components.button.ButtonStyle.SECONDARY +import net.dv8tion.jda.api.components.buttons.ButtonStyle.SECONDARY import net.dv8tion.jda.api.components.mediagallery.MediaGalleryItem import okhttp3.OkHttpClient import okhttp3.Request diff --git a/example/src/main/kotlin/at/xirado/jdui/example/view/ComponentTest.kt b/example/src/main/kotlin/at/xirado/jdui/example/view/ComponentTest.kt index eae3236..8fe8494 100644 --- a/example/src/main/kotlin/at/xirado/jdui/example/view/ComponentTest.kt +++ b/example/src/main/kotlin/at/xirado/jdui/example/view/ComponentTest.kt @@ -4,10 +4,10 @@ import at.xirado.jdui.component.message.* import at.xirado.jdui.component.row import at.xirado.jdui.state.state import at.xirado.jdui.view.definition.function.view -import net.dv8tion.jda.api.components.button.ButtonStyle +import net.dv8tion.jda.api.components.buttons.ButtonStyle import net.dv8tion.jda.api.components.mediagallery.MediaGalleryItem -import net.dv8tion.jda.api.components.selects.EntitySelectMenu -import net.dv8tion.jda.api.components.selects.SelectOption +import net.dv8tion.jda.api.components.selections.EntitySelectMenu +import net.dv8tion.jda.api.components.selections.SelectOption import net.dv8tion.jda.api.entities.emoji.Emoji import net.dv8tion.jda.api.utils.FileUpload diff --git a/example/src/main/kotlin/at/xirado/jdui/example/view/CounterView.kt b/example/src/main/kotlin/at/xirado/jdui/example/view/CounterView.kt index 5957e41..6b9b86b 100644 --- a/example/src/main/kotlin/at/xirado/jdui/example/view/CounterView.kt +++ b/example/src/main/kotlin/at/xirado/jdui/example/view/CounterView.kt @@ -6,7 +6,7 @@ import at.xirado.jdui.component.row import at.xirado.jdui.state.state import at.xirado.jdui.view.definition.function.view import kotlinx.serialization.Serializable -import net.dv8tion.jda.api.components.button.ButtonStyle +import net.dv8tion.jda.api.components.buttons.ButtonStyle @Serializable data class LastUpdate( diff --git a/example/src/main/kotlin/at/xirado/jdui/example/view/MultipleMenusView.kt b/example/src/main/kotlin/at/xirado/jdui/example/view/MultipleMenusView.kt index 8a8bd92..aefff09 100644 --- a/example/src/main/kotlin/at/xirado/jdui/example/view/MultipleMenusView.kt +++ b/example/src/main/kotlin/at/xirado/jdui/example/view/MultipleMenusView.kt @@ -10,7 +10,7 @@ import at.xirado.jdui.view.View import at.xirado.jdui.view.compose import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import net.dv8tion.jda.api.components.button.ButtonStyle +import net.dv8tion.jda.api.components.buttons.ButtonStyle import net.dv8tion.jda.api.entities.emoji.Emoji import net.dv8tion.jda.api.utils.TimeFormat diff --git a/example/src/main/kotlin/at/xirado/jdui/example/view/StateTest.kt b/example/src/main/kotlin/at/xirado/jdui/example/view/StateTest.kt index 7081887..6a11f43 100644 --- a/example/src/main/kotlin/at/xirado/jdui/example/view/StateTest.kt +++ b/example/src/main/kotlin/at/xirado/jdui/example/view/StateTest.kt @@ -6,7 +6,7 @@ import at.xirado.jdui.component.message.text import at.xirado.jdui.component.row import at.xirado.jdui.state.state import at.xirado.jdui.view.definition.function.view -import net.dv8tion.jda.api.components.button.ButtonStyle.* +import net.dv8tion.jda.api.components.buttons.ButtonStyle.* fun stateTest() = view { var someInt by state(0) diff --git a/example/src/main/kotlin/at/xirado/jdui/example/view/UrbanDictionaryView.kt b/example/src/main/kotlin/at/xirado/jdui/example/view/UrbanDictionaryView.kt index f735ce4..82c78a0 100644 --- a/example/src/main/kotlin/at/xirado/jdui/example/view/UrbanDictionaryView.kt +++ b/example/src/main/kotlin/at/xirado/jdui/example/view/UrbanDictionaryView.kt @@ -9,7 +9,7 @@ import dev.minn.jda.ktx.util.await import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json -import net.dv8tion.jda.api.components.button.ButtonStyle +import net.dv8tion.jda.api.components.buttons.ButtonStyle import net.dv8tion.jda.api.components.separator.Separator import net.dv8tion.jda.api.entities.emoji.Emoji import net.dv8tion.jda.api.utils.TimeFormat diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 10a8dbd..a163ef3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ publishing = "0.31.0" kotlin-coroutines = "1.10.1" kotlin-protobuf = "1.8.1" -jda = "54038f1cec" +jda = "6.0.0-rc.1" slf4j-api = "2.0.13" kotlin-logging = "5.1.0" snowflake-id = "0.0.2" @@ -19,7 +19,7 @@ kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } -jda = { module = "io.github.freya022:JDA", version.ref = "jda" } +jda = { module = "net.dv8tion:JDA", version.ref = "jda" } slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j-api" } kotlin-logging = { module = "io.github.oshai:kotlin-logging-jvm", version.ref = "kotlin-logging" } snowflake = { module = "de.mkammerer.snowflake-id:snowflake-id", version.ref = "snowflake-id" }