Merge branch 'kotlin-2.0.20' into kotlin-2.1.0

# Conflicts: # gradle/libs.versions.toml
kordlib · Aug 29, 2024 · 094f99f · 094f99f
2 parents cc260f4 + 43c5bd8
commit 094f99f
Show file tree

Hide file tree

Showing 31 changed files with 174 additions and 62 deletions.
diff --git a/.github/workflows/deployment-ci.yml b/.github/workflows/deployment-ci.yml
@@ -42,6 +42,8 @@ jobs:
       KORD_TEST_TOKEN: ${{ secrets.KORD_TEST_TOKEN }}
       NEXUS_USER: ${{ secrets.NEXUS_USER }}
       NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
+      KORD_REPO_USER: ${{ secrets.KORD_REPO_USER }}
+      KORD_REPO_PASSWORD: ${{ secrets.KORD_REPO_PASSWORD }}
       SIGNING_KEY: ${{ secrets.signingKey }}
       SIGNING_PASSWORD: ${{ secrets.signingPassword }}
     steps:

diff --git a/README.md b/README.md
@@ -68,7 +68,8 @@ in [`gradle.properties`](gradle.properties))
 ```kotlin
 repositories {
     mavenCentral()
-    // Kord Snapshots Repository (Optional):
+    // Kord Snapshot Repositories (optional, choose one of these):
+    maven("https://repo.kord.dev/snapshots")
     maven("https://oss.sonatype.org/content/repositories/snapshots")
 }
 
@@ -82,7 +83,10 @@ dependencies {
 ```groovy
 repositories {
     mavenCentral()
-    // Kord Snapshots Repository (Optional):
+    // Kord Snapshot Repositories (optional, choose one of these):
+    maven {
+        url "https://repo.kord.dev/snapshots"
+    }
     maven {
         url "https://oss.sonatype.org/content/repositories/snapshots"
     }
@@ -95,9 +99,19 @@ dependencies {
 
 ### Maven
 
-##### Kord Snapshots Repository (Optional):
+##### Kord Snapshot Repositories (optional, choose one of these):
 
 ```xml
+<repository>
+    <id>snapshots-repo</id>
+    <url>https://repo.kord.dev/snapshots</url>
+    <releases>
+        <enabled>false</enabled>
+    </releases>
+    <snapshots>
+        <enabled>true</enabled>
+    </snapshots>
+</repository>
 
 <repository>
     <id>snapshots-repo</id>
@@ -114,7 +128,6 @@ dependencies {
 ---
 
 ```xml
-
 <dependency>
     <groupId>dev.kord</groupId>
     <artifactId>kord-core-jvm</artifactId>

diff --git a/buildSrc/src/main/kotlin/kord-publishing.gradle.kts b/buildSrc/src/main/kotlin/kord-publishing.gradle.kts
@@ -68,6 +68,17 @@ publishing {
                 password = getenv("NEXUS_PASSWORD")
             }
         }
+
+        if (!isRelease) {
+            maven {
+                name = "kordSnapshots"
+                url = uri("https://repo.kord.dev/snapshots")
+                credentials {
+                    username = getenv("KORD_REPO_USER")
+                    password = getenv("KORD_REPO_PASSWORD")
+                }
+            }
+        }
     }
 }
 

diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/Permission.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/Permission.kt
@@ -549,7 +549,7 @@ public class Permissions internal constructor(
 
     @Deprecated(
         level = DeprecationLevel.HIDDEN,
-        message = "Binary compatibility, keep for some releases.",
+        message = "Kept for binary compatibility, this declaration will be removed in 0.17.0.",
     )
     public inline fun copy0(builder: Builder.() -> Unit): Permissions {
         contract { callsInPlace(builder, EXACTLY_ONCE) }
@@ -620,7 +620,8 @@ public class Permissions internal constructor(
         @Suppress(names = arrayOf("DEPRECATION_ERROR"))
         @Deprecated(
             level = DeprecationLevel.ERROR,
-            message = "Renamed to 'Companion'.",
+            message =
+                    "Renamed to 'Companion'. The deprecation level will be raised to HIDDEN in 0.16.0 and this declaration will be removed in 0.17.0.",
             replaceWith = ReplaceWith(expression = "Permissions.Companion", imports =
                         arrayOf("dev.kord.common.entity.Permissions")),
         )
@@ -630,7 +631,8 @@ public class Permissions internal constructor(
 
     @Deprecated(
         level = DeprecationLevel.ERROR,
-        message = "Renamed to 'Companion'.",
+        message =
+                "Renamed to 'Companion'. The deprecation level will be raised to HIDDEN in 0.16.0 and this declaration will be removed in 0.17.0.",
         replaceWith = ReplaceWith(expression = "Permissions.Companion", imports =
                     arrayOf("dev.kord.common.entity.Permissions")),
     )
@@ -650,7 +652,7 @@ public inline fun Permissions(builder: Permissions.Builder.() -> Unit = {}): Per
 @Suppress(names = arrayOf("FunctionName"))
 @Deprecated(
     level = DeprecationLevel.HIDDEN,
-    message = "Binary compatibility, keep for some releases.",
+    message = "Kept for binary compatibility, this declaration will be removed in 0.17.0.",
 )
 public inline fun Permissions0(builder: Permissions.Builder.() -> Unit = {}): Permissions {
     contract { callsInPlace(builder, EXACTLY_ONCE) }

diff --git a/...uild/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/SystemChannelFlag.kt b/...uild/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/SystemChannelFlag.kt
@@ -330,7 +330,8 @@ public class SystemChannelFlags internal constructor(
         @Suppress(names = arrayOf("DEPRECATION_ERROR"))
         @Deprecated(
             level = DeprecationLevel.ERROR,
-            message = "Renamed to 'Companion'.",
+            message =
+                    "Renamed to 'Companion'. The deprecation level will be raised to HIDDEN in 0.16.0 and this declaration will be removed in 0.17.0.",
             replaceWith = ReplaceWith(expression = "SystemChannelFlags.Companion", imports =
                         arrayOf("dev.kord.common.entity.SystemChannelFlags")),
         )
@@ -340,7 +341,8 @@ public class SystemChannelFlags internal constructor(
 
     @Deprecated(
         level = DeprecationLevel.ERROR,
-        message = "Renamed to 'Companion'.",
+        message =
+                "Renamed to 'Companion'. The deprecation level will be raised to HIDDEN in 0.16.0 and this declaration will be removed in 0.17.0.",
         replaceWith = ReplaceWith(expression = "SystemChannelFlags.Companion", imports =
                     arrayOf("dev.kord.common.entity.SystemChannelFlags")),
     )

diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/UserFlag.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/UserFlag.kt
@@ -315,7 +315,7 @@ public class UserFlags internal constructor(
 
     @Deprecated(
         level = DeprecationLevel.HIDDEN,
-        message = "Binary compatibility, keep for some releases.",
+        message = "Kept for binary compatibility, this declaration will be removed in 0.17.0.",
     )
     public inline fun copy0(builder: Builder.() -> Unit): UserFlags {
         contract { callsInPlace(builder, EXACTLY_ONCE) }

diff --git a/common/src/commonMain/kotlin/DiscordBitSet.kt b/common/src/commonMain/kotlin/DiscordBitSet.kt
@@ -152,7 +152,7 @@ public fun DiscordBitSet(value: String): DiscordBitSet {
 
 
 @Deprecated(
-    "Replaced by 'DiscordBitSet.serializer()'.",
+    "Replaced by 'DiscordBitSet.serializer()'. This declaration will be removed in 0.16.0.",
     ReplaceWith("DiscordBitSet.serializer()", imports = ["dev.kord.common.DiscordBitSet"]),
     DeprecationLevel.HIDDEN,
 )

diff --git a/common/src/commonMain/kotlin/Locale.kt b/common/src/commonMain/kotlin/Locale.kt
@@ -237,7 +237,7 @@ public data class Locale(val language: String, val country: String? = null) {
     }
 
     @Deprecated(
-        "Replaced by 'Locale.serializer()'.",
+        "Replaced by 'Locale.serializer()'. This declaration will be removed in 0.16.0.",
         ReplaceWith("Locale.serializer()", imports = ["dev.kord.common.Locale"]),
         DeprecationLevel.HIDDEN,
     )

diff --git a/common/src/commonMain/kotlin/entity/DiscordChannel.kt b/common/src/commonMain/kotlin/entity/DiscordChannel.kt
@@ -233,7 +233,7 @@ public sealed class ArchiveDuration(
         @Suppress("UNUSED_PARAMETER") unused: Nothing?,
     ) : ArchiveDuration(duration) {
         @Deprecated(
-            "Replaced by 'ArchiveDuration.from()'.",
+            "Replaced by 'ArchiveDuration.from()'. This declaration will be removed in 0.16.0.",
             ReplaceWith("ArchiveDuration.from(duration)", imports = ["dev.kord.common.entity.ArchiveDuration"]),
             DeprecationLevel.HIDDEN,
         )

diff --git a/common/src/commonMain/kotlin/entity/DiscordShard.kt b/common/src/commonMain/kotlin/entity/DiscordShard.kt
@@ -35,7 +35,8 @@ public data class DiscordShard(val index: Int, val count: Int) {
     public companion object {
         @Suppress("DEPRECATION_ERROR")
         @Deprecated(
-            "Renamed to 'Companion'.",
+            "Renamed to 'Companion'. The deprecation level will be raised to HIDDEN in 0.16.0 and this declaration " +
+                "will be removed in 0.17.0.",
             ReplaceWith("DiscordShard.Companion", imports = ["dev.kord.common.entity.DiscordShard"]),
             DeprecationLevel.ERROR,
         )
@@ -44,7 +45,8 @@ public data class DiscordShard(val index: Int, val count: Int) {
     }
 
     @Deprecated(
-        "Renamed to 'Companion'.",
+        "Renamed to 'Companion'. The deprecation level will be raised to HIDDEN in 0.16.0 and this declaration will " +
+            "be removed in 0.17.0.",
         ReplaceWith("DiscordShard.Companion", imports = ["dev.kord.common.entity.DiscordShard"]),
         DeprecationLevel.ERROR,
     )

diff --git a/common/src/commonMain/kotlin/entity/Permissions.kt b/common/src/commonMain/kotlin/entity/Permissions.kt
@@ -112,7 +112,8 @@ public val Permissions.Companion.ALL: Permissions get() = ALL_PERMISSIONS
 
 @Suppress("UnusedReceiverParameter", "DEPRECATION_ERROR")
 @Deprecated(
-    "'Permissions.NewCompanion' was renamed to 'Permissions.Companion'. Use 'Permissions.Companion.ALL' instead.",
+    "'Permissions.NewCompanion' was renamed to 'Permissions.Companion'. Use 'Permissions.Companion.ALL' instead. The " +
+        "deprecation level will be raised to HIDDEN in 0.16.0 and this declaration will be removed in 0.17.0.",
     ReplaceWith("Permissions.ALL", imports = ["dev.kord.common.entity.Permissions", "dev.kord.common.entity.ALL"]),
     DeprecationLevel.ERROR,
 )

diff --git a/core/src/commonMain/kotlin/Kord.kt b/core/src/commonMain/kotlin/Kord.kt
@@ -39,7 +39,7 @@ import kotlin.contracts.contract
 import kotlin.coroutines.CoroutineContext
 import kotlinx.coroutines.channels.Channel as CoroutineChannel
 
-@Deprecated("Use your own logger instead, this will be removed in the future.", level = DeprecationLevel.HIDDEN)
+@Deprecated("Use your own logger instead. This declaration will be removed in 0.16.0.", level = DeprecationLevel.HIDDEN)
 public val kordLogger: mu.KLogger = mu.KotlinLogging.logger { }
 
 private val logger = KotlinLogging.logger { }

diff --git a/core/src/commonMain/kotlin/event/interaction/ApplicationCommandCreate.kt b/core/src/commonMain/kotlin/event/interaction/ApplicationCommandCreate.kt
@@ -7,7 +7,8 @@ import dev.kord.core.event.Event
 
 @Deprecated(
     "This event is not supposed to be sent to bots. See https://github.com/discord/discord-api-docs/issues/3690 for " +
-        "details.",
+        "details. The deprecation level will be raised to HIDDEN in 0.16.0 and this declaration will be removed in " +
+        "0.17.0.",
     level = DeprecationLevel.ERROR,
 )
 public sealed interface ApplicationCommandCreateEvent : Event {
@@ -17,7 +18,8 @@ public sealed interface ApplicationCommandCreateEvent : Event {
 @Suppress("DEPRECATION_ERROR")
 @Deprecated(
     "This event is not supposed to be sent to bots. See https://github.com/discord/discord-api-docs/issues/3690 for " +
-        "details.",
+        "details. The deprecation level will be raised to HIDDEN in 0.16.0 and this declaration will be removed in " +
+        "0.17.0.",
     level = DeprecationLevel.ERROR,
 )
 public class ChatInputCommandCreateEvent(
@@ -31,7 +33,8 @@ public class ChatInputCommandCreateEvent(
 @Suppress("DEPRECATION_ERROR")
 @Deprecated(
     "This event is not supposed to be sent to bots. See https://github.com/discord/discord-api-docs/issues/3690 for " +
-        "details.",
+        "details. The deprecation level will be raised to HIDDEN in 0.16.0 and this declaration will be removed in " +
+        "0.17.0.",
     level = DeprecationLevel.ERROR,
 )
 public class UserCommandCreateEvent(
@@ -45,7 +48,8 @@ public class UserCommandCreateEvent(
 @Suppress("DEPRECATION_ERROR")
 @Deprecated(
     "This event is not supposed to be sent to bots. See https://github.com/discord/discord-api-docs/issues/3690 for " +
-        "details.",
+        "details. The deprecation level will be raised to HIDDEN in 0.16.0 and this declaration will be removed in " +
+        "0.17.0.",
     level = DeprecationLevel.ERROR,
 )
 public class MessageCommandCreateEvent(
@@ -59,7 +63,8 @@ public class MessageCommandCreateEvent(
 @Suppress("DEPRECATION_ERROR")
 @Deprecated(
     "This event is not supposed to be sent to bots. See https://github.com/discord/discord-api-docs/issues/3690 for " +
-        "details.",
+        "details. The deprecation level will be raised to HIDDEN in 0.16.0 and this declaration will be removed in " +
+        "0.17.0.",
     level = DeprecationLevel.ERROR,
 )
 public class UnknownApplicationCommandCreateEvent(

diff --git a/core/src/commonMain/kotlin/event/interaction/ApplicationCommandDelete.kt b/core/src/commonMain/kotlin/event/interaction/ApplicationCommandDelete.kt
@@ -7,7 +7,8 @@ import dev.kord.core.event.Event
 
 @Deprecated(
     "This event is not supposed to be sent to bots. See https://github.com/discord/discord-api-docs/issues/3690 for " +
-        "details.",
+        "details. The deprecation level will be raised to HIDDEN in 0.16.0 and this declaration will be removed in " +
+        "0.17.0.",
     level = DeprecationLevel.ERROR,
 )
 public sealed interface ApplicationCommandDeleteEvent : Event {
@@ -17,7 +18,8 @@ public sealed interface ApplicationCommandDeleteEvent : Event {
 @Suppress("DEPRECATION_ERROR")
 @Deprecated(
     "This event is not supposed to be sent to bots. See https://github.com/discord/discord-api-docs/issues/3690 for " +
-        "details.",
+        "details. The deprecation level will be raised to HIDDEN in 0.16.0 and this declaration will be removed in " +
+        "0.17.0.",
     level = DeprecationLevel.ERROR,
 )
 public class ChatInputCommandDeleteEvent(
@@ -31,7 +33,8 @@ public class ChatInputCommandDeleteEvent(
 @Suppress("DEPRECATION_ERROR")
 @Deprecated(
     "This event is not supposed to be sent to bots. See https://github.com/discord/discord-api-docs/issues/3690 for " +
-        "details.",
+        "details. The deprecation level will be raised to HIDDEN in 0.16.0 and this declaration will be removed in " +
+        "0.17.0.",
     level = DeprecationLevel.ERROR,
 )
 public class UserCommandDeleteEvent(
@@ -45,7 +48,8 @@ public class UserCommandDeleteEvent(
 @Suppress("DEPRECATION_ERROR")
 @Deprecated(
     "This event is not supposed to be sent to bots. See https://github.com/discord/discord-api-docs/issues/3690 for " +
-        "details.",
+        "details. The deprecation level will be raised to HIDDEN in 0.16.0 and this declaration will be removed in " +
+        "0.17.0.",
     level = DeprecationLevel.ERROR,
 )
 public class MessageCommandDeleteEvent(
@@ -59,7 +63,8 @@ public class MessageCommandDeleteEvent(
 @Suppress("DEPRECATION_ERROR")
 @Deprecated(
     "This event is not supposed to be sent to bots. See https://github.com/discord/discord-api-docs/issues/3690 for " +
-        "details.",
+        "details. The deprecation level will be raised to HIDDEN in 0.16.0 and this declaration will be removed in " +
+        "0.17.0.",
     level = DeprecationLevel.ERROR,
 )
 public class UnknownApplicationCommandDeleteEvent(

diff --git a/core/src/commonMain/kotlin/event/interaction/ApplicationCommandUpdate.kt b/core/src/commonMain/kotlin/event/interaction/ApplicationCommandUpdate.kt
@@ -7,7 +7,8 @@ import dev.kord.core.event.Event
 
 @Deprecated(
     "This event is not supposed to be sent to bots. See https://github.com/discord/discord-api-docs/issues/3690 for " +
-        "details.",
+        "details. The deprecation level will be raised to HIDDEN in 0.16.0 and this declaration will be removed in " +
+        "0.17.0.",
     level = DeprecationLevel.ERROR,
 )
 public sealed interface ApplicationCommandUpdateEvent : Event {
@@ -17,7 +18,8 @@ public sealed interface ApplicationCommandUpdateEvent : Event {
 @Suppress("DEPRECATION_ERROR")
 @Deprecated(
     "This event is not supposed to be sent to bots. See https://github.com/discord/discord-api-docs/issues/3690 for " +
-        "details.",
+        "details. The deprecation level will be raised to HIDDEN in 0.16.0 and this declaration will be removed in " +
+        "0.17.0.",
     level = DeprecationLevel.ERROR,
 )
 public class ChatInputCommandUpdateEvent(
@@ -31,7 +33,8 @@ public class ChatInputCommandUpdateEvent(
 @Suppress("DEPRECATION_ERROR")
 @Deprecated(
     "This event is not supposed to be sent to bots. See https://github.com/discord/discord-api-docs/issues/3690 for " +
-        "details.",
+        "details. The deprecation level will be raised to HIDDEN in 0.16.0 and this declaration will be removed in " +
+        "0.17.0.",
     level = DeprecationLevel.ERROR,
 )
 public class UserCommandUpdateEvent(
@@ -45,7 +48,8 @@ public class UserCommandUpdateEvent(
 @Suppress("DEPRECATION_ERROR")
 @Deprecated(
     "This event is not supposed to be sent to bots. See https://github.com/discord/discord-api-docs/issues/3690 for " +
-        "details.",
+        "details. The deprecation level will be raised to HIDDEN in 0.16.0 and this declaration will be removed in " +
+        "0.17.0.",
     level = DeprecationLevel.ERROR,
 )
 public class MessageCommandUpdateEvent(
@@ -58,7 +62,8 @@ public class MessageCommandUpdateEvent(
 @Suppress("DEPRECATION_ERROR")
 @Deprecated(
     "This event is not supposed to be sent to bots. See https://github.com/discord/discord-api-docs/issues/3690 for " +
-        "details.",
+        "details. The deprecation level will be raised to HIDDEN in 0.16.0 and this declaration will be removed in " +
+        "0.17.0.",
     level = DeprecationLevel.ERROR,
 )
 public class UnknownApplicationCommandUpdateEvent(

diff --git a/gateway/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/gateway/Intent.kt b/gateway/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/gateway/Intent.kt
@@ -424,7 +424,7 @@ public class Intents internal constructor(
 
     @Deprecated(
         level = DeprecationLevel.HIDDEN,
-        message = "Binary compatibility, keep for some releases.",
+        message = "Kept for binary compatibility, this declaration will be removed in 0.17.0.",
     )
     public inline fun copy0(builder: Builder.() -> Unit): Intents {
         contract { callsInPlace(builder, EXACTLY_ONCE) }
@@ -502,7 +502,7 @@ public inline fun Intents(builder: Intents.Builder.() -> Unit = {}): Intents {
 @Suppress(names = arrayOf("FunctionName"))
 @Deprecated(
     level = DeprecationLevel.HIDDEN,
-    message = "Binary compatibility, keep for some releases.",
+    message = "Kept for binary compatibility, this declaration will be removed in 0.17.0.",
 )
 public inline fun Intents0(builder: Intents.Builder.() -> Unit = {}): Intents {
     contract { callsInPlace(builder, EXACTLY_ONCE) }