Merge branch 'main' into feature/polls

common/build.gradle.kts

@@ -32,8 +32,9 @@ kotlin {
             dependencies {
                 api(libs.ktor.client.js)
 
-                // workaround for https://youtrack.jetbrains.com/issue/KT-43500
-                // (intended to be compileOnly in commonMain only)
+                // workaround for https://youtrack.jetbrains.com/issue/KT-43500 /
+                // https://youtrack.jetbrains.com/issue/KT-64109#focus=Comments-27-10064206.0-0 /
+                // https://youtrack.jetbrains.com/issue/KT-61096 (intended to be compileOnly in commonMain only)
                 implementation(projects.kspAnnotations)
             }
         }

core/api/core.klib.api

@@ -7197,8 +7197,6 @@ final class dev.kord.core.entity/ClientStatus { // dev.kord.core.entity/ClientSt
     final fun toString(): kotlin/String // dev.kord.core.entity/ClientStatus.toString|toString(){}[0]
 
     sealed class Client { // dev.kord.core.entity/ClientStatus.Client|null[0]
-        constructor <init>(dev.kord.common.entity/PresenceStatus) // dev.kord.core.entity/ClientStatus.Client.<init>|<init>(dev.kord.common.entity.PresenceStatus){}[0]
-
         final val status // dev.kord.core.entity/ClientStatus.Client.status|{}status[0]
             final fun <get-status>(): dev.kord.common.entity/PresenceStatus // dev.kord.core.entity/ClientStatus.Client.status.<get-status>|<get-status>(){}[0]
 
@@ -11607,9 +11605,6 @@ open class dev.kord.core.entity/User : dev.kord.core.behavior/UserBehavior { //
 }
 
 sealed class dev.kord.core.cache.data/ComponentData { // dev.kord.core.cache.data/ComponentData|null[0]
-    constructor <init>() // dev.kord.core.cache.data/ComponentData.<init>|<init>(){}[0]
-    constructor <init>(kotlin/Int, kotlinx.serialization.internal/SerializationConstructorMarker?) // dev.kord.core.cache.data/ComponentData.<init>|<init>(kotlin.Int;kotlinx.serialization.internal.SerializationConstructorMarker?){}[0]
-
     abstract val channelTypes // dev.kord.core.cache.data/ComponentData.channelTypes|{}channelTypes[0]
         abstract fun <get-channelTypes>(): dev.kord.common.entity.optional/Optional<kotlin.collections/List<dev.kord.common.entity/ChannelType>> // dev.kord.core.cache.data/ComponentData.channelTypes.<get-channelTypes>|<get-channelTypes>(){}[0]
     abstract val components // dev.kord.core.cache.data/ComponentData.components|{}components[0]
@@ -11653,8 +11648,6 @@ sealed class dev.kord.core.cache.data/ComponentData { // dev.kord.core.cache.dat
 }
 
 sealed class dev.kord.core.entity.automoderation/AutoModerationAction : dev.kord.core/KordObject { // dev.kord.core.entity.automoderation/AutoModerationAction|null[0]
-    constructor <init>(dev.kord.core.cache.data/AutoModerationActionData, dev.kord.core/Kord, dev.kord.common.entity/AutoModerationActionType?) // dev.kord.core.entity.automoderation/AutoModerationAction.<init>|<init>(dev.kord.core.cache.data.AutoModerationActionData;dev.kord.core.Kord;dev.kord.common.entity.AutoModerationActionType?){}[0]
-
     abstract val type // dev.kord.core.entity.automoderation/AutoModerationAction.type|{}type[0]
         abstract fun <get-type>(): dev.kord.common.entity/AutoModerationActionType // dev.kord.core.entity.automoderation/AutoModerationAction.type.<get-type>|<get-type>(){}[0]
     final val data // dev.kord.core.entity.automoderation/AutoModerationAction.data|{}data[0]
@@ -11666,8 +11659,6 @@ sealed class dev.kord.core.entity.automoderation/AutoModerationAction : dev.kord
 }
 
 sealed class dev.kord.core.entity.automoderation/AutoModerationRule : dev.kord.core.behavior.automoderation/TypedAutoModerationRuleBehavior { // dev.kord.core.entity.automoderation/AutoModerationRule|null[0]
-    constructor <init>(dev.kord.core.cache.data/AutoModerationRuleData, dev.kord.core/Kord, dev.kord.core.supplier/EntitySupplier, dev.kord.common.entity/AutoModerationRuleTriggerType?) // dev.kord.core.entity.automoderation/AutoModerationRule.<init>|<init>(dev.kord.core.cache.data.AutoModerationRuleData;dev.kord.core.Kord;dev.kord.core.supplier.EntitySupplier;dev.kord.common.entity.AutoModerationRuleTriggerType?){}[0]
-
     final val actions // dev.kord.core.entity.automoderation/AutoModerationRule.actions|{}actions[0]
         final fun <get-actions>(): kotlin.collections/List<dev.kord.core.entity.automoderation/AutoModerationAction> // dev.kord.core.entity.automoderation/AutoModerationRule.actions.<get-actions>|<get-actions>(){}[0]
     final val creator // dev.kord.core.entity.automoderation/AutoModerationRule.creator|{}creator[0]
@@ -11707,8 +11698,6 @@ sealed class dev.kord.core.entity.automoderation/AutoModerationRule : dev.kord.c
 }
 
 sealed class dev.kord.core.entity.component/SelectMenuComponent : dev.kord.core.entity.component/Component { // dev.kord.core.entity.component/SelectMenuComponent|null[0]
-    constructor <init>(dev.kord.core.cache.data/ComponentData) // dev.kord.core.entity.component/SelectMenuComponent.<init>|<init>(dev.kord.core.cache.data.ComponentData){}[0]
-
     final val customId // dev.kord.core.entity.component/SelectMenuComponent.customId|{}customId[0]
         final fun <get-customId>(): kotlin/String // dev.kord.core.entity.component/SelectMenuComponent.customId.<get-customId>|<get-customId>(){}[0]
     final val disabled // dev.kord.core.entity.component/SelectMenuComponent.disabled|{}disabled[0]
@@ -11728,8 +11717,6 @@ sealed class dev.kord.core.entity.component/SelectMenuComponent : dev.kord.core.
 }
 
 sealed class dev.kord.core.entity.interaction.followup/FollowupMessage : dev.kord.core.behavior.interaction.followup/FollowupMessageBehavior { // dev.kord.core.entity.interaction.followup/FollowupMessage|null[0]
-    constructor <init>(dev.kord.core.entity/Message) // dev.kord.core.entity.interaction.followup/FollowupMessage.<init>|<init>(dev.kord.core.entity.Message){}[0]
-
     final val message // dev.kord.core.entity.interaction.followup/FollowupMessage.message|{}message[0]
         final fun <get-message>(): dev.kord.core.entity/Message // dev.kord.core.entity.interaction.followup/FollowupMessage.message.<get-message>|<get-message>(){}[0]
     open val channelId // dev.kord.core.entity.interaction.followup/FollowupMessage.channelId|{}channelId[0]
@@ -11741,17 +11728,13 @@ sealed class dev.kord.core.entity.interaction.followup/FollowupMessage : dev.kor
 }
 
 sealed class dev.kord.core.entity.interaction.response/MessageInteractionResponse : dev.kord.core.behavior.interaction.response/MessageInteractionResponseBehavior { // dev.kord.core.entity.interaction.response/MessageInteractionResponse|null[0]
-    constructor <init>(dev.kord.core.entity/Message) // dev.kord.core.entity.interaction.response/MessageInteractionResponse.<init>|<init>(dev.kord.core.entity.Message){}[0]
-
     final val message // dev.kord.core.entity.interaction.response/MessageInteractionResponse.message|{}message[0]
         final fun <get-message>(): dev.kord.core.entity/Message // dev.kord.core.entity.interaction.response/MessageInteractionResponse.message.<get-message>|<get-message>(){}[0]
 
     abstract fun withStrategy(dev.kord.core.supplier/EntitySupplyStrategy<*>): dev.kord.core.entity.interaction.response/MessageInteractionResponse // dev.kord.core.entity.interaction.response/MessageInteractionResponse.withStrategy|withStrategy(dev.kord.core.supplier.EntitySupplyStrategy<*>){}[0]
 }
 
 sealed class dev.kord.core.entity/BaseApplication : dev.kord.core.entity/KordEntity, dev.kord.core.entity/Strategizable { // dev.kord.core.entity/BaseApplication|null[0]
-    constructor <init>(dev.kord.core/Kord, dev.kord.core.supplier/EntitySupplier = ...) // dev.kord.core.entity/BaseApplication.<init>|<init>(dev.kord.core.Kord;dev.kord.core.supplier.EntitySupplier){}[0]
-
     abstract val data // dev.kord.core.entity/BaseApplication.data|{}data[0]
         abstract fun <get-data>(): dev.kord.core.cache.data/BaseApplicationData // dev.kord.core.entity/BaseApplication.data.<get-data>|<get-data>(){}[0]
     final val coverImage // dev.kord.core.entity/BaseApplication.coverImage|{}coverImage[0]
@@ -11811,8 +11794,6 @@ sealed class dev.kord.core.entity/BaseApplication : dev.kord.core.entity/KordEnt
 }
 
 sealed class dev.kord.core.entity/ReactionEmoji { // dev.kord.core.entity/ReactionEmoji|null[0]
-    constructor <init>() // dev.kord.core.entity/ReactionEmoji.<init>|<init>(){}[0]
-
     abstract val mention // dev.kord.core.entity/ReactionEmoji.mention|{}mention[0]
         abstract fun <get-mention>(): kotlin/String // dev.kord.core.entity/ReactionEmoji.mention.<get-mention>|<get-mention>(){}[0]
     abstract val name // dev.kord.core.entity/ReactionEmoji.name|{}name[0]
@@ -11867,8 +11848,6 @@ sealed class dev.kord.core.entity/ReactionEmoji { // dev.kord.core.entity/Reacti
 }
 
 sealed class dev.kord.core.event.gateway/DisconnectEvent : dev.kord.core.event.gateway/GatewayEvent { // dev.kord.core.event.gateway/DisconnectEvent|null[0]
-    constructor <init>() // dev.kord.core.event.gateway/DisconnectEvent.<init>|<init>(){}[0]
-
     final class DetachEvent : dev.kord.core.event.gateway/DisconnectEvent { // dev.kord.core.event.gateway/DisconnectEvent.DetachEvent|null[0]
         constructor <init>(dev.kord.core/Kord, kotlin/Int, kotlin/Any?) // dev.kord.core.event.gateway/DisconnectEvent.DetachEvent.<init>|<init>(dev.kord.core.Kord;kotlin.Int;kotlin.Any?){}[0]
 
@@ -11978,9 +11957,7 @@ sealed class dev.kord.core.event.gateway/DisconnectEvent : dev.kord.core.event.g
     }
 }
 
-sealed class dev.kord.core.event.gateway/GatewayEvent : dev.kord.core.event/Event { // dev.kord.core.event.gateway/GatewayEvent|null[0]
-    constructor <init>() // dev.kord.core.event.gateway/GatewayEvent.<init>|<init>(){}[0]
-}
+sealed class dev.kord.core.event.gateway/GatewayEvent : dev.kord.core.event/Event // dev.kord.core.event.gateway/GatewayEvent|null[0]
 
 final object dev.kord.core.cache.data/NotSerializable : kotlinx.serialization/KSerializer<kotlin/Any?> { // dev.kord.core.cache.data/NotSerializable|null[0]
     final val descriptor // dev.kord.core.cache.data/NotSerializable.descriptor|{}descriptor[0]

gateway/api/gateway.klib.api

@@ -2185,8 +2185,6 @@ final class dev.kord.gateway/WebhooksUpdate : dev.kord.gateway/DispatchEvent { /
 }
 
 sealed class dev.kord.gateway/Close : dev.kord.gateway/Event { // dev.kord.gateway/Close|null[0]
-    constructor <init>() // dev.kord.gateway/Close.<init>|<init>(){}[0]
-
     final class DiscordClose : dev.kord.gateway/Close { // dev.kord.gateway/Close.DiscordClose|null[0]
         constructor <init>(dev.kord.gateway/GatewayCloseCode, kotlin/Boolean) // dev.kord.gateway/Close.DiscordClose.<init>|<init>(dev.kord.gateway.GatewayCloseCode;kotlin.Boolean){}[0]
 
@@ -2219,8 +2217,6 @@ sealed class dev.kord.gateway/Close : dev.kord.gateway/Event { // dev.kord.gatew
 }
 
 sealed class dev.kord.gateway/Command { // dev.kord.gateway/Command|null[0]
-    constructor <init>() // dev.kord.gateway/Command.<init>|<init>(){}[0]
-
     final class Heartbeat : dev.kord.gateway/Command { // dev.kord.gateway/Command.Heartbeat|null[0]
         constructor <init>(kotlin/Int?) // dev.kord.gateway/Command.Heartbeat.<init>|<init>(kotlin.Int?){}[0]
 
@@ -2243,15 +2239,11 @@ sealed class dev.kord.gateway/Command { // dev.kord.gateway/Command|null[0]
 }
 
 sealed class dev.kord.gateway/DispatchEvent : dev.kord.gateway/Event { // dev.kord.gateway/DispatchEvent|null[0]
-    constructor <init>() // dev.kord.gateway/DispatchEvent.<init>|<init>(){}[0]
-
     abstract val sequence // dev.kord.gateway/DispatchEvent.sequence|{}sequence[0]
         abstract fun <get-sequence>(): kotlin/Int? // dev.kord.gateway/DispatchEvent.sequence.<get-sequence>|<get-sequence>(){}[0]
 }
 
 sealed class dev.kord.gateway/Event { // dev.kord.gateway/Event|null[0]
-    constructor <init>() // dev.kord.gateway/Event.<init>|<init>(){}[0]
-
     final object DeserializationStrategy : kotlinx.serialization/DeserializationStrategy<dev.kord.gateway/Event> { // dev.kord.gateway/Event.DeserializationStrategy|null[0]
         final val descriptor // dev.kord.gateway/Event.DeserializationStrategy.descriptor|{}descriptor[0]
             final fun <get-descriptor>(): kotlinx.serialization.descriptors/SerialDescriptor // dev.kord.gateway/Event.DeserializationStrategy.descriptor.<get-descriptor>|<get-descriptor>(){}[0]
@@ -2261,8 +2253,6 @@ sealed class dev.kord.gateway/Event { // dev.kord.gateway/Event|null[0]
 }
 
 sealed class dev.kord.gateway/Intent { // dev.kord.gateway/Intent|null[0]
-    constructor <init>(kotlin/Int) // dev.kord.gateway/Intent.<init>|<init>(kotlin.Int){}[0]
-
     final val code // dev.kord.gateway/Intent.code|{}code[0]
         final fun <get-code>(): dev.kord.common/DiscordBitSet // dev.kord.gateway/Intent.code.<get-code>|<get-code>(){}[0]
     final val shift // dev.kord.gateway/Intent.shift|{}shift[0]

gateway/build.gradle.kts

@@ -30,8 +30,9 @@ kotlin {
                 implementation(libs.kotlin.node)
                 implementation(npm("fast-zlib", libs.versions.fastZlib.get()))
 
-                // workaround for https://youtrack.jetbrains.com/issue/KT-43500
-                // (intended to be compileOnly in commonMain only)
+                // workaround for https://youtrack.jetbrains.com/issue/KT-43500 /
+                // https://youtrack.jetbrains.com/issue/KT-64109#focus=Comments-27-10064206.0-0 /
+                // https://youtrack.jetbrains.com/issue/KT-61096 (intended to be compileOnly in commonMain only)
                 implementation(projects.kspAnnotations)
             }
         }

gradle.properties

@@ -8,6 +8,10 @@ org.gradle.warning.mode=all
 org.gradle.kotlin.dsl.allWarningsAsErrors=true
 kotlin.code.style=official
 
+# https://github.com/Kotlin/kotlinx-atomicfu/issues/448
+# https://youtrack.jetbrains.com/issue/KT-64109#focus=Comments-27-10064206.0-0
+kotlin.suppressGradlePluginWarnings=IncorrectCompileOnlyDependencyWarning
+
 # https://github.com/Kotlin/kotlinx-atomicfu#atomicfu-compiler-plugin
 kotlinx.atomicfu.enableJvmIrTransformation=true
 kotlinx.atomicfu.enableJsIrTransformation=true

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 
 # api dependencies
-kotlin = "2.0.0" # https://github.com/JetBrains/kotlin
+kotlin = "2.0.20" # https://github.com/JetBrains/kotlin
 ktor = "2.3.12" # https://github.com/ktorio/ktor
 kotlinx-coroutines = "1.8.1" # https://github.com/Kotlin/kotlinx.coroutines
 kotlinx-serialization = "1.7.1" # https://github.com/Kotlin/kotlinx.serialization
@@ -18,7 +18,7 @@ stately = "2.0.7" # https://github.com/touchlab/Stately
 fastZlib = "2.0.1" # https://github.com/timotejroiko/fast-zlib
 
 # code generation
-ksp = "2.0.0-1.0.23" # https://github.com/google/ksp
+ksp = "2.0.20-1.0.24" # https://github.com/google/ksp
 kotlinpoet = "1.18.1" # https://github.com/square/kotlinpoet
 
 # tests