First attempt to build Kord with K2

The @Suppress annotations were changed because of this issue: https://youtrack.jetbrains.com/issue/KT-62146
kordlib · Oct 25, 2023 · dcfea7c · dcfea7c
1 parent 8a9a543
commit dcfea7c
Show file tree

Hide file tree

Showing 38 changed files with 1,646 additions and 1,624 deletions.
diff --git a/buildSrc/src/main/kotlin/Compiler.kt b/buildSrc/src/main/kotlin/Compiler.kt
@@ -5,6 +5,7 @@ import org.gradle.kotlin.dsl.assign
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.getByType
 import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
 
 object OptIns {
@@ -28,6 +29,9 @@ fun KotlinCommonCompilerOptions.applyKordCompilerOptions() {
     allWarningsAsErrors = true
     progressiveMode = true
     freeCompilerArgs.add("-Xexpect-actual-classes")
+    // enable K2
+    languageVersion = KOTLIN_2_0
+    freeCompilerArgs.add( "-Xsuppress-version-warnings")
 }
 
 fun KotlinSourceSet.applyKordOptIns() {

diff --git a/common/api/common.api b/common/api/common.api
diff --git a/.../build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ApplicationFlag.kt b/.../build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ApplicationFlag.kt
@@ -293,7 +293,7 @@ public sealed class ApplicationFlag(
         /**
          * @suppress
          */
-        @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT", "DeprecatedCallableAddReplaceWith"))
+        @Suppress("NON_FINAL_MEMBER_IN_OBJECT", "DeprecatedCallableAddReplaceWith")
         @Deprecated(
             level = DeprecationLevel.ERROR,
             message =
@@ -317,7 +317,7 @@ public sealed class ApplicationFlag(
         /**
          * @suppress
          */
-        @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT"))
+        @Suppress("NON_FINAL_MEMBER_IN_OBJECT")
         @Deprecated(
             level = DeprecationLevel.ERROR,
             message = "ApplicationFlag is no longer an enum class.",
@@ -330,7 +330,7 @@ public sealed class ApplicationFlag(
         /**
          * @suppress
          */
-        @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT", "UPPER_BOUND_VIOLATED"))
+        @Suppress("NON_FINAL_MEMBER_IN_OBJECT", "UPPER_BOUND_VIOLATED")
         @Deprecated(
             level = DeprecationLevel.HIDDEN,
             message = "ApplicationFlag is no longer an enum class.",
@@ -340,8 +340,8 @@ public sealed class ApplicationFlag(
         @JvmStatic
         public open fun getEntries(): EnumEntries<ApplicationFlag> = EnumEntriesList
 
-        @Suppress(names = arrayOf("SEALED_INHERITOR_IN_DIFFERENT_MODULE",
-                        "SEALED_INHERITOR_IN_DIFFERENT_PACKAGE", "UPPER_BOUND_VIOLATED"))
+        @Suppress("SEALED_INHERITOR_IN_DIFFERENT_MODULE",
+                        "SEALED_INHERITOR_IN_DIFFERENT_PACKAGE", "UPPER_BOUND_VIOLATED")
         private object EnumEntriesList : EnumEntries<ApplicationFlag>, List<ApplicationFlag> by
                 entries {
             override fun equals(other: Any?): Boolean = entries == other

diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ChannelFlag.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/ChannelFlag.kt
@@ -169,7 +169,7 @@ public sealed class ChannelFlag(
         /**
          * @suppress
          */
-        @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT", "DeprecatedCallableAddReplaceWith"))
+        @Suppress("NON_FINAL_MEMBER_IN_OBJECT", "DeprecatedCallableAddReplaceWith")
         @Deprecated(
             level = DeprecationLevel.ERROR,
             message = "ChannelFlag is no longer an enum class. Deprecated without a replacement.",
@@ -185,7 +185,7 @@ public sealed class ChannelFlag(
         /**
          * @suppress
          */
-        @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT"))
+        @Suppress("NON_FINAL_MEMBER_IN_OBJECT")
         @Deprecated(
             level = DeprecationLevel.ERROR,
             message = "ChannelFlag is no longer an enum class.",
@@ -198,7 +198,7 @@ public sealed class ChannelFlag(
         /**
          * @suppress
          */
-        @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT", "UPPER_BOUND_VIOLATED"))
+        @Suppress("NON_FINAL_MEMBER_IN_OBJECT", "UPPER_BOUND_VIOLATED")
         @Deprecated(
             level = DeprecationLevel.HIDDEN,
             message = "ChannelFlag is no longer an enum class.",
@@ -208,8 +208,8 @@ public sealed class ChannelFlag(
         @JvmStatic
         public open fun getEntries(): EnumEntries<ChannelFlag> = EnumEntriesList
 
-        @Suppress(names = arrayOf("SEALED_INHERITOR_IN_DIFFERENT_MODULE",
-                        "SEALED_INHERITOR_IN_DIFFERENT_PACKAGE", "UPPER_BOUND_VIOLATED"))
+        @Suppress("SEALED_INHERITOR_IN_DIFFERENT_MODULE",
+                        "SEALED_INHERITOR_IN_DIFFERENT_PACKAGE", "UPPER_BOUND_VIOLATED")
         private object EnumEntriesList : EnumEntries<ChannelFlag>, List<ChannelFlag> by entries {
             override fun equals(other: Any?): Boolean = entries == other
 

diff --git a/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/MessageFlag.kt b/common/build/generated/ksp/metadata/commonMain/kotlin/dev/kord/common/entity/MessageFlag.kt
@@ -293,7 +293,7 @@ public sealed class MessageFlag(
         /**
          * @suppress
          */
-        @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT", "DeprecatedCallableAddReplaceWith"))
+        @Suppress("NON_FINAL_MEMBER_IN_OBJECT", "DeprecatedCallableAddReplaceWith")
         @Deprecated(
             level = DeprecationLevel.ERROR,
             message = "MessageFlag is no longer an enum class. Deprecated without a replacement.",
@@ -317,7 +317,7 @@ public sealed class MessageFlag(
         /**
          * @suppress
          */
-        @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT"))
+        @Suppress("NON_FINAL_MEMBER_IN_OBJECT")
         @Deprecated(
             level = DeprecationLevel.ERROR,
             message = "MessageFlag is no longer an enum class.",
@@ -330,7 +330,7 @@ public sealed class MessageFlag(
         /**
          * @suppress
          */
-        @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT", "UPPER_BOUND_VIOLATED"))
+        @Suppress("NON_FINAL_MEMBER_IN_OBJECT", "UPPER_BOUND_VIOLATED")
         @Deprecated(
             level = DeprecationLevel.HIDDEN,
             message = "MessageFlag is no longer an enum class.",
@@ -340,8 +340,8 @@ public sealed class MessageFlag(
         @JvmStatic
         public open fun getEntries(): EnumEntries<MessageFlag> = EnumEntriesList
 
-        @Suppress(names = arrayOf("SEALED_INHERITOR_IN_DIFFERENT_MODULE",
-                        "SEALED_INHERITOR_IN_DIFFERENT_PACKAGE", "UPPER_BOUND_VIOLATED"))
+        @Suppress("SEALED_INHERITOR_IN_DIFFERENT_MODULE",
+                        "SEALED_INHERITOR_IN_DIFFERENT_PACKAGE", "UPPER_BOUND_VIOLATED")
         private object EnumEntriesList : EnumEntries<MessageFlag>, List<MessageFlag> by entries {
             override fun equals(other: Any?): Boolean = entries == other
 

diff --git a/common/src/commonMain/kotlin/entity/ActivityFlag.kt b/common/src/commonMain/kotlin/entity/ActivityFlag.kt
@@ -211,7 +211,7 @@ public sealed class ActivityFlag(
         /**
          * @suppress
          */
-        @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT", "DeprecatedCallableAddReplaceWith"))
+        @Suppress("NON_FINAL_MEMBER_IN_OBJECT", "DeprecatedCallableAddReplaceWith")
         @Deprecated(message =
                 "ActivityFlag is no longer an enum class. Deprecated without a replacement.", level = DeprecationLevel.ERROR)
         @JvmStatic
@@ -231,7 +231,7 @@ public sealed class ActivityFlag(
         /**
          * @suppress
          */
-        @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT"))
+        @Suppress("NON_FINAL_MEMBER_IN_OBJECT")
         @Deprecated(
             message = "ActivityFlag is no longer an enum class.",
             replaceWith = ReplaceWith(expression = "ActivityFlag.entries.toTypedArray()", imports =
@@ -244,7 +244,7 @@ public sealed class ActivityFlag(
         /**
          * @suppress
          */
-        @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT", "UPPER_BOUND_VIOLATED"))
+        @Suppress("NON_FINAL_MEMBER_IN_OBJECT", "UPPER_BOUND_VIOLATED")
         @Deprecated(
             level = DeprecationLevel.HIDDEN,
             message = "ActivityFlag is no longer an enum class.",
@@ -254,8 +254,8 @@ public sealed class ActivityFlag(
         @JvmStatic
         public open fun getEntries(): EnumEntries<ActivityFlag> = EnumEntriesList
 
-        @Suppress(names = arrayOf("SEALED_INHERITOR_IN_DIFFERENT_MODULE",
-                        "SEALED_INHERITOR_IN_DIFFERENT_PACKAGE", "UPPER_BOUND_VIOLATED"))
+        @Suppress("SEALED_INHERITOR_IN_DIFFERENT_MODULE",
+                        "SEALED_INHERITOR_IN_DIFFERENT_PACKAGE", "UPPER_BOUND_VIOLATED")
         private object EnumEntriesList : EnumEntries<ActivityFlag>, List<ActivityFlag> by entries {
             override fun equals(other: Any?): Boolean = entries == other
 

diff --git a/common/src/commonMain/kotlin/entity/GuildMemberFlag.kt b/common/src/commonMain/kotlin/entity/GuildMemberFlag.kt
@@ -201,7 +201,7 @@ public sealed class GuildMemberFlag(
         /**
          * @suppress
          */
-        @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT", "DeprecatedCallableAddReplaceWith"))
+        @Suppress("NON_FINAL_MEMBER_IN_OBJECT", "DeprecatedCallableAddReplaceWith")
         @Deprecated(message =
                 "GuildMemberFlag is no longer an enum class. Deprecated without a replacement.", level = DeprecationLevel.ERROR)
         @JvmStatic
@@ -217,7 +217,7 @@ public sealed class GuildMemberFlag(
         /**
          * @suppress
          */
-        @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT"))
+        @Suppress("NON_FINAL_MEMBER_IN_OBJECT")
         @Deprecated(
             message = "GuildMemberFlag is no longer an enum class.",
             replaceWith = ReplaceWith(expression = "GuildMemberFlag.entries.toTypedArray()", imports
@@ -230,7 +230,7 @@ public sealed class GuildMemberFlag(
         /**
          * @suppress
          */
-        @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT", "UPPER_BOUND_VIOLATED"))
+        @Suppress("NON_FINAL_MEMBER_IN_OBJECT", "UPPER_BOUND_VIOLATED")
         @Deprecated(
             level = DeprecationLevel.HIDDEN,
             message = "GuildMemberFlag is no longer an enum class.",
@@ -240,8 +240,8 @@ public sealed class GuildMemberFlag(
         @JvmStatic
         public open fun getEntries(): EnumEntries<GuildMemberFlag> = EnumEntriesList
 
-        @Suppress(names = arrayOf("SEALED_INHERITOR_IN_DIFFERENT_MODULE",
-                        "SEALED_INHERITOR_IN_DIFFERENT_PACKAGE", "UPPER_BOUND_VIOLATED"))
+        @Suppress("SEALED_INHERITOR_IN_DIFFERENT_MODULE",
+                        "SEALED_INHERITOR_IN_DIFFERENT_PACKAGE", "UPPER_BOUND_VIOLATED")
         private object EnumEntriesList : EnumEntries<GuildMemberFlag>, List<GuildMemberFlag> by
                 entries {
             override fun equals(other: Any?): Boolean = entries == other

diff --git a/common/src/commonMain/kotlin/entity/Interactions.kt b/common/src/commonMain/kotlin/entity/Interactions.kt
@@ -404,7 +404,7 @@ public sealed class Option {
                 ApplicationCommandOptionType.User -> CommandArgument.Serializer.deserialize(
                     json, jsonValue!!, name, type!!, focused
                 )
-                null, is ApplicationCommandOptionType.Unknown -> error("unknown ApplicationCommandOptionType $type")
+                is ApplicationCommandOptionType.Unknown -> error("unknown ApplicationCommandOptionType $type")
             }
         }
 
@@ -601,7 +601,7 @@ public sealed class CommandArgument<out T> : Option() {
                     is AutoCompleteArgument, is StringArgument -> encodeStringElement(
                         descriptor,
                         1,
-                        value.value as String
+                        value.value
                     )
                 }
             }

diff --git a/common/src/commonMain/kotlin/entity/SystemChannelFlag.kt b/common/src/commonMain/kotlin/entity/SystemChannelFlag.kt
@@ -219,7 +219,7 @@ public sealed class SystemChannelFlag(
         /**
          * @suppress
          */
-        @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT", "DeprecatedCallableAddReplaceWith"))
+        @Suppress("NON_FINAL_MEMBER_IN_OBJECT", "DeprecatedCallableAddReplaceWith")
         @Deprecated(message =
                 "SystemChannelFlag is no longer an enum class. Deprecated without a replacement.", level = DeprecationLevel.ERROR)
         @JvmStatic
@@ -236,7 +236,7 @@ public sealed class SystemChannelFlag(
         /**
          * @suppress
          */
-        @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT"))
+        @Suppress("NON_FINAL_MEMBER_IN_OBJECT")
         @Deprecated(
             message = "SystemChannelFlag is no longer an enum class.",
             replaceWith = ReplaceWith(expression = "SystemChannelFlag.entries.toTypedArray()",
@@ -249,7 +249,7 @@ public sealed class SystemChannelFlag(
         /**
          * @suppress
          */
-        @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT", "UPPER_BOUND_VIOLATED"))
+        @Suppress("NON_FINAL_MEMBER_IN_OBJECT", "UPPER_BOUND_VIOLATED")
         @Deprecated(
             level = DeprecationLevel.HIDDEN,
             message = "SystemChannelFlag is no longer an enum class.",
@@ -259,8 +259,8 @@ public sealed class SystemChannelFlag(
         @JvmStatic
         public open fun getEntries(): EnumEntries<SystemChannelFlag> = EnumEntriesList
 
-        @Suppress(names = arrayOf("SEALED_INHERITOR_IN_DIFFERENT_MODULE",
-                        "SEALED_INHERITOR_IN_DIFFERENT_PACKAGE", "UPPER_BOUND_VIOLATED"))
+        @Suppress("SEALED_INHERITOR_IN_DIFFERENT_MODULE",
+                        "SEALED_INHERITOR_IN_DIFFERENT_PACKAGE", "UPPER_BOUND_VIOLATED")
         private object EnumEntriesList : EnumEntries<SystemChannelFlag>, List<SystemChannelFlag> by
                 entries {
             override fun equals(other: Any?): Boolean = entries == other

diff --git a/common/src/commonMain/kotlin/entity/UserFlag.kt b/common/src/commonMain/kotlin/entity/UserFlag.kt
@@ -69,7 +69,7 @@ public sealed class UserFlag(
     /**
      * @suppress
      */
-    @Suppress(names = arrayOf("DeprecatedCallableAddReplaceWith", "DEPRECATION_ERROR"))
+    @Suppress("DeprecatedCallableAddReplaceWith", "DEPRECATION_ERROR")
     @Deprecated(message = "UserFlag is no longer an enum class. Deprecated without a replacement.", level = DeprecationLevel.ERROR)
     public fun ordinal(): Int = when (this) {
         DiscordEmployee -> 0
@@ -282,7 +282,7 @@ public sealed class UserFlag(
         @JvmField
         public val TeamUser: UserFlag = TeamUser
 
-        @Suppress(names = arrayOf("DEPRECATION_ERROR"))
+        @Suppress("DEPRECATION_ERROR")
         @Deprecated(
             level = DeprecationLevel.HIDDEN,
             message = "Binary compatibility",
@@ -360,7 +360,7 @@ public sealed class UserFlag(
         /**
          * @suppress
          */
-        @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT", "DeprecatedCallableAddReplaceWith"))
+        @Suppress("NON_FINAL_MEMBER_IN_OBJECT", "DeprecatedCallableAddReplaceWith")
         @Deprecated(message =
                 "UserFlag is no longer an enum class. Deprecated without a replacement.", level = DeprecationLevel.ERROR)
         @JvmStatic
@@ -387,7 +387,7 @@ public sealed class UserFlag(
         /**
          * @suppress
          */
-        @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT"))
+        @Suppress("NON_FINAL_MEMBER_IN_OBJECT")
         @Deprecated(
             message = "UserFlag is no longer an enum class.",
             replaceWith = ReplaceWith(expression = "UserFlag.entries.toTypedArray()", imports =
@@ -400,7 +400,7 @@ public sealed class UserFlag(
         /**
          * @suppress
          */
-        @Suppress(names = arrayOf("NON_FINAL_MEMBER_IN_OBJECT", "UPPER_BOUND_VIOLATED"))
+        @Suppress("NON_FINAL_MEMBER_IN_OBJECT", "UPPER_BOUND_VIOLATED")
         @Deprecated(
             level = DeprecationLevel.HIDDEN,
             message = "UserFlag is no longer an enum class.",
@@ -410,8 +410,8 @@ public sealed class UserFlag(
         @JvmStatic
         public open fun getEntries(): EnumEntries<UserFlag> = EnumEntriesList
 
-        @Suppress(names = arrayOf("SEALED_INHERITOR_IN_DIFFERENT_MODULE",
-                        "SEALED_INHERITOR_IN_DIFFERENT_PACKAGE", "UPPER_BOUND_VIOLATED"))
+        @Suppress("SEALED_INHERITOR_IN_DIFFERENT_MODULE",
+                        "SEALED_INHERITOR_IN_DIFFERENT_PACKAGE", "UPPER_BOUND_VIOLATED")
         private object EnumEntriesList : EnumEntries<UserFlag>, List<UserFlag> by entries {
             override fun equals(other: Any?): Boolean = entries == other
 

diff --git a/common/src/nonJvmMain/kotlin/Class.kt b/common/src/nonJvmMain/kotlin/Class.kt
@@ -4,11 +4,11 @@ import dev.kord.common.annotation.KordInternal
 import kotlin.reflect.KClass
 
 /** @suppress */
-@Suppress("ACTUAL_WITHOUT_EXPECT")
-public actual typealias Class<T> = KClass<T>
+public actual typealias Class<T> = ArrayDeque<T>
 
 /** @suppress */
 @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 @kotlin.internal.InlineOnly
 @KordInternal
-public actual inline val <T : Any> KClass<T>.java: Class<T> inline get() = this
+public actual inline val <T : Any> KClass<T>.java: Class<T>
+    inline get() = throw UnsupportedOperationException("'getDeclaringClass()' was never present on Kotlin/JS")