Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Kotlin to 1.9.20 #888

Merged
merged 1 commit into from
Nov 18, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions buildSrc/src/main/kotlin/Compiler.kt
Original file line number Diff line number Diff line change
@@ -27,6 +27,7 @@ object Jvm {
fun KotlinCommonCompilerOptions.applyKordCompilerOptions() {
allWarningsAsErrors = true
progressiveMode = true
freeCompilerArgs.add("-Xexpect-actual-classes")
}

fun KotlinSourceSet.applyKordOptIns() {
Original file line number Diff line number Diff line change
@@ -8,16 +8,14 @@ repositories {

kotlin {
jvm()
js(IR) {
js {
nodejs()
}
jvmToolchain(Jvm.target)

targets {
all {
compilations.all {
compilerOptions.options.applyKordCompilerOptions()
}
targets.all {
compilations.all {
compilerOptions.options.applyKordCompilerOptions()
}
}
}
1 change: 0 additions & 1 deletion buildSrc/src/main/kotlin/kord-module.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
org.jetbrains.kotlin.jvm
15 changes: 6 additions & 9 deletions buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ kotlin {
explicitApi()

jvm()
js(IR) {
js {
nodejs()
}
jvmToolchain(Jvm.target)
@@ -37,6 +37,8 @@ kotlin {
}
}

applyDefaultHierarchyTemplate()

sourceSets {
all {
applyKordOptIns()
@@ -53,14 +55,9 @@ kotlin {
val nonJvmMain by creating {
dependsOn(commonMain.get())
}
targets
.map { it.name }
.filter { it != "jvm" && it != "metadata" }
.forEach { target ->
sourceSets.getByName("${target}Main") {
dependsOn(nonJvmMain)
}
}
jsMain {
dependsOn(nonJvmMain)
}
}
}

242 changes: 6 additions & 236 deletions common/api/common.api

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion common/src/commonMain/kotlin/ConcurrentHashMap.kt
Original file line number Diff line number Diff line change
@@ -8,4 +8,4 @@ import dev.kord.common.annotation.KordInternal
* @suppress
*/
@KordInternal
public expect class ConcurrentHashMap<K, V>() : MutableMap<K, V>
public expect fun <K, V> concurrentHashMap(): MutableMap<K, V>
2 changes: 1 addition & 1 deletion common/src/commonMain/kotlin/http/HttpEngine.kt
Original file line number Diff line number Diff line change
@@ -5,4 +5,4 @@ import io.ktor.client.engine.*

/** @suppress */
@KordInternal
public expect object HttpEngine : HttpClientEngineFactory<HttpClientEngineConfig>
public expect fun httpEngine(): HttpClientEngineFactory<HttpClientEngineConfig>
3 changes: 2 additions & 1 deletion common/src/jsMain/kotlin/HttpEngine.kt
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package dev.kord.common.http

import dev.kord.common.annotation.KordInternal
import io.ktor.client.engine.*
import io.ktor.client.engine.js.*

/** @suppress */
@KordInternal
public actual typealias HttpEngine = Js
public actual fun httpEngine(): HttpClientEngineFactory<HttpClientEngineConfig> = Js
3 changes: 2 additions & 1 deletion common/src/jvmMain/kotlin/ConcurrentHashMap.kt
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package dev.kord.common

import dev.kord.common.annotation.KordInternal
import java.util.concurrent.ConcurrentHashMap

/** @suppress */
@KordInternal
public actual typealias ConcurrentHashMap<K, V> = java.util.concurrent.ConcurrentHashMap<K, V>
public actual fun <K, V> concurrentHashMap(): MutableMap<K, V> = ConcurrentHashMap()
2 changes: 1 addition & 1 deletion common/src/jvmMain/kotlin/http/HttpEngine.kt
Original file line number Diff line number Diff line change
@@ -6,4 +6,4 @@ import io.ktor.client.engine.cio.*

/** @suppress */
@KordInternal
public actual object HttpEngine : HttpClientEngineFactory<HttpClientEngineConfig> by CIO
public actual fun httpEngine(): HttpClientEngineFactory<HttpClientEngineConfig> = CIO
4 changes: 1 addition & 3 deletions common/src/nonJvmMain/kotlin/ConcurrentHashMap.kt
Original file line number Diff line number Diff line change
@@ -5,6 +5,4 @@ import dev.kord.common.annotation.KordInternal

/** @suppress */
@KordInternal
// using an actual typealias seems to be broken in Kotlin/JS 1.9.0
// public actual typealias ConcurrentHashMap<K, V> = ConcurrentMutableMap<K, V>
public actual class ConcurrentHashMap<K, V> : MutableMap<K, V> by ConcurrentMutableMap()
public actual fun <K, V> concurrentHashMap(): MutableMap<K, V> = ConcurrentMutableMap()
146 changes: 0 additions & 146 deletions core/api/core.api

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -8,11 +8,11 @@ plugins {
kotlin {
js {
nodejs {
testTask(Action {
testTask {
useMocha {
timeout = "10000" // KordEventDropTest is too slow for default 2 seconds timeout
}
})
}
}
}

4 changes: 2 additions & 2 deletions core/src/commonMain/kotlin/builder/kord/KordBuilderUtil.kt
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ package dev.kord.core.builder.kord

import dev.kord.common.annotation.KordInternal
import dev.kord.common.entity.Snowflake
import dev.kord.common.http.HttpEngine
import dev.kord.common.http.httpEngine
import io.ktor.client.*
import io.ktor.client.plugins.contentnegotiation.*
import io.ktor.client.plugins.websocket.*
@@ -33,7 +33,7 @@ public fun HttpClient?.configure(): HttpClient {
isLenient = true
}

return HttpClient(HttpEngine) {
return HttpClient(httpEngine()) {
defaultConfig()
install(ContentNegotiation) {
json(json)
4 changes: 2 additions & 2 deletions core/src/commonMain/kotlin/cache/KordCache.kt
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ import dev.kord.cache.api.delegate.DelegatingDataCache
import dev.kord.cache.api.delegate.EntrySupplier
import dev.kord.cache.map.MapLikeCollection
import dev.kord.cache.map.internal.MapEntryCache
import dev.kord.common.ConcurrentHashMap
import dev.kord.common.concurrentHashMap
import dev.kord.common.entity.Snowflake
import dev.kord.core.cache.data.*

@@ -16,7 +16,7 @@ public typealias Generator<I, T> = (cache: DataCache, description: DataDescripti
public class KordCacheBuilder {

/**
* The default behavior for all types not explicitly configured, by default a [ConcurrentHashMap] is supplied.
* The default behavior for all types not explicitly configured, by default a [concurrentHashMap] is supplied.
*/
public var defaultGenerator: Generator<Any, Any> = { cache, description ->
MapEntryCache(cache, description, MapLikeCollection.concurrentHashMap())
38 changes: 0 additions & 38 deletions gateway/api/gateway.api

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions gateway/src/commonMain/kotlin/DefaultGatewayBuilder.kt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package dev.kord.gateway

import dev.kord.common.KordConfiguration
import dev.kord.common.http.HttpEngine
import dev.kord.common.http.httpEngine
import dev.kord.common.ratelimit.IntervalRateLimiter
import dev.kord.common.ratelimit.RateLimiter
import dev.kord.gateway.ratelimit.IdentifyRateLimiter
@@ -27,7 +27,7 @@ public class DefaultGatewayBuilder {
public var eventFlow: MutableSharedFlow<Event> = MutableSharedFlow(extraBufferCapacity = Int.MAX_VALUE)

public fun build(): DefaultGateway {
val client = client ?: HttpClient(HttpEngine) {
val client = client ?: HttpClient(httpEngine()) {
install(WebSockets)
install(ContentNegotiation) {
json()
4 changes: 3 additions & 1 deletion gateway/src/commonMain/kotlin/Inflater.kt
Original file line number Diff line number Diff line change
@@ -3,6 +3,8 @@ package dev.kord.gateway
import io.ktor.utils.io.core.*
import io.ktor.websocket.*

internal expect class Inflater() : Closeable {
internal interface Inflater : Closeable {
fun Frame.inflateData(): String
}

internal expect fun Inflater(): Inflater
5 changes: 2 additions & 3 deletions gateway/src/jsMain/kotlin/Inflater.kt
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
package dev.kord.gateway

import dev.kord.gateway.internal.Inflate
import io.ktor.utils.io.core.*
import io.ktor.websocket.*
import node.buffer.Buffer
import node.buffer.BufferEncoding

internal actual class Inflater : Closeable {
internal actual fun Inflater() = object : Inflater {
private val inflate = Inflate()

actual fun Frame.inflateData(): String {
override fun Frame.inflateData(): String {
val buffer = Buffer.from(data)

return inflate.process(buffer).toString(BufferEncoding.utf8)
6 changes: 2 additions & 4 deletions gateway/src/jvmMain/kotlin/Inflater.kt
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
package dev.kord.gateway

import io.ktor.utils.io.core.*
import io.ktor.websocket.*
import java.io.ByteArrayOutputStream
import java.util.zip.InflaterOutputStream
import kotlin.io.use

internal actual class Inflater : Closeable {
internal actual fun Inflater() = object : Inflater {
private val delegate = java.util.zip.Inflater()

actual fun Frame.inflateData(): String {
override fun Frame.inflateData(): String {
val outputStream = ByteArrayOutputStream()
InflaterOutputStream(outputStream, delegate).use {
it.write(data)
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]

# api dependencies
kotlin = "1.9.10" # https://github.com/JetBrains/kotlin
kotlin = "1.9.20" # https://github.com/JetBrains/kotlin
ktor = "2.3.5" # https://github.com/ktorio/ktor
kotlinx-coroutines = "1.7.3" # https://github.com/Kotlin/kotlinx.coroutines
kotlinx-serialization = "1.6.0" # https://github.com/Kotlin/kotlinx.serialization
@@ -16,7 +16,7 @@ stately = "2.0.5" # https://github.com/touchlab/Stately
fastZlib = "2.0.1" # https://github.com/timotejroiko/fast-zlib

# code generation
ksp = "1.9.10-1.0.13" # https://github.com/google/ksp
ksp = "1.9.20-1.0.13" # https://github.com/google/ksp
kotlinpoet = "1.14.2" # https://github.com/square/kotlinpoet

# tests
6 changes: 3 additions & 3 deletions kotlin-js-store/yarn.lock
Original file line number Diff line number Diff line change
@@ -213,9 +213,9 @@ fs.realpath@^1.0.0:
integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==

fsevents@~2.3.2:
version "2.3.2"
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
version "2.3.3"
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==

get-caller-file@^2.0.5:
version "2.0.5"
164 changes: 0 additions & 164 deletions rest/api/rest.api

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions rest/src/commonMain/kotlin/ratelimit/AbstractRateLimiter.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package dev.kord.rest.ratelimit

import dev.kord.common.ConcurrentHashMap
import dev.kord.common.concurrentHashMap
import dev.kord.common.ratelimit.IntervalRateLimiter
import dev.kord.rest.request.Request
import dev.kord.rest.request.RequestIdentifier
@@ -19,8 +19,8 @@ public abstract class AbstractRateLimiter internal constructor(public val clock:

private val autoBanRateLimiter = IntervalRateLimiter(limit = 25000, interval = 10.minutes)
private val globalSuspensionPoint = atomic(clock.now())
internal val buckets = ConcurrentHashMap<BucketKey, Bucket>()
private val routeBuckets = ConcurrentHashMap<RequestIdentifier, MutableSet<BucketKey>>()
internal val buckets = concurrentHashMap<BucketKey, Bucket>()
private val routeBuckets = concurrentHashMap<RequestIdentifier, MutableSet<BucketKey>>()

internal val BucketKey.bucket get() = buckets.getOrPut(this) { Bucket(this) }
private val Request<*, *>.buckets get() = routeBuckets[identifier].orEmpty().map { it.bucket }
4 changes: 2 additions & 2 deletions rest/src/commonMain/kotlin/request/KtorRequestHandler.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package dev.kord.rest.request

import dev.kord.common.http.HttpEngine
import dev.kord.common.http.httpEngine
import dev.kord.rest.json.response.DiscordErrorResponse
import dev.kord.rest.ratelimit.*
import dev.kord.rest.route.optional
@@ -108,7 +108,7 @@ public fun KtorRequestHandler(
clock: Clock = Clock.System,
parser: Json = jsonDefault,
): KtorRequestHandler {
val client = HttpClient(HttpEngine) {
val client = HttpClient(httpEngine()) {
expectSuccess = false
}
return KtorRequestHandler(client, requestRateLimiter, clock, parser, token)
22 changes: 0 additions & 22 deletions voice/api/voice.api
Original file line number Diff line number Diff line change
@@ -556,7 +556,6 @@ public final class dev/kord/voice/gateway/DefaultVoiceGatewayData {

public final class dev/kord/voice/gateway/Heartbeat : dev/kord/voice/gateway/Command {
public static final field Companion Ldev/kord/voice/gateway/Heartbeat$Companion;
public synthetic fun <init> (IJLkotlinx/serialization/internal/SerializationConstructorMarker;)V
public fun <init> (J)V
public final fun component1 ()J
public final fun copy (J)Ldev/kord/voice/gateway/Heartbeat;
@@ -565,7 +564,6 @@ public final class dev/kord/voice/gateway/Heartbeat : dev/kord/voice/gateway/Com
public final fun getNonce ()J
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
public static final synthetic fun write$Self (Ldev/kord/voice/gateway/Heartbeat;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
}

public final class dev/kord/voice/gateway/Heartbeat$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
@@ -585,7 +583,6 @@ public final class dev/kord/voice/gateway/Heartbeat$Companion {

public final class dev/kord/voice/gateway/HeartbeatAck : dev/kord/voice/gateway/VoiceEvent {
public static final field Companion Ldev/kord/voice/gateway/HeartbeatAck$Companion;
public synthetic fun <init> (IJLkotlinx/serialization/internal/SerializationConstructorMarker;)V
public fun <init> (J)V
public final fun component1 ()J
public final fun copy (J)Ldev/kord/voice/gateway/HeartbeatAck;
@@ -594,7 +591,6 @@ public final class dev/kord/voice/gateway/HeartbeatAck : dev/kord/voice/gateway/
public final fun getNonce ()J
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
public static final synthetic fun write$Self (Ldev/kord/voice/gateway/HeartbeatAck;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
}

public final class dev/kord/voice/gateway/HeartbeatAck$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
@@ -614,7 +610,6 @@ public final class dev/kord/voice/gateway/HeartbeatAck$Companion {

public final class dev/kord/voice/gateway/Hello : dev/kord/voice/gateway/VoiceEvent {
public static final field Companion Ldev/kord/voice/gateway/Hello$Companion;
public synthetic fun <init> (ISDLkotlinx/serialization/internal/SerializationConstructorMarker;)V
public fun <init> (SD)V
public final fun component1 ()S
public final fun component2 ()D
@@ -625,7 +620,6 @@ public final class dev/kord/voice/gateway/Hello : dev/kord/voice/gateway/VoiceEv
public final fun getVersion ()S
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
public static final synthetic fun write$Self (Ldev/kord/voice/gateway/Hello;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
}

public final class dev/kord/voice/gateway/Hello$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
@@ -645,7 +639,6 @@ public final class dev/kord/voice/gateway/Hello$Companion {

public final class dev/kord/voice/gateway/Identify : dev/kord/voice/gateway/Command {
public static final field Companion Ldev/kord/voice/gateway/Identify$Companion;
public synthetic fun <init> (ILdev/kord/common/entity/Snowflake;Ldev/kord/common/entity/Snowflake;Ljava/lang/String;Ljava/lang/String;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
public fun <init> (Ldev/kord/common/entity/Snowflake;Ldev/kord/common/entity/Snowflake;Ljava/lang/String;Ljava/lang/String;)V
public final fun component1 ()Ldev/kord/common/entity/Snowflake;
public final fun component2 ()Ldev/kord/common/entity/Snowflake;
@@ -660,7 +653,6 @@ public final class dev/kord/voice/gateway/Identify : dev/kord/voice/gateway/Comm
public final fun getUserId ()Ldev/kord/common/entity/Snowflake;
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
public static final synthetic fun write$Self (Ldev/kord/voice/gateway/Identify;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
}

public final class dev/kord/voice/gateway/Identify$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
@@ -700,7 +692,6 @@ public final class dev/kord/voice/gateway/OpCode : java/lang/Enum {
public final class dev/kord/voice/gateway/Ready : dev/kord/voice/gateway/VoiceEvent {
public static final field Companion Ldev/kord/voice/gateway/Ready$Companion;
public synthetic fun <init> (ILjava/lang/String;ILjava/util/List;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
public synthetic fun <init> (ILkotlin/UInt;Ljava/lang/String;ILjava/util/List;Lkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun component1-pVg5ArA ()I
public final fun component2 ()Ljava/lang/String;
public final fun component3 ()I
@@ -714,7 +705,6 @@ public final class dev/kord/voice/gateway/Ready : dev/kord/voice/gateway/VoiceEv
public final fun getSsrc-pVg5ArA ()I
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
public static final synthetic fun write$Self (Ldev/kord/voice/gateway/Ready;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
}

public final class dev/kord/voice/gateway/Ready$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
@@ -734,7 +724,6 @@ public final class dev/kord/voice/gateway/Ready$Companion {

public final class dev/kord/voice/gateway/Resume : dev/kord/voice/gateway/Command {
public static final field Companion Ldev/kord/voice/gateway/Resume$Companion;
public synthetic fun <init> (ILdev/kord/common/entity/Snowflake;Ljava/lang/String;Ljava/lang/String;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
public fun <init> (Ldev/kord/common/entity/Snowflake;Ljava/lang/String;Ljava/lang/String;)V
public final fun component1 ()Ldev/kord/common/entity/Snowflake;
public final fun component2 ()Ljava/lang/String;
@@ -747,7 +736,6 @@ public final class dev/kord/voice/gateway/Resume : dev/kord/voice/gateway/Comman
public final fun getToken ()Ljava/lang/String;
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
public static final synthetic fun write$Self (Ldev/kord/voice/gateway/Resume;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
}

public final class dev/kord/voice/gateway/Resume$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
@@ -772,7 +760,6 @@ public final class dev/kord/voice/gateway/Resumed : dev/kord/voice/gateway/Voice

public final class dev/kord/voice/gateway/SelectProtocol : dev/kord/voice/gateway/Command {
public static final field Companion Ldev/kord/voice/gateway/SelectProtocol$Companion;
public synthetic fun <init> (ILjava/lang/String;Ldev/kord/voice/gateway/SelectProtocol$Data;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
public fun <init> (Ljava/lang/String;Ldev/kord/voice/gateway/SelectProtocol$Data;)V
public final fun component1 ()Ljava/lang/String;
public final fun component2 ()Ldev/kord/voice/gateway/SelectProtocol$Data;
@@ -783,7 +770,6 @@ public final class dev/kord/voice/gateway/SelectProtocol : dev/kord/voice/gatewa
public final fun getProtocol ()Ljava/lang/String;
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
public static final synthetic fun write$Self (Ldev/kord/voice/gateway/SelectProtocol;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
}

public final class dev/kord/voice/gateway/SelectProtocol$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
@@ -803,7 +789,6 @@ public final class dev/kord/voice/gateway/SelectProtocol$Companion {

public final class dev/kord/voice/gateway/SelectProtocol$Data {
public static final field Companion Ldev/kord/voice/gateway/SelectProtocol$Data$Companion;
public synthetic fun <init> (ILjava/lang/String;ILdev/kord/voice/EncryptionMode;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
public fun <init> (Ljava/lang/String;ILdev/kord/voice/EncryptionMode;)V
public final fun component1 ()Ljava/lang/String;
public final fun component2 ()I
@@ -816,7 +801,6 @@ public final class dev/kord/voice/gateway/SelectProtocol$Data {
public final fun getPort ()I
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
public static final synthetic fun write$Self (Ldev/kord/voice/gateway/SelectProtocol$Data;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
}

public final class dev/kord/voice/gateway/SelectProtocol$Data$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
@@ -836,7 +820,6 @@ public final class dev/kord/voice/gateway/SelectProtocol$Data$Companion {

public final class dev/kord/voice/gateway/SendSpeaking : dev/kord/voice/gateway/Command {
public static final field Companion Ldev/kord/voice/gateway/SendSpeaking$Companion;
public synthetic fun <init> (ILdev/kord/voice/SpeakingFlags;ILkotlin/UInt;Lkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
public synthetic fun <init> (Ldev/kord/voice/SpeakingFlags;IILkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun component1 ()Ldev/kord/voice/SpeakingFlags;
public final fun component2 ()I
@@ -849,7 +832,6 @@ public final class dev/kord/voice/gateway/SendSpeaking : dev/kord/voice/gateway/
public final fun getSsrc-pVg5ArA ()I
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
public static final synthetic fun write$Self (Ldev/kord/voice/gateway/SendSpeaking;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
}

public final class dev/kord/voice/gateway/SendSpeaking$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
@@ -869,7 +851,6 @@ public final class dev/kord/voice/gateway/SendSpeaking$Companion {

public final class dev/kord/voice/gateway/SessionDescription : dev/kord/voice/gateway/VoiceEvent {
public static final field Companion Ldev/kord/voice/gateway/SessionDescription$Companion;
public synthetic fun <init> (ILdev/kord/voice/EncryptionMode;Ljava/util/List;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
public fun <init> (Ldev/kord/voice/EncryptionMode;Ljava/util/List;)V
public final fun component1 ()Ldev/kord/voice/EncryptionMode;
public final fun component2 ()Ljava/util/List;
@@ -880,7 +861,6 @@ public final class dev/kord/voice/gateway/SessionDescription : dev/kord/voice/ga
public final fun getSecretKey ()Ljava/util/List;
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
public static final synthetic fun write$Self (Ldev/kord/voice/gateway/SessionDescription;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
}

public final class dev/kord/voice/gateway/SessionDescription$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
@@ -900,7 +880,6 @@ public final class dev/kord/voice/gateway/SessionDescription$Companion {

public final class dev/kord/voice/gateway/Speaking : dev/kord/voice/gateway/VoiceEvent {
public static final field Companion Ldev/kord/voice/gateway/Speaking$Companion;
public synthetic fun <init> (ILdev/kord/common/entity/Snowflake;Lkotlin/UInt;Ldev/kord/voice/SpeakingFlags;Lkotlinx/serialization/internal/SerializationConstructorMarker;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
public synthetic fun <init> (Ldev/kord/common/entity/Snowflake;ILdev/kord/voice/SpeakingFlags;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun component1 ()Ldev/kord/common/entity/Snowflake;
public final fun component2-pVg5ArA ()I
@@ -913,7 +892,6 @@ public final class dev/kord/voice/gateway/Speaking : dev/kord/voice/gateway/Voic
public final fun getUserId ()Ldev/kord/common/entity/Snowflake;
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
public static final synthetic fun write$Self (Ldev/kord/voice/gateway/Speaking;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
}

public final class dev/kord/voice/gateway/Speaking$$serializer : kotlinx/serialization/internal/GeneratedSerializer {