Build Kord with K2

kordlib · Nov 23, 2023 · 734946a · 734946a
1 parent 1595b95
commit 734946a
Show file tree

Hide file tree

Showing 39 changed files with 1,641 additions and 1,634 deletions.
diff --git a/buildSrc/src/main/kotlin/kord-module.gradle.kts b/buildSrc/src/main/kotlin/kord-module.gradle.kts
@@ -1,3 +1,4 @@
+import com.google.devtools.ksp.gradle.KspTaskJvm
 import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask
 
 plugins {
@@ -48,6 +49,11 @@ tasks {
     withType<AbstractDokkaLeafTask>().configureEach {
         applyKordDokkaOptions()
     }
+
+    withType<KspTaskJvm>().configureEach {
+        // KSP still uses language version 1.9, progressive mode only works with latest
+        compilerOptions.progressiveMode = false
+    }
 }
 
 publishing {

diff --git a/buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts b/buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts
@@ -1,3 +1,4 @@
+import com.google.devtools.ksp.gradle.KspTaskMetadata
 import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask
 import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest
 
@@ -88,4 +89,9 @@ tasks {
         applyKordDokkaOptions()
         dependsOn("kspCommonMainKotlinMetadata")
     }
+
+    withType<KspTaskMetadata>().configureEach {
+        // KSP still uses language version 1.9, progressive mode only works with latest
+        compilerOptions.progressiveMode = false
+    }
 }
diff --git a/common/api/common.api b/common/api/common.api
diff --git a/common/src/commonMain/kotlin/entity/DiscordUser.kt b/common/src/commonMain/kotlin/entity/DiscordUser.kt
@@ -156,12 +156,11 @@ public data class DiscordOptionallyMemberUser(
     val member: Optional<DiscordGuildMember> = Optional.Missing(),
 )
 
-@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", "DEPRECATION_ERROR")
+@Suppress("DEPRECATION_ERROR")
 @Deprecated(
     "'UserFlags.UserFlagsBuilder' is deprecated, use 'UserFlags.Builder' instead.",
     level = DeprecationLevel.HIDDEN,
 )
-@kotlin.internal.LowPriorityInOverloadResolution
 public inline fun UserFlags(builder: UserFlags.UserFlagsBuilder.() -> Unit): UserFlags {
     contract { callsInPlace(builder, InvocationKind.EXACTLY_ONCE) }
     return UserFlags.UserFlagsBuilder().apply(builder).flags()

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/Permission.kt b/common/src/commonMain/kotlin/entity/Permission.kt
@@ -630,12 +630,11 @@ public class Permissions internal constructor(
         return Builder(code.copy()).apply(builder).build()
     }
 
-    @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", "DEPRECATION_ERROR")
+    @Suppress("DEPRECATION_ERROR")
     @Deprecated(
         "'Permissions.PermissionsBuilder' is deprecated, use 'Permissions.Builder' instead.",
         level = DeprecationLevel.HIDDEN,
     )
-    @kotlin.internal.LowPriorityInOverloadResolution
     public inline fun copy(block: PermissionsBuilder.() -> Unit): Permissions {
         contract { callsInPlace(block, EXACTLY_ONCE) }
         return PermissionsBuilder(code.copy()).apply(block).permissions()
@@ -764,12 +763,11 @@ public inline fun Permissions(builder: Permissions.Builder.() -> Unit = {}): Per
     return Permissions.Builder().apply(builder).build()
 }
 
-@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", "DEPRECATION_ERROR")
+@Suppress("DEPRECATION_ERROR")
 @Deprecated(
     "'Permissions.PermissionsBuilder' is deprecated, use 'Permissions.Builder' instead.",
     level = DeprecationLevel.HIDDEN,
 )
-@kotlin.internal.LowPriorityInOverloadResolution
 public inline fun Permissions(block: Permissions.PermissionsBuilder.() -> Unit = {}): Permissions {
     contract { callsInPlace(block, EXACTLY_ONCE) }
     return Permissions.PermissionsBuilder(DiscordBitSet(0)).apply(block).permissions()

diff --git a/common/src/commonMain/kotlin/entity/UserFlag.kt b/common/src/commonMain/kotlin/entity/UserFlag.kt
@@ -544,12 +544,11 @@ public class UserFlags internal constructor(
         return Builder(code).apply(builder).build()
     }
 
-    @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", "DEPRECATION_ERROR")
+    @Suppress("DEPRECATION_ERROR")
     @Deprecated(
         "'UserFlags.UserFlagsBuilder' is deprecated, use 'UserFlags.Builder' instead.",
         level = DeprecationLevel.HIDDEN,
     )
-    @kotlin.internal.LowPriorityInOverloadResolution
     public inline fun copy(block: UserFlagsBuilder.() -> Unit): UserFlags {
         contract { callsInPlace(block, EXACTLY_ONCE) }
         return UserFlagsBuilder(code).apply(block).flags()

diff --git a/common/src/jvmMain/kotlin/Class.kt b/common/src/jvmMain/kotlin/Class.kt
@@ -8,7 +8,5 @@ import kotlin.jvm.java as getJavaClass
 public actual typealias Class<T> = java.lang.Class<T>
 
 /** @suppress */
-@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
-@kotlin.internal.InlineOnly
 @KordInternal
 public actual inline val <T : Any> KClass<T>.java: Class<T> inline get() = getJavaClass
diff --git a/common/src/nonJvmMain/kotlin/Class.kt b/common/src/nonJvmMain/kotlin/Class.kt
@@ -4,11 +4,9 @@ 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")