Make it build

lukellmann · May 22, 2024 · 57e6a69 · 57e6a69
1 parent 99921a9
commit 57e6a69
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 31 deletions.
diff --git a/kord-extensions/build.gradle.kts b/kord-extensions/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 buildscript {
 	repositories {
 		maven {
@@ -55,12 +53,6 @@ dependencies {
 	kspTest(project(":annotation-processor"))
 }
 
-val compileKotlin: KotlinCompile by tasks
-
-compileKotlin.kotlinOptions {
-	languageVersion = "1.7"
-}
-
 dokkaModule {
 	moduleName = "Kord Extensions"
 	includes.add("packages.md")

diff --git a/...tlin/com/kotlindiscord/kord/extensions/commands/application/ApplicationCommandRegistry.kt b/...tlin/com/kotlindiscord/kord/extensions/commands/application/ApplicationCommandRegistry.kt
@@ -576,16 +576,14 @@ public abstract class ApplicationCommandRegistry : KordExKoinComponent {
 		}
 	}
 
-	@Suppress("DEPRECATION_ERROR")
 	private fun <C : Choice> BaseChoiceBuilder<*, C>.translate(command: ApplicationCommand<*>) {
 		choices = choices!!.map {
 			val (name, nameLocalizations) = command.localize(it.name)
 
-			when (it) {
-				is Choice.NumberChoice -> Choice.NumberChoice(name, Optional(nameLocalizations), it.value)
-				is Choice.StringChoice -> Choice.StringChoice(name, Optional(nameLocalizations), it.value)
-				is Choice.IntegerChoice -> Choice.IntegerChoice(name, Optional(nameLocalizations), it.value)
-				else -> error("why isn't this exhaustive? :(")
+			when (val c = it as Choice) {
+				is Choice.NumberChoice -> Choice.NumberChoice(name, Optional(nameLocalizations), c.value)
+				is Choice.StringChoice -> Choice.StringChoice(name, Optional(nameLocalizations), c.value)
+				is Choice.IntegerChoice -> Choice.IntegerChoice(name, Optional(nameLocalizations), c.value)
 			} as C
 		}.toMutableList()
 	}

diff --git a/...kotlin/com/kotlindiscord/kord/extensions/commands/application/slash/SlashCommandParser.kt b/...kotlin/com/kotlindiscord/kord/extensions/commands/application/slash/SlashCommandParser.kt
@@ -12,7 +12,6 @@ package com.kotlindiscord.kord.extensions.commands.application.slash
 
 import com.kotlindiscord.kord.extensions.ArgumentParsingException
 import com.kotlindiscord.kord.extensions.DiscordRelayedException
-import com.kotlindiscord.kord.extensions.commands.Argument
 import com.kotlindiscord.kord.extensions.commands.Arguments
 import com.kotlindiscord.kord.extensions.commands.converters.*
 import com.kotlindiscord.kord.extensions.commands.getDefaultTranslatedDisplayName
@@ -55,12 +54,11 @@ public open class SlashCommandParser {
 			}
 		} as Map<String, OptionValue<*>>
 
-		var currentArg: Argument<*>?
 		var currentValue: OptionValue<*>?
 
 		@Suppress("LoopWithTooManyJumpStatements")  // Listen here u lil shit
 		while (true) {
-			currentArg = args.removeFirstOrNull()
+			val currentArg = args.removeFirstOrNull()
 			currentArg ?: break  // If it's null, we're out of arguments
 
 			logger.trace { "Current argument: ${currentArg.displayName}" }

diff --git a/...ions/src/main/kotlin/com/kotlindiscord/kord/extensions/commands/chat/ChatCommandParser.kt b/...ions/src/main/kotlin/com/kotlindiscord/kord/extensions/commands/chat/ChatCommandParser.kt
@@ -15,7 +15,6 @@ package com.kotlindiscord.kord.extensions.commands.chat
 import com.kotlindiscord.kord.extensions.ArgumentParsingException
 import com.kotlindiscord.kord.extensions.DiscordRelayedException
 import com.kotlindiscord.kord.extensions.ExtensibleBot
-import com.kotlindiscord.kord.extensions.commands.Argument
 import com.kotlindiscord.kord.extensions.commands.Arguments
 import com.kotlindiscord.kord.extensions.commands.CommandContext
 import com.kotlindiscord.kord.extensions.commands.application.slash.converters.ChoiceConverter
@@ -100,11 +99,9 @@ public open class ChatCommandParser : KordExKoinComponent {
 
 		logger.trace { "Args map: $argsMap" }
 
-		var currentArg: Argument<*>?
-
 		@Suppress("LoopWithTooManyJumpStatements")  // Listen here u lil shit
 		while (true) {
-			currentArg = args.removeFirstOrNull()
+			val currentArg = args.removeFirstOrNull()
 			currentArg ?: break  // If it's null, we're out of arguments
 
 			val kwValue = keywordArgs[

diff --git a/kord-extensions/src/main/kotlin/com/kotlindiscord/kord/extensions/utils/_Maps.kt b/kord-extensions/src/main/kotlin/com/kotlindiscord/kord/extensions/utils/_Maps.kt
@@ -10,13 +10,13 @@ import dev.kord.common.annotation.KordPreview
 import dev.kord.core.event.Event
 
 /** Type alias representing a string keyed map. **/
-public typealias StringKeyedMap<T> = Map<String, T & Any>
+public typealias StringKeyedMap<T> = Map<String, T>
 
 /** Type alias representing a map with string keys and values. **/
 public typealias StringMap = StringKeyedMap<String>
 
 /** Type alias representing a mutable string keyed map. **/
-public typealias MutableStringKeyedMap<T> = MutableMap<String, T & Any>
+public typealias MutableStringKeyedMap<T> = MutableMap<String, T>
 
 /** Type alias representing a mutable map with string keys and values. **/
 public typealias MutableStringMap = MutableStringKeyedMap<String>

diff --git a/test-bot/build.gradle.kts b/test-bot/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 buildscript {
 	repositories {
 		maven {
@@ -74,12 +72,6 @@ dependencies {
 	kspTest(project(":annotation-processor"))
 }
 
-val compileKotlin: KotlinCompile by tasks
-
-compileKotlin.kotlinOptions {
-	languageVersion = "1.7"
-}
-
 application {
 	this.mainClass.set("com.kotlindiscord.kord.extensions.testbot.TestBotKt")
 }