From 07246540ffad4a07f6ae9e9cb24610664b0a0cdb Mon Sep 17 00:00:00 2001 From: Michael Rittmeister Date: Wed, 24 Jan 2024 18:49:54 +0100 Subject: [PATCH] Rebase on main - Upgrade kotlin-js-store/yarn.lock - Remove deprecated KLogger.error - test-kit - Update native inflater and HttpClient definitions - Remove deprecated gatewayOnLogger - Upgrade api dump - Replace deprecated java.net.URL --- buildSrc/src/main/kotlin/Documentation.kt | 4 +- ...d-internal-multiplatform-module.gradle.kts | 2 +- .../kord-multiplatform-module.gradle.kts | 9 +---- common/api/common.api | 4 +- ...icationRoleConnectionMetadataRecordType.kt | 39 +++++++++++-------- common/src/appleMain/kotlin/HttpEngine.kt | 2 +- .../entity/DiscordRoleConnectionMetadata.kt | 22 +++++------ common/src/mingwMain/kotlin/HttpEngine.kt | 2 +- core/build.gradle.kts | 5 +++ gateway/api/gateway.api | 5 --- gateway/build.gradle.kts | 3 -- gateway/src/commonMain/kotlin/Gateway.kt | 5 --- gateway/src/commonMain/kotlin/Utils.kt | 8 ---- gateway/src/nativeMain/kotlin/Inflater.kt | 7 ++-- gradle/libs.versions.toml | 5 +-- kotlin-js-store/yarn.lock | 18 --------- .../kotlin/ratelimit/AbstractRateLimiter.kt | 4 -- .../kotlin/AbstractRateLimiter.kt | 3 -- test-kit/src/commonMain/kotlin/Platform.kt | 1 - test-kit/src/jsMain/kotlin/Platform.node.kt | 2 +- 20 files changed, 53 insertions(+), 97 deletions(-) delete mode 100644 gateway/src/commonMain/kotlin/Utils.kt delete mode 100644 rest/src/nativeMain/kotlin/ratelimit/AbstractRateLimiter.kt delete mode 100644 rest/src/nonNativeMain/kotlin/AbstractRateLimiter.kt diff --git a/buildSrc/src/main/kotlin/Documentation.kt b/buildSrc/src/main/kotlin/Documentation.kt index 090ed8310b6..92eb73e751c 100644 --- a/buildSrc/src/main/kotlin/Documentation.kt +++ b/buildSrc/src/main/kotlin/Documentation.kt @@ -1,6 +1,6 @@ import org.gradle.kotlin.dsl.assign import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask -import java.net.URL +import java.net.URI fun AbstractDokkaLeafTask.applyKordDokkaOptions() { @@ -16,7 +16,7 @@ fun AbstractDokkaLeafTask.applyKordDokkaOptions() { sourceLink { localDirectory = project.projectDir - remoteUrl = URL("https://github.com/kordlib/kord/blob/${project.commitHash}/${project.name}") + remoteUrl = URI("https://github.com/kordlib/kord/blob/${project.commitHash}/${project.name}").toURL() remoteLineSuffix = "#L" } diff --git a/buildSrc/src/main/kotlin/kord-internal-multiplatform-module.gradle.kts b/buildSrc/src/main/kotlin/kord-internal-multiplatform-module.gradle.kts index 3c041c6e387..3ec4029669e 100644 --- a/buildSrc/src/main/kotlin/kord-internal-multiplatform-module.gradle.kts +++ b/buildSrc/src/main/kotlin/kord-internal-multiplatform-module.gradle.kts @@ -10,7 +10,7 @@ repositories { @OptIn(ExperimentalKotlinGradlePluginApi::class) kotlin { - targetHierarchy.default() + applyDefaultHierarchyTemplate() jvm() js { nodejs() diff --git a/buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts b/buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts index 52c7a1a6f05..a876163a4e6 100644 --- a/buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts +++ b/buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts @@ -24,8 +24,9 @@ apiValidation { applyKordBCVOptions() } +@OptIn(ExperimentalKotlinGradlePluginApi::class) kotlin { - targetHierarchy.default { + applyDefaultHierarchyTemplate { common { group("nonJvm") { withNative() @@ -66,12 +67,6 @@ kotlin { implementation(project(":test-kit")) } } - val nonJvmMain by creating { - dependsOn(commonMain.get()) - } - jsMain { - dependsOn(nonJvmMain) - } } } diff --git a/common/api/common.api b/common/api/common.api index 18ae0b41cc7..cd62379b349 100644 --- a/common/api/common.api +++ b/common/api/common.api @@ -2626,7 +2626,6 @@ public final class dev/kord/common/entity/DiscordApplicationRoleConnectionMetada public final class dev/kord/common/entity/DiscordApplicationRoleConnectionMetadataRecord { public static final field Companion Ldev/kord/common/entity/DiscordApplicationRoleConnectionMetadataRecord$Companion; - public synthetic fun (ILdev/kord/common/entity/DiscordApplicationRoleConnectionMetadataRecordType;Ljava/lang/String;Ljava/lang/String;Ldev/kord/common/entity/optional/Optional;Ljava/lang/String;Ldev/kord/common/entity/optional/Optional;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V public fun (Ldev/kord/common/entity/DiscordApplicationRoleConnectionMetadataRecordType;Ljava/lang/String;Ljava/lang/String;Ldev/kord/common/entity/optional/Optional;Ljava/lang/String;Ldev/kord/common/entity/optional/Optional;)V public synthetic fun (Ldev/kord/common/entity/DiscordApplicationRoleConnectionMetadataRecordType;Ljava/lang/String;Ljava/lang/String;Ldev/kord/common/entity/optional/Optional;Ljava/lang/String;Ldev/kord/common/entity/optional/Optional;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Ldev/kord/common/entity/DiscordApplicationRoleConnectionMetadataRecordType; @@ -2646,7 +2645,6 @@ public final class dev/kord/common/entity/DiscordApplicationRoleConnectionMetada public final fun getType ()Ldev/kord/common/entity/DiscordApplicationRoleConnectionMetadataRecordType; public fun hashCode ()I public fun toString ()Ljava/lang/String; - public static final synthetic fun write$Self (Ldev/kord/common/entity/DiscordApplicationRoleConnectionMetadataRecord;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V } public final class dev/kord/common/entity/DiscordApplicationRoleConnectionMetadataRecord$$serializer : kotlinx/serialization/internal/GeneratedSerializer { @@ -2682,6 +2680,7 @@ public final class dev/kord/common/entity/DiscordApplicationRoleConnectionMetada } public final class dev/kord/common/entity/DiscordApplicationRoleConnectionMetadataRecordType$Companion { + public final fun from (I)Ldev/kord/common/entity/DiscordApplicationRoleConnectionMetadataRecordType; public final fun getEntries ()Ljava/util/List; public final fun serializer ()Lkotlinx/serialization/KSerializer; } @@ -2711,7 +2710,6 @@ public final class dev/kord/common/entity/DiscordApplicationRoleConnectionMetada } public final class dev/kord/common/entity/DiscordApplicationRoleConnectionMetadataRecordType$Unknown : dev/kord/common/entity/DiscordApplicationRoleConnectionMetadataRecordType { - public fun (I)V } public final class dev/kord/common/entity/DiscordAttachment { diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/DiscordApplicationRoleConnectionMetadataRecordType.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/DiscordApplicationRoleConnectionMetadataRecordType.kt index df3e645a038..93375a7942f 100644 --- a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/DiscordApplicationRoleConnectionMetadataRecordType.kt +++ b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/DiscordApplicationRoleConnectionMetadataRecordType.kt @@ -1,6 +1,6 @@ // THIS FILE IS AUTO-GENERATED, DO NOT EDIT! -@file:Suppress(names = arrayOf("RedundantVisibilityModifier", "IncorrectFormatting", - "ReplaceArrayOfWithLiteral", "SpellCheckingInspection", "GrazieInspection")) +@file:Suppress(names = arrayOf("IncorrectFormatting", "ReplaceArrayOfWithLiteral", + "SpellCheckingInspection", "GrazieInspection")) package dev.kord.common.entity @@ -32,7 +32,8 @@ public sealed class DiscordApplicationRoleConnectionMetadataRecordType( final override fun hashCode(): Int = value.hashCode() final override fun toString(): String = - "DiscordApplicationRoleConnectionMetadataRecordType.${this::class.simpleName}(value=$value)" + if (this is Unknown) "DiscordApplicationRoleConnectionMetadataRecordType.Unknown(value=$value)" + else "DiscordApplicationRoleConnectionMetadataRecordType.${this::class.simpleName}" /** * An unknown [DiscordApplicationRoleConnectionMetadataRecordType]. @@ -40,7 +41,7 @@ public sealed class DiscordApplicationRoleConnectionMetadataRecordType( * This is used as a fallback for [DiscordApplicationRoleConnectionMetadataRecordType]s that * haven't been added to Kord yet. */ - public class Unknown( + public class Unknown internal constructor( `value`: Int, ) : DiscordApplicationRoleConnectionMetadataRecordType(value) @@ -98,18 +99,7 @@ public sealed class DiscordApplicationRoleConnectionMetadataRecordType( } override fun deserialize(decoder: Decoder): - DiscordApplicationRoleConnectionMetadataRecordType = - when (val value = decoder.decodeInt()) { - 1 -> IntegerLessThanOrEqual - 2 -> IntegerGreaterThanOrEqual - 3 -> IntegerEqual - 4 -> IntegerNotEqual - 5 -> DateTimeLessThanOrEqual - 6 -> DateTimeGreaterThanOrEqual - 7 -> BooleanEqual - 8 -> BooleanNotEqual - else -> Unknown(value) - } + DiscordApplicationRoleConnectionMetadataRecordType = from(decoder.decodeInt()) } public companion object { @@ -130,5 +120,22 @@ public sealed class DiscordApplicationRoleConnectionMetadataRecordType( ) } + + /** + * Returns an instance of [DiscordApplicationRoleConnectionMetadataRecordType] with + * [DiscordApplicationRoleConnectionMetadataRecordType.value] equal to the specified [value]. + */ + public fun from(`value`: Int): DiscordApplicationRoleConnectionMetadataRecordType = + when (value) { + 1 -> IntegerLessThanOrEqual + 2 -> IntegerGreaterThanOrEqual + 3 -> IntegerEqual + 4 -> IntegerNotEqual + 5 -> DateTimeLessThanOrEqual + 6 -> DateTimeGreaterThanOrEqual + 7 -> BooleanEqual + 8 -> BooleanNotEqual + else -> Unknown(value) + } } } diff --git a/common/src/appleMain/kotlin/HttpEngine.kt b/common/src/appleMain/kotlin/HttpEngine.kt index d43679d2357..945d0d5fb1c 100644 --- a/common/src/appleMain/kotlin/HttpEngine.kt +++ b/common/src/appleMain/kotlin/HttpEngine.kt @@ -6,4 +6,4 @@ import io.ktor.client.engine.darwin.* /** @suppress */ @KordInternal -public actual object HttpEngine: HttpClientEngineFactory by Darwin +public actual fun httpEngine(): HttpClientEngineFactory = Darwin diff --git a/common/src/commonMain/kotlin/entity/DiscordRoleConnectionMetadata.kt b/common/src/commonMain/kotlin/entity/DiscordRoleConnectionMetadata.kt index c1150a053e7..5d9f508b8ec 100644 --- a/common/src/commonMain/kotlin/entity/DiscordRoleConnectionMetadata.kt +++ b/common/src/commonMain/kotlin/entity/DiscordRoleConnectionMetadata.kt @@ -1,45 +1,45 @@ -@file:GenerateKordEnum( +@file:Generate( name = "DiscordApplicationRoleConnectionMetadataRecordType", - valueType = GenerateKordEnum.ValueType.INT, docUrl = "https://discord.com/developers/docs/resources/application-role-connection-metadata#application-role-connection-metadata-object-application-role-connection-metadata-type", kDoc = "Type of [DiscordRoleConnectionMetadata] values", + entityType = Generate.EntityType.INT_KORD_ENUM, entries = [ - GenerateKordEnum.Entry( + Generate.Entry( name = "IntegerLessThanOrEqual", intValue = 1, kDoc = "The metadata value (integer) is less than or equal to the guild's configured value (integer)" ), - GenerateKordEnum.Entry( + Generate.Entry( name = "IntegerGreaterThanOrEqual", intValue = 2, kDoc = "The metadata value (integer) is greater than or equal to the guild's configured value (integer)" ), - GenerateKordEnum.Entry( + Generate.Entry( name = "IntegerEqual", intValue = 3, kDoc = "The metadata value (integer) is equal to the guild's configured value (integer)" ), - GenerateKordEnum.Entry( + Generate.Entry( name = "IntegerNotEqual", intValue = 4, kDoc = "The metadata value (integer) is not equal to the guild's configured value (integer)" ), - GenerateKordEnum.Entry( + Generate.Entry( name = "DateTimeLessThanOrEqual", intValue = 5, kDoc = "The metadata value (ISO8601 string) is less than or equal to the guild's configured value (integer; days before current date)" ), - GenerateKordEnum.Entry( + Generate.Entry( name = "DateTimeGreaterThanOrEqual", intValue = 6, kDoc = "The metadata value (ISO8601 string) is greater than or equal to the guild's configured value (integer; days before current date)" ), - GenerateKordEnum.Entry( + Generate.Entry( name = "BooleanEqual", intValue = 7, kDoc = "The metadata value (integer) is equal to the guild's configured value (integer; 1)" ), - GenerateKordEnum.Entry( + Generate.Entry( name = "BooleanNotEqual", intValue = 8, kDoc = "The metadata value (integer) is not equal to the guild's configured value (integer; 1)" @@ -51,7 +51,7 @@ package dev.kord.common.entity import dev.kord.common.Locale import dev.kord.common.entity.optional.Optional -import dev.kord.ksp.GenerateKordEnum +import dev.kord.ksp.Generate import kotlinx.serialization.Serializable /** diff --git a/common/src/mingwMain/kotlin/HttpEngine.kt b/common/src/mingwMain/kotlin/HttpEngine.kt index eb8489d3bed..9c3eb3dc13c 100644 --- a/common/src/mingwMain/kotlin/HttpEngine.kt +++ b/common/src/mingwMain/kotlin/HttpEngine.kt @@ -6,4 +6,4 @@ import io.ktor.client.engine.winhttp.* /** @suppress */ @KordInternal -public actual object HttpEngine : HttpClientEngineFactory by WinHttp +public actual fun httpEngine(): HttpClientEngineFactory = WinHttp diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 1351ed54cd1..aef1219e128 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -33,6 +33,11 @@ kotlin { implementation(libs.kotlin.logging.old) } } + nonJvmMain { + dependencies { + implementation(libs.stately.collections) + } + } jvmMain { dependencies { implementation(libs.slf4j.api) diff --git a/gateway/api/gateway.api b/gateway/api/gateway.api index c16823edfd4..e5cf9c435d2 100644 --- a/gateway/api/gateway.api +++ b/gateway/api/gateway.api @@ -668,7 +668,6 @@ public final class dev/kord/gateway/GatewayConfigurationBuilder { public final class dev/kord/gateway/GatewayKt { public static final fun editPresence (Ldev/kord/gateway/Gateway;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - public static final fun getGatewayOnLogger ()Lmu/KLogger; public static final fun logCaughtThrowable (Ljava/lang/Throwable;)V public static final fun requestGuildMembers (Ldev/kord/gateway/Gateway;Ldev/kord/common/entity/Snowflake;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/flow/Flow; public static final fun requestGuildMembers (Ldev/kord/gateway/Gateway;Ldev/kord/gateway/RequestGuildMembers;)Lkotlinx/coroutines/flow/Flow; @@ -1875,10 +1874,6 @@ public final class dev/kord/gateway/UserUpdate : dev/kord/gateway/DispatchEvent public fun toString ()Ljava/lang/String; } -public final class dev/kord/gateway/UtilsKt { - public static final fun error (Lmu/KLogger;Ljava/lang/Throwable;)V -} - public final class dev/kord/gateway/VoiceServerUpdate : dev/kord/gateway/DispatchEvent { public fun (Ldev/kord/common/entity/DiscordVoiceServerUpdateData;Ljava/lang/Integer;)V public final fun component1 ()Ldev/kord/common/entity/DiscordVoiceServerUpdateData; diff --git a/gateway/build.gradle.kts b/gateway/build.gradle.kts index 1a0f0c1d718..4d910dce089 100644 --- a/gateway/build.gradle.kts +++ b/gateway/build.gradle.kts @@ -15,9 +15,6 @@ kotlin { implementation(libs.kotlin.logging) - // TODO remove when gatewayOnLogger and mu.KLogger.error() are removed - implementation(libs.kotlin.logging.old) - compileOnly(projects.kspAnnotations) } } diff --git a/gateway/src/commonMain/kotlin/Gateway.kt b/gateway/src/commonMain/kotlin/Gateway.kt index 577e260e31e..2948b89b5c9 100644 --- a/gateway/src/commonMain/kotlin/Gateway.kt +++ b/gateway/src/commonMain/kotlin/Gateway.kt @@ -139,11 +139,6 @@ public suspend inline fun Gateway.start(token: String, config: GatewayConfigurat start(builder.build()) } -@Suppress("unused") -@Deprecated("Binary compatibility, remove after deprecation cycle.", level = DeprecationLevel.ERROR) -@PublishedApi -internal val gatewayOnLogger: mu.KLogger = mu.KotlinLogging.logger("Gateway.on") - /** * Logger used to report [Throwable]s caught in [Gateway.on]. */ diff --git a/gateway/src/commonMain/kotlin/Utils.kt b/gateway/src/commonMain/kotlin/Utils.kt deleted file mode 100644 index 18cca4075a0..00000000000 --- a/gateway/src/commonMain/kotlin/Utils.kt +++ /dev/null @@ -1,8 +0,0 @@ -package dev.kord.gateway - -import mu.KLogger - -@Suppress("DeprecatedCallableAddReplaceWith") -@Deprecated("Binary compatibility, remove after deprecation cycle.", level = DeprecationLevel.ERROR) -@PublishedApi -internal fun KLogger.error(throwable: Throwable): Unit = error(throwable) { "" } diff --git a/gateway/src/nativeMain/kotlin/Inflater.kt b/gateway/src/nativeMain/kotlin/Inflater.kt index 63bfa922edc..80b4a9abe6c 100644 --- a/gateway/src/nativeMain/kotlin/Inflater.kt +++ b/gateway/src/nativeMain/kotlin/Inflater.kt @@ -1,6 +1,5 @@ package dev.kord.gateway -import io.ktor.utils.io.core.* import io.ktor.websocket.* import kotlinx.cinterop.* import platform.zlib.* @@ -8,8 +7,10 @@ import platform.zlib.* private const val MAX_WBITS = 15 // Maximum window size in bits private const val CHUNK_SIZE = 256 * 1000 +internal actual fun Inflater(): Inflater = NativeInflater() + @OptIn(ExperimentalForeignApi::class) -internal actual class Inflater : Closeable { +private class NativeInflater : Inflater { private val zStream = nativeHeap.alloc().apply { val initResponse = inflateInit2(ptr, MAX_WBITS) if (initResponse != Z_OK) { @@ -18,7 +19,7 @@ internal actual class Inflater : Closeable { } } - actual fun Frame.inflateData(): String { + override fun Frame.inflateData(): String { val compressedData = data var out = ByteArray(0) memScoped { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d40b0da24a1..916aac36392 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -83,7 +83,6 @@ kotlin-test-junit5 = { module = "org.jetbrains.kotlin:kotlin-test-junit5", versi junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit5" } mockk = { module = "io.mockk:mockk", version.ref = "mockk" } slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" } -kotlinx-resources = { module = "com.goncalossilva:resources", version.ref = "kotlinx-resources" } okio = { module = "com.squareup.okio:okio", version.ref = "okio" } # actually plugins, not libraries, but used is 'buildSrc/build.gradle.kts' as implementation dependencies: @@ -94,13 +93,12 @@ dokka-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref atomicfu-plugin = { module = "org.jetbrains.kotlinx:atomicfu-gradle-plugin", version.ref = "kotlinx-atomicfu" } binary-compatibility-validator-plugin = { module = "org.jetbrains.kotlinx:binary-compatibility-validator", version.ref = "binary-compatibility-validator" } ksp-plugin = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" } -kordx-resources-plugin = { module = "com.goncalossilva:resources-plugin", version.ref = "kotlinx-resources" } [bundles] ktor-client-serialization = ["ktor-client-content-negotiation", "ktor-serialization-kotlinx-json"] -test-common = ["kotlin-test-annotations-common", "kotlin-test", "kotlinx-coroutines-test", "kotlinx-resources"] +test-common = ["kotlin-test-annotations-common", "kotlin-test", "kotlinx-coroutines-test"] test-js = ["kotlin-test-js", "kotlin-node"] test-jvm = ["kotlin-test-junit5", "junit-jupiter-engine", "slf4j-simple"] @@ -111,7 +109,6 @@ pluginsForBuildSrc = [ "atomicfu-plugin", "binary-compatibility-validator-plugin", "ksp-plugin", - "kordx-resources-plugin" ] diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock index 3ad6f3f7202..28defc34c42 100644 --- a/kotlin-js-store/yarn.lock +++ b/kotlin-js-store/yarn.lock @@ -157,14 +157,6 @@ diff@5.0.0: resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b" integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== -dukat@0.5.8-rc.4: - version "0.5.8-rc.4" - resolved "https://registry.yarnpkg.com/dukat/-/dukat-0.5.8-rc.4.tgz#90384dcb50b14c26f0e99dae92b2dea44f5fce21" - integrity sha512-ZnMt6DGBjlVgK2uQamXfd7uP/AxH7RqI0BL9GLrrJb2gKdDxvJChWy+M9AQEaL+7/6TmxzJxFOsRiInY9oGWTA== - dependencies: - google-protobuf "3.12.2" - typescript "3.9.5" - emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -249,11 +241,6 @@ glob@7.2.0: once "^1.3.0" path-is-absolute "^1.0.0" -google-protobuf@3.12.2: - version "3.12.2" - resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.12.2.tgz#50ce9f9b6281235724eb243d6a83e969a2176e53" - integrity sha512-4CZhpuRr1d6HjlyrxoXoocoGFnRYgKULgMtikMddA9ztRyYR59Aondv2FioyxWVamRo0rF2XpYawkTCBEQOSkA== - has-flag@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" @@ -533,11 +520,6 @@ tr46@~0.0.3: resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== -typescript@3.9.5: - version "3.9.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.5.tgz#586f0dba300cde8be52dd1ac4f7e1009c1b13f36" - integrity sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ== - typescript@5.0.4: version "5.0.4" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.4.tgz#b217fd20119bd61a94d4011274e0ab369058da3b" diff --git a/rest/src/nativeMain/kotlin/ratelimit/AbstractRateLimiter.kt b/rest/src/nativeMain/kotlin/ratelimit/AbstractRateLimiter.kt deleted file mode 100644 index fcb7c50f4b1..00000000000 --- a/rest/src/nativeMain/kotlin/ratelimit/AbstractRateLimiter.kt +++ /dev/null @@ -1,4 +0,0 @@ -package dev.kord.rest.ratelimit - -// https://github.com/Kotlin/kotlinx-atomicfu/issues/291 -internal actual val useUpdate: Boolean = false diff --git a/rest/src/nonNativeMain/kotlin/AbstractRateLimiter.kt b/rest/src/nonNativeMain/kotlin/AbstractRateLimiter.kt deleted file mode 100644 index f48a77ecc64..00000000000 --- a/rest/src/nonNativeMain/kotlin/AbstractRateLimiter.kt +++ /dev/null @@ -1,3 +0,0 @@ -package dev.kord.rest.ratelimit - -internal actual val useUpdate: Boolean = true diff --git a/test-kit/src/commonMain/kotlin/Platform.kt b/test-kit/src/commonMain/kotlin/Platform.kt index 6b22bfdf063..9c3e732f129 100644 --- a/test-kit/src/commonMain/kotlin/Platform.kt +++ b/test-kit/src/commonMain/kotlin/Platform.kt @@ -1,7 +1,6 @@ package dev.kord.test import io.ktor.utils.io.* -import com.goncalossilva.resources.Resource expect object Platform { val IS_JVM: Boolean diff --git a/test-kit/src/jsMain/kotlin/Platform.node.kt b/test-kit/src/jsMain/kotlin/Platform.node.kt index 2949105f551..0ed68d8e976 100644 --- a/test-kit/src/jsMain/kotlin/Platform.node.kt +++ b/test-kit/src/jsMain/kotlin/Platform.node.kt @@ -1,7 +1,7 @@ package dev.kord.test import io.ktor.utils.io.* -import js.core.toList +import js.iterable.toList import node.buffer.Buffer import node.buffer.BufferEncoding import node.process.process